diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-11-17 15:33:17 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-11-17 15:33:17 +0100 |
| commit | a431c0902c6a9c8ca02fc519c75a487ace5e1682 (patch) | |
| tree | ae6e31f122b018436d7ecda20c10576eb869a31f | |
| parent | b2e3df6421e77c5f5f6248d19160b3d1950d78e8 (diff) | |
| download | patches-a431c0902c6a9c8ca02fc519c75a487ace5e1682.tar.gz | |
some new patches added so I don't loose them.
8 files changed, 405 insertions, 0 deletions
diff --git a/0001-gpu-gma500-remove-unneeded-DRIVER_LICENSE-define.patch b/0001-gpu-gma500-remove-unneeded-DRIVER_LICENSE-define.patch new file mode 100644 index 00000000000000..35b02a3315c82f --- /dev/null +++ b/0001-gpu-gma500-remove-unneeded-DRIVER_LICENSE-define.patch @@ -0,0 +1,42 @@ +From ab5deab751fd7812ae4e28adb31d0b79381098a1 Mon Sep 17 00:00:00 2001 +From: Greg Kroah-Hartman <gregkh@linuxfoundation.org> +Date: Fri, 17 Nov 2017 15:00:45 +0100 +Subject: [PATCH 1/7] gpu: gma500: remove unneeded DRIVER_LICENSE #define + +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, especially when the string is defined in a .h file +far away from the .c file it is used in. + +Cc: Patrik Jakobsson <patrik.r.jakobsson@gmail.com> +Cc: David Airlie <airlied@linux.ie> +Cc: dri-devel@lists.freedesktop.org +Cc: linux-kernel@vger.kernel.org +Reported-by: Philippe Ombredanne <pombredanne@nexb.com> +Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> +--- + drivers/gpu/drm/gma500/psb_drv.c | 2 +- + drivers/gpu/drm/gma500/psb_drv.h | 1 - + 2 files changed, 1 insertion(+), 2 deletions(-) + +--- a/drivers/gpu/drm/gma500/psb_drv.c ++++ b/drivers/gpu/drm/gma500/psb_drv.c +@@ -527,4 +527,4 @@ module_exit(psb_exit); + + MODULE_AUTHOR(DRIVER_AUTHOR); + MODULE_DESCRIPTION(DRIVER_DESC); +-MODULE_LICENSE(DRIVER_LICENSE); ++MODULE_LICENSE("GPL"); +--- a/drivers/gpu/drm/gma500/psb_drv.h ++++ b/drivers/gpu/drm/gma500/psb_drv.h +@@ -36,7 +36,6 @@ + #include "mmu.h" + + #define DRIVER_AUTHOR "Alan Cox <alan@linux.intel.com> and others" +-#define DRIVER_LICENSE "GPL" + + #define DRIVER_NAME "gma500" + #define DRIVER_DESC "DRM driver for the Intel GMA500, GMA600, GMA3600, GMA3650" diff --git a/0002-input-remove-unneeded-DRIVER_LICENSE-defines.patch b/0002-input-remove-unneeded-DRIVER_LICENSE-defines.patch new file mode 100644 index 00000000000000..620269909ccdae --- /dev/null +++ b/0002-input-remove-unneeded-DRIVER_LICENSE-defines.patch @@ -0,0 +1,88 @@ +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 + diff --git a/0003-media-usbvision-remove-unneeded-DRIVER_LICENSE-defin.patch b/0003-media-usbvision-remove-unneeded-DRIVER_LICENSE-defin.patch new file mode 100644 index 00000000000000..4a6f3bd2f1f752 --- /dev/null +++ b/0003-media-usbvision-remove-unneeded-DRIVER_LICENSE-defin.patch @@ -0,0 +1,43 @@ +From 1339d003b803bdd4fc355176ad092ac58b7911b0 Mon Sep 17 00:00:00 2001 +From: Greg Kroah-Hartman <gregkh@linuxfoundation.org> +Date: Fri, 17 Nov 2017 15:05:42 +0100 +Subject: [PATCH 3/7] media: usbvision: remove unneeded DRIVER_LICENSE #define + +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. + +Cc: Hans Verkuil <hverkuil@xs4all.nl> +Cc: Mauro Carvalho Chehab <mchehab@kernel.org> +Cc: Markus Elfring <elfring@users.sourceforge.net> +Cc: Johan Hovold <johan@kernel.org> +Cc: Davidlohr Bueso <dave@stgolabs.net> +Cc: Sakari Ailus <sakari.ailus@linux.intel.com> +Reported-by: Philippe Ombredanne <pombredanne@nexb.com> +Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> +--- + drivers/media/usb/usbvision/usbvision-video.c | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +--- a/drivers/media/usb/usbvision/usbvision-video.c ++++ b/drivers/media/usb/usbvision/usbvision-video.c +@@ -72,7 +72,6 @@ + #define DRIVER_NAME "usbvision" + #define DRIVER_ALIAS "USBVision" + #define DRIVER_DESC "USBVision USB Video Device Driver for Linux" +-#define DRIVER_LICENSE "GPL" + #define USBVISION_VERSION_STRING "0.9.11" + + #define ENABLE_HEXDUMP 0 /* Enable if you need it */ +@@ -141,7 +140,7 @@ MODULE_PARM_DESC(radio_nr, "Set radio de + /* Misc stuff */ + MODULE_AUTHOR(DRIVER_AUTHOR); + MODULE_DESCRIPTION(DRIVER_DESC); +-MODULE_LICENSE(DRIVER_LICENSE); ++MODULE_LICENSE("GPL"); + MODULE_VERSION(USBVISION_VERSION_STRING); + MODULE_ALIAS(DRIVER_ALIAS); + diff --git a/0004-net-usb-hso.c-remove-unneeded-DRIVER_LICENSE-define.patch b/0004-net-usb-hso.c-remove-unneeded-DRIVER_LICENSE-define.patch new file mode 100644 index 00000000000000..a4cb06b03e955e --- /dev/null +++ b/0004-net-usb-hso.c-remove-unneeded-DRIVER_LICENSE-define.patch @@ -0,0 +1,43 @@ +From ab4e89a53a84e124336e6d426e52a78f21c1043a Mon Sep 17 00:00:00 2001 +From: Greg Kroah-Hartman <gregkh@linuxfoundation.org> +Date: Fri, 17 Nov 2017 15:06:32 +0100 +Subject: [PATCH 4/7] net: usb: hso.c: remove unneeded DRIVER_LICENSE #define + +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. + +Cc: "David S. Miller" <davem@davemloft.net> +Cc: Andreas Kemnade <andreas@kemnade.info> +Cc: Johan Hovold <johan@kernel.org> +Cc: linux-usb@vger.kernel.org +Cc: netdev@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/net/usb/hso.c | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +--- a/drivers/net/usb/hso.c ++++ b/drivers/net/usb/hso.c +@@ -76,7 +76,6 @@ + + #define MOD_AUTHOR "Option Wireless" + #define MOD_DESCRIPTION "USB High Speed Option driver" +-#define MOD_LICENSE "GPL" + + #define HSO_MAX_NET_DEVICES 10 + #define HSO__MAX_MTU 2048 +@@ -3288,7 +3287,7 @@ module_exit(hso_exit); + + MODULE_AUTHOR(MOD_AUTHOR); + MODULE_DESCRIPTION(MOD_DESCRIPTION); +-MODULE_LICENSE(MOD_LICENSE); ++MODULE_LICENSE("GPL"); + + /* change the debug level (eg: insmod hso.ko debug=0x04) */ + MODULE_PARM_DESC(debug, "debug level mask [0x01 | 0x02 | 0x04 | 0x08 | 0x10]"); diff --git a/0005-ntb-remove-unneeded-DRIVER_LICENSE-defines.patch b/0005-ntb-remove-unneeded-DRIVER_LICENSE-defines.patch new file mode 100644 index 00000000000000..10d3d022bc58eb --- /dev/null +++ b/0005-ntb-remove-unneeded-DRIVER_LICENSE-defines.patch @@ -0,0 +1,96 @@ +From efdffdc616a1323db077cdba06a3227f61be517b Mon Sep 17 00:00:00 2001 +From: Greg Kroah-Hartman <gregkh@linuxfoundation.org> +Date: Fri, 17 Nov 2017 15:07:15 +0100 +Subject: [PATCH 5/7] ntb: 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, especially when the string is defined just a few +lines above the usage of it. + +Cc: Jon Mason <jdmason@kudzu.us> +Cc: Dave Jiang <dave.jiang@intel.com> +Cc: Allen Hubbe <Allen.Hubbe@emc.com> +Cc: Gary R Hook <gary.hook@amd.com> +Cc: Serge Semin <fancer.lancer@gmail.com> +Cc: linux-ntb@googlegroups.com +Cc: linux-kernel@vger.kernel.org +Reported-by: Philippe Ombredanne <pombredanne@nexb.com> +Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> +--- + drivers/ntb/ntb.c | 3 +-- + drivers/ntb/test/ntb_perf.c | 3 +-- + drivers/ntb/test/ntb_pingpong.c | 3 +-- + drivers/ntb/test/ntb_tool.c | 3 +-- + 4 files changed, 4 insertions(+), 8 deletions(-) + +--- a/drivers/ntb/ntb.c ++++ b/drivers/ntb/ntb.c +@@ -63,12 +63,11 @@ + #define DRIVER_NAME "ntb" + #define DRIVER_DESCRIPTION "PCIe NTB Driver Framework" + +-#define DRIVER_LICENSE "Dual BSD/GPL" + #define DRIVER_VERSION "1.0" + #define DRIVER_RELDATE "24 March 2015" + #define DRIVER_AUTHOR "Allen Hubbe <Allen.Hubbe@emc.com>" + +-MODULE_LICENSE(DRIVER_LICENSE); ++MODULE_LICENSE("Dual BSD/GPL"); + MODULE_VERSION(DRIVER_VERSION); + MODULE_AUTHOR(DRIVER_AUTHOR); + MODULE_DESCRIPTION(DRIVER_DESCRIPTION); +--- a/drivers/ntb/test/ntb_perf.c ++++ b/drivers/ntb/test/ntb_perf.c +@@ -63,7 +63,6 @@ + #define DRIVER_NAME "ntb_perf" + #define DRIVER_DESCRIPTION "PCIe NTB Performance Measurement Tool" + +-#define DRIVER_LICENSE "Dual BSD/GPL" + #define DRIVER_VERSION "1.0" + #define DRIVER_AUTHOR "Dave Jiang <dave.jiang@intel.com>" + +@@ -78,7 +77,7 @@ + #define MAX_SEG_ORDER 20 /* no larger than 1M for kmalloc buffer */ + #define PIDX NTB_DEF_PEER_IDX + +-MODULE_LICENSE(DRIVER_LICENSE); ++MODULE_LICENSE("Dual BSD/GPL"); + MODULE_VERSION(DRIVER_VERSION); + MODULE_AUTHOR(DRIVER_AUTHOR); + MODULE_DESCRIPTION(DRIVER_DESCRIPTION); +--- a/drivers/ntb/test/ntb_pingpong.c ++++ b/drivers/ntb/test/ntb_pingpong.c +@@ -68,12 +68,11 @@ + #define DRIVER_NAME "ntb_pingpong" + #define DRIVER_DESCRIPTION "PCIe NTB Simple Pingpong Client" + +-#define DRIVER_LICENSE "Dual BSD/GPL" + #define DRIVER_VERSION "1.0" + #define DRIVER_RELDATE "24 March 2015" + #define DRIVER_AUTHOR "Allen Hubbe <Allen.Hubbe@emc.com>" + +-MODULE_LICENSE(DRIVER_LICENSE); ++MODULE_LICENSE("Dual BSD/GPL"); + MODULE_VERSION(DRIVER_VERSION); + MODULE_AUTHOR(DRIVER_AUTHOR); + MODULE_DESCRIPTION(DRIVER_DESCRIPTION); +--- a/drivers/ntb/test/ntb_tool.c ++++ b/drivers/ntb/test/ntb_tool.c +@@ -109,12 +109,11 @@ + #define DRIVER_NAME "ntb_tool" + #define DRIVER_DESCRIPTION "PCIe NTB Debugging Tool" + +-#define DRIVER_LICENSE "Dual BSD/GPL" + #define DRIVER_VERSION "1.0" + #define DRIVER_RELDATE "22 April 2015" + #define DRIVER_AUTHOR "Allen Hubbe <Allen.Hubbe@emc.com>" + +-MODULE_LICENSE(DRIVER_LICENSE); ++MODULE_LICENSE("Dual BSD/GPL"); + MODULE_VERSION(DRIVER_VERSION); + MODULE_AUTHOR(DRIVER_AUTHOR); + MODULE_DESCRIPTION(DRIVER_DESCRIPTION); diff --git a/0006-scsi-csiostor-remove-unneeded-DRIVER_LICENSE-define.patch b/0006-scsi-csiostor-remove-unneeded-DRIVER_LICENSE-define.patch new file mode 100644 index 00000000000000..1ae0f771a5fe70 --- /dev/null +++ b/0006-scsi-csiostor-remove-unneeded-DRIVER_LICENSE-define.patch @@ -0,0 +1,46 @@ +From b20a822684e8a01d120dbfff3363fe34eb2267cf Mon Sep 17 00:00:00 2001 +From: Greg Kroah-Hartman <gregkh@linuxfoundation.org> +Date: Fri, 17 Nov 2017 15:08:01 +0100 +Subject: [PATCH 6/7] scsi: csiostor: remove unneeded DRIVER_LICENSE #define + +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, especially when the string is defined in a .h file +far away from the .c file it is used in. + +Cc: "James E.J. Bottomley" <jejb@linux.vnet.ibm.com> +Cc: "Martin K. Petersen" <martin.petersen@oracle.com> +Cc: Varun Prakash <varun@chelsio.com> +Cc: linux-scsi@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/scsi/csiostor/csio_init.c | 2 +- + drivers/scsi/csiostor/csio_init.h | 1 - + 2 files changed, 1 insertion(+), 2 deletions(-) + +--- a/drivers/scsi/csiostor/csio_init.c ++++ b/drivers/scsi/csiostor/csio_init.c +@@ -1255,7 +1255,7 @@ module_init(csio_init); + module_exit(csio_exit); + MODULE_AUTHOR(CSIO_DRV_AUTHOR); + MODULE_DESCRIPTION(CSIO_DRV_DESC); +-MODULE_LICENSE(CSIO_DRV_LICENSE); ++MODULE_LICENSE("Dual BSD/GPL"); + MODULE_DEVICE_TABLE(pci, csio_pci_tbl); + MODULE_VERSION(CSIO_DRV_VERSION); + MODULE_FIRMWARE(FW_FNAME_T5); +--- a/drivers/scsi/csiostor/csio_init.h ++++ b/drivers/scsi/csiostor/csio_init.h +@@ -48,7 +48,6 @@ + #include "csio_hw.h" + + #define CSIO_DRV_AUTHOR "Chelsio Communications" +-#define CSIO_DRV_LICENSE "Dual BSD/GPL" + #define CSIO_DRV_DESC "Chelsio FCoE driver" + #define CSIO_DRV_VERSION "1.0.0-ko" + diff --git a/0007-watchdog-pcwd_usb-remove-unneeded-DRIVER_LICENSE-def.patch b/0007-watchdog-pcwd_usb-remove-unneeded-DRIVER_LICENSE-def.patch new file mode 100644 index 00000000000000..d79545cd834122 --- /dev/null +++ b/0007-watchdog-pcwd_usb-remove-unneeded-DRIVER_LICENSE-def.patch @@ -0,0 +1,40 @@ +From 4c9ffbfae59a0b4d6891022446d9ef7e1100adf7 Mon Sep 17 00:00:00 2001 +From: Greg Kroah-Hartman <gregkh@linuxfoundation.org> +Date: Fri, 17 Nov 2017 15:08:33 +0100 +Subject: [PATCH 7/7] watchdog: pcwd_usb: remove unneeded DRIVER_LICENSE + #define + +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, especially when it is defined just a few lines +above from where it is used. + +Cc: Wim Van Sebroeck <wim@iguana.be> +Cc: Guenter Roeck <linux@roeck-us.net> +Cc: linux-watchdog@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/watchdog/pcwd_usb.c | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +--- a/drivers/watchdog/pcwd_usb.c ++++ b/drivers/watchdog/pcwd_usb.c +@@ -49,12 +49,11 @@ + #define DRIVER_VERSION "1.02" + #define DRIVER_AUTHOR "Wim Van Sebroeck <wim@iguana.be>" + #define DRIVER_DESC "Berkshire USB-PC Watchdog driver" +-#define DRIVER_LICENSE "GPL" + #define DRIVER_NAME "pcwd_usb" + + MODULE_AUTHOR(DRIVER_AUTHOR); + MODULE_DESCRIPTION(DRIVER_DESC); +-MODULE_LICENSE(DRIVER_LICENSE); ++MODULE_LICENSE("GPL"); + + #define WATCHDOG_HEARTBEAT 0 /* default heartbeat = + delay-time from dip-switches */ @@ -1,5 +1,12 @@ # +0001-gpu-gma500-remove-unneeded-DRIVER_LICENSE-define.patch +0002-input-remove-unneeded-DRIVER_LICENSE-defines.patch +0003-media-usbvision-remove-unneeded-DRIVER_LICENSE-defin.patch +0004-net-usb-hso.c-remove-unneeded-DRIVER_LICENSE-define.patch +0005-ntb-remove-unneeded-DRIVER_LICENSE-defines.patch +0006-scsi-csiostor-remove-unneeded-DRIVER_LICENSE-define.patch +0007-watchdog-pcwd_usb-remove-unneeded-DRIVER_LICENSE-def.patch usb_DEVICE_ATTR.patch |
