Commit 9f1d1ea3 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman Committed by Dmitry Torokhov
Browse files

Input: remove unneeded DRIVER_LICENSE #defines 



There is no need to #define the license of the driver, just put it in
the MODULE_LICENSE() line directly as a text string.

This allows tools that check that the module license matches the source
code license to work properly, as there is no need to unwind the
unneeded dereference.  For some of these drivers, the #define is just a
few lines above the MODULE_LICENSE() line, which is extra pointless.

Reported-by: default avatarPhilippe Ombredanne <pombredanne@nexb.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Reviewed-by: default avatarPhilippe Ombredanne <pombredanne@nexb.com>
Signed-off-by: default avatarDmitry Torokhov <dmitry.torokhov@gmail.com>
parent 19eb4ed1

drivers/input/misc/keyspan_remote.c

+1 −2
Original line number Original line Diff line number Diff line
@@ -20,7 +20,6 @@ 
#define DRIVER_VERSION	"v0.1"

#define DRIVER_VERSION	"v0.1"

#define DRIVER_AUTHOR	"Michael Downey <downey@zymeta.com>"

#define DRIVER_AUTHOR	"Michael Downey <downey@zymeta.com>"

#define DRIVER_DESC	"Driver for the USB Keyspan remote control."

#define DRIVER_DESC	"Driver for the USB Keyspan remote control."

#define DRIVER_LICENSE	"GPL"





/* Parameters that can be passed to the driver. */

/* Parameters that can be passed to the driver. */

static int debug;

static int debug;
@@ -592,4 +591,4 @@ module_usb_driver(keyspan_driver); 
MODULE_DEVICE_TABLE(usb, keyspan_table);

MODULE_DEVICE_TABLE(usb, keyspan_table);

MODULE_AUTHOR(DRIVER_AUTHOR);

MODULE_AUTHOR(DRIVER_AUTHOR);

MODULE_DESCRIPTION(DRIVER_DESC);

MODULE_DESCRIPTION(DRIVER_DESC);

MODULE_LICENSE(DRIVER_LICENSE);
 
MODULE_LICENSE("GPL");

drivers/input/tablet/acecad.c

+1 −2
Original line number Original line Diff line number Diff line
@@ -35,12 +35,11 @@ 
 */

 */

#define DRIVER_VERSION "v3.2"

#define DRIVER_VERSION "v3.2"

#define DRIVER_DESC    "USB Acecad Flair tablet driver"

#define DRIVER_DESC    "USB Acecad Flair tablet driver"

#define DRIVER_LICENSE "GPL"

#define DRIVER_AUTHOR  "Edouard TISSERANT <edouard.tisserant@wanadoo.fr>"

#define DRIVER_AUTHOR  "Edouard TISSERANT <edouard.tisserant@wanadoo.fr>"





MODULE_AUTHOR(DRIVER_AUTHOR);

MODULE_AUTHOR(DRIVER_AUTHOR);

MODULE_DESCRIPTION(DRIVER_DESC);

MODULE_DESCRIPTION(DRIVER_DESC);

MODULE_LICENSE(DRIVER_LICENSE);

MODULE_LICENSE("GPL");





#define USB_VENDOR_ID_ACECAD	0x0460

#define USB_VENDOR_ID_ACECAD	0x0460

#define USB_DEVICE_ID_FLAIR	0x0004

#define USB_DEVICE_ID_FLAIR	0x0004

drivers/input/tablet/hanwang.c

+1 −2
Original line number Original line Diff line number Diff line
@@ -30,11 +30,10 @@ 




#define DRIVER_AUTHOR   "Xing Wei <weixing@hanwang.com.cn>"

#define DRIVER_AUTHOR   "Xing Wei <weixing@hanwang.com.cn>"

#define DRIVER_DESC     "USB Hanwang tablet driver"

#define DRIVER_DESC     "USB Hanwang tablet driver"

#define DRIVER_LICENSE  "GPL"





MODULE_AUTHOR(DRIVER_AUTHOR);

MODULE_AUTHOR(DRIVER_AUTHOR);

MODULE_DESCRIPTION(DRIVER_DESC);

MODULE_DESCRIPTION(DRIVER_DESC);

MODULE_LICENSE(DRIVER_LICENSE);

MODULE_LICENSE("GPL");





#define USB_VENDOR_ID_HANWANG		0x0b57

#define USB_VENDOR_ID_HANWANG		0x0b57

#define HANWANG_TABLET_INT_CLASS	0x0003

#define HANWANG_TABLET_INT_CLASS	0x0003

drivers/input/tablet/kbtab.c

+1 −2
Original line number Original line Diff line number Diff line
@@ -15,11 +15,10 @@ 
#define DRIVER_VERSION "v0.0.2"

#define DRIVER_VERSION "v0.0.2"

#define DRIVER_AUTHOR "Josh Myer <josh@joshisanerd.com>"

#define DRIVER_AUTHOR "Josh Myer <josh@joshisanerd.com>"

#define DRIVER_DESC "USB KB Gear JamStudio Tablet driver"

#define DRIVER_DESC "USB KB Gear JamStudio Tablet driver"

#define DRIVER_LICENSE "GPL"





MODULE_AUTHOR(DRIVER_AUTHOR);

MODULE_AUTHOR(DRIVER_AUTHOR);

MODULE_DESCRIPTION(DRIVER_DESC);

MODULE_DESCRIPTION(DRIVER_DESC);

MODULE_LICENSE(DRIVER_LICENSE);

MODULE_LICENSE("GPL");





#define USB_VENDOR_ID_KBGEAR	0x084e

#define USB_VENDOR_ID_KBGEAR	0x084e

CRA Git | Maintained and supported by SUSTech CRA and CCSE