diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2018-02-02 09:15:54 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2018-02-02 09:15:54 +0100 |
| commit | 1e6dee595b117b29c8b893c7fda96c1b97309c01 (patch) | |
| tree | 93d0b7d82c703c3ae76ef44b9c843721ef0621bd /0002-input-remove-unneeded-DRIVER_LICENSE-defines.patch | |
| parent | 991c39a78adc0e79ca539fe9f32bfd1569866cbb (diff) | |
| download | patches-1e6dee595b117b29c8b893c7fda96c1b97309c01.tar.gz | |
drop patches that are now upstream.
Diffstat (limited to '0002-input-remove-unneeded-DRIVER_LICENSE-defines.patch')
| -rw-r--r-- | 0002-input-remove-unneeded-DRIVER_LICENSE-defines.patch | 88 |
1 files changed, 0 insertions, 88 deletions
diff --git a/0002-input-remove-unneeded-DRIVER_LICENSE-defines.patch b/0002-input-remove-unneeded-DRIVER_LICENSE-defines.patch deleted file mode 100644 index 620269909ccdae..00000000000000 --- a/0002-input-remove-unneeded-DRIVER_LICENSE-defines.patch +++ /dev/null @@ -1,88 +0,0 @@ -From fe05f22f329627020a9585796a1b793542e5d8c6 Mon Sep 17 00:00:00 2001 -From: Greg Kroah-Hartman <gregkh@linuxfoundation.org> -Date: Fri, 17 Nov 2017 15:04:09 +0100 -Subject: [PATCH 2/7] 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. - -Cc: Dmitry Torokhov <dmitry.torokhov@gmail.com> -Cc: Arvind Yadav <arvind.yadav.cs@gmail.com> -Cc: linux-input@vger.kernel.org -Cc: linux-kernel@vger.kernel.org -Reported-by: Philippe Ombredanne <pombredanne@nexb.com> -Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> ---- - drivers/input/misc/keyspan_remote.c | 3 +-- - drivers/input/tablet/acecad.c | 3 +-- - drivers/input/tablet/hanwang.c | 3 +-- - drivers/input/tablet/kbtab.c | 3 +-- - 4 files changed, 4 insertions(+), 8 deletions(-) - ---- a/drivers/input/misc/keyspan_remote.c -+++ b/drivers/input/misc/keyspan_remote.c -@@ -20,7 +20,6 @@ - #define DRIVER_VERSION "v0.1" - #define DRIVER_AUTHOR "Michael Downey <downey@zymeta.com>" - #define DRIVER_DESC "Driver for the USB Keyspan remote control." --#define DRIVER_LICENSE "GPL" - - /* Parameters that can be passed to the driver. */ - static int debug; -@@ -592,4 +591,4 @@ module_usb_driver(keyspan_driver); - MODULE_DEVICE_TABLE(usb, keyspan_table); - MODULE_AUTHOR(DRIVER_AUTHOR); - MODULE_DESCRIPTION(DRIVER_DESC); --MODULE_LICENSE(DRIVER_LICENSE); -+MODULE_LICENSE("GPL"); ---- a/drivers/input/tablet/acecad.c -+++ b/drivers/input/tablet/acecad.c -@@ -35,12 +35,11 @@ - */ - #define DRIVER_VERSION "v3.2" - #define DRIVER_DESC "USB Acecad Flair tablet driver" --#define DRIVER_LICENSE "GPL" - #define DRIVER_AUTHOR "Edouard TISSERANT <edouard.tisserant@wanadoo.fr>" - - MODULE_AUTHOR(DRIVER_AUTHOR); - MODULE_DESCRIPTION(DRIVER_DESC); --MODULE_LICENSE(DRIVER_LICENSE); -+MODULE_LICENSE("GPL"); - - #define USB_VENDOR_ID_ACECAD 0x0460 - #define USB_DEVICE_ID_FLAIR 0x0004 ---- a/drivers/input/tablet/hanwang.c -+++ b/drivers/input/tablet/hanwang.c -@@ -30,11 +30,10 @@ - - #define DRIVER_AUTHOR "Xing Wei <weixing@hanwang.com.cn>" - #define DRIVER_DESC "USB Hanwang tablet driver" --#define DRIVER_LICENSE "GPL" - - MODULE_AUTHOR(DRIVER_AUTHOR); - MODULE_DESCRIPTION(DRIVER_DESC); --MODULE_LICENSE(DRIVER_LICENSE); -+MODULE_LICENSE("GPL"); - - #define USB_VENDOR_ID_HANWANG 0x0b57 - #define HANWANG_TABLET_INT_CLASS 0x0003 ---- a/drivers/input/tablet/kbtab.c -+++ b/drivers/input/tablet/kbtab.c -@@ -15,11 +15,10 @@ - #define DRIVER_VERSION "v0.0.2" - #define DRIVER_AUTHOR "Josh Myer <josh@joshisanerd.com>" - #define DRIVER_DESC "USB KB Gear JamStudio Tablet driver" --#define DRIVER_LICENSE "GPL" - - MODULE_AUTHOR(DRIVER_AUTHOR); - MODULE_DESCRIPTION(DRIVER_DESC); --MODULE_LICENSE(DRIVER_LICENSE); -+MODULE_LICENSE("GPL"); - - #define USB_VENDOR_ID_KBGEAR 0x084e - |