diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2018-02-22 14:38:51 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2018-02-22 14:38:51 +0100 |
| commit | db1c0ff8c49e70a2eb1d93f7b2f2dfca0a70eea0 (patch) | |
| tree | f10d5b862c9cd124b1f778f0eb4e4d79fb7a54f8 | |
| parent | 1e6dee595b117b29c8b893c7fda96c1b97309c01 (diff) | |
| download | patches-db1c0ff8c49e70a2eb1d93f7b2f2dfca0a70eea0.tar.gz | |
remove patches already merged
| -rw-r--r-- | 0003-media-usbvision-remove-unneeded-DRIVER_LICENSE-defin.patch | 43 | ||||
| -rw-r--r-- | 0005-ntb-remove-unneeded-DRIVER_LICENSE-defines.patch | 96 | ||||
| -rw-r--r-- | 0007-watchdog-pcwd_usb-remove-unneeded-DRIVER_LICENSE-def.patch | 40 | ||||
| -rw-r--r-- | acpi-sbshc-remove-raw-pointer-from-printk-message.patch | 32 | ||||
| -rw-r--r-- | series | 4 |
5 files changed, 0 insertions, 215 deletions
diff --git a/0003-media-usbvision-remove-unneeded-DRIVER_LICENSE-defin.patch b/0003-media-usbvision-remove-unneeded-DRIVER_LICENSE-defin.patch deleted file mode 100644 index 4a6f3bd2f1f752..00000000000000 --- a/0003-media-usbvision-remove-unneeded-DRIVER_LICENSE-defin.patch +++ /dev/null @@ -1,43 +0,0 @@ -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/0005-ntb-remove-unneeded-DRIVER_LICENSE-defines.patch b/0005-ntb-remove-unneeded-DRIVER_LICENSE-defines.patch deleted file mode 100644 index 10d3d022bc58eb..00000000000000 --- a/0005-ntb-remove-unneeded-DRIVER_LICENSE-defines.patch +++ /dev/null @@ -1,96 +0,0 @@ -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/0007-watchdog-pcwd_usb-remove-unneeded-DRIVER_LICENSE-def.patch b/0007-watchdog-pcwd_usb-remove-unneeded-DRIVER_LICENSE-def.patch deleted file mode 100644 index d79545cd834122..00000000000000 --- a/0007-watchdog-pcwd_usb-remove-unneeded-DRIVER_LICENSE-def.patch +++ /dev/null @@ -1,40 +0,0 @@ -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 */ diff --git a/acpi-sbshc-remove-raw-pointer-from-printk-message.patch b/acpi-sbshc-remove-raw-pointer-from-printk-message.patch deleted file mode 100644 index 1180df82b82912..00000000000000 --- a/acpi-sbshc-remove-raw-pointer-from-printk-message.patch +++ /dev/null @@ -1,32 +0,0 @@ -From foo@baz Fri Jan 19 10:03:35 CET 2018 -Date: Fri, 19 Jan 2018 10:03:35 +0100 -To: Greg KH <gregkh@linuxfoundation.org> -From: Greg Kroah-Hartman <gregkh@linuxfoundation.org> -Subject: ACPI: sbshc: remove raw pointer from printk message - -There's no need to be printing a raw kernel pointer to the kernel log at -every boot. So just remove it, and change the whole message to use the -correct dev_info() call at the same time. - - -Reported-by: Wang Qize <wang_qize@venustech.com.cn> -Cc: stable <stable@vger.kernel.org> -Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> - ---- - drivers/acpi/sbshc.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - ---- a/drivers/acpi/sbshc.c -+++ b/drivers/acpi/sbshc.c -@@ -275,8 +275,8 @@ static int acpi_smbus_hc_add(struct acpi - device->driver_data = hc; - - acpi_ec_add_query_handler(hc->ec, hc->query_bit, NULL, smbus_alarm, hc); -- printk(KERN_INFO PREFIX "SBS HC: EC = 0x%p, offset = 0x%0x, query_bit = 0x%0x\n", -- hc->ec, hc->offset, hc->query_bit); -+ dev_info(&device->dev, "SBS HC: offset = 0x%0x, query_bit = 0x%0x\n", -+ hc->offset, hc->query_bit); - - return 0; - } @@ -1,9 +1,5 @@ # -acpi-sbshc-remove-raw-pointer-from-printk-message.patch -0003-media-usbvision-remove-unneeded-DRIVER_LICENSE-defin.patch -0005-ntb-remove-unneeded-DRIVER_LICENSE-defines.patch -0007-watchdog-pcwd_usb-remove-unneeded-DRIVER_LICENSE-def.patch usb_DEVICE_ATTR.patch |