From f2e0a7d4a0b94b4274e3b7e15bf650d45a866f3c Mon Sep 17 00:00:00 2001 From: Benjamin Tissoires Date: Wed, 6 Aug 2014 14:07:49 -0700 Subject: [PATCH] Input: wacom - only register once the MODULE_* macros Putting the various MODULE_* makes them appear several times in modinfo because wacom.h is used both in wacom_sys.c and wacom_wac.h. Having the macros near the module declaration makes them appear only once. Add also MODULE_VERSION(DRIVER_VERSION) to export the current version number. Signed-off-by: Benjamin Tissoires Signed-off-by: Dmitry Torokhov --- drivers/hid/wacom.h | 4 ---- drivers/hid/wacom_sys.c | 5 +++++ 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/drivers/hid/wacom.h b/drivers/hid/wacom.h index 8cc4406b8a53..64bc1b296d91 100644 --- a/drivers/hid/wacom.h +++ b/drivers/hid/wacom.h @@ -101,10 +101,6 @@ #define DRIVER_DESC "USB Wacom tablet driver" #define DRIVER_LICENSE "GPL" -MODULE_AUTHOR(DRIVER_AUTHOR); -MODULE_DESCRIPTION(DRIVER_DESC); -MODULE_LICENSE(DRIVER_LICENSE); - #define USB_VENDOR_ID_WACOM 0x056a #define USB_VENDOR_ID_LENOVO 0x17ef diff --git a/drivers/hid/wacom_sys.c b/drivers/hid/wacom_sys.c index 6e0c19146a79..3e388ec31da8 100644 --- a/drivers/hid/wacom_sys.c +++ b/drivers/hid/wacom_sys.c @@ -1449,3 +1449,8 @@ static struct hid_driver wacom_driver = { .raw_event = wacom_raw_event, }; module_hid_driver(wacom_driver); + +MODULE_VERSION(DRIVER_VERSION); +MODULE_AUTHOR(DRIVER_AUTHOR); +MODULE_DESCRIPTION(DRIVER_DESC); +MODULE_LICENSE(DRIVER_LICENSE);