diff options
| -rw-r--r-- | 0001-Input-rmi4-remove-unneeded-MODULE_VERSION-usage.patch | 50 | ||||
| -rw-r--r-- | 0001-gpu-gma500-remove-unneeded-DRIVER_LICENSE-define.patch | 42 | ||||
| -rw-r--r-- | 0002-Input-keyboard-pmic8xxx-remove-unneeded-MODULE_VERSI.patch | 24 | ||||
| -rw-r--r-- | 0002-input-remove-unneeded-DRIVER_LICENSE-defines.patch | 88 | ||||
| -rw-r--r-- | 0003-Input-mouse-elan_i2c-remove-unneeded-MODULE_VERSION-.patch | 31 | ||||
| -rw-r--r-- | 0004-Input-touchscreen-remove-unneeded-MODULE_VERSION-usa.patch | 76 | ||||
| -rw-r--r-- | 0005-Input-misc-remove-unneeded-MODULE_VERSION-usage.patch | 56 | ||||
| -rw-r--r-- | 0006-Input-remove-remaining-unneeded-MODULE_VERSION-usage.patch | 36 | ||||
| -rw-r--r-- | 0006-scsi-csiostor-remove-unneeded-DRIVER_LICENSE-define.patch | 46 | ||||
| -rw-r--r-- | series | 10 | ||||
| -rw-r--r-- | usb-serial-pl2303-new-device-id-for-chilitag.patch | 37 | ||||
| -rw-r--r-- | usb_DEVICE_ATTR.patch | 695 |
12 files changed, 1 insertions, 1190 deletions
diff --git a/0001-Input-rmi4-remove-unneeded-MODULE_VERSION-usage.patch b/0001-Input-rmi4-remove-unneeded-MODULE_VERSION-usage.patch deleted file mode 100644 index 2f97b28aae2371..00000000000000 --- a/0001-Input-rmi4-remove-unneeded-MODULE_VERSION-usage.patch +++ /dev/null @@ -1,50 +0,0 @@ -From e935aaac37b13bdf2bc623962a4e4636ab659292 Mon Sep 17 00:00:00 2001 -From: Greg Kroah-Hartman <gregkh@linuxfoundation.org> -Date: Wed, 22 Nov 2017 18:31:27 +0100 -Subject: [PATCH 1/6] Input: rmi4: remove unneeded MODULE_VERSION() usage - -MODULE_VERSION is useless for in-kernel drivers, so just remove all -usage of it in the rmi4 drivers. Now that this is gone, the -RMI_DRIVER_VERSION macro was also removed as it was pointless. - -Cc: Dmitry Torokhov <dmitry.torokhov@gmail.com> -Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> ---- - drivers/input/rmi4/rmi_bus.c | 1 - - drivers/input/rmi4/rmi_driver.h | 2 -- - drivers/input/rmi4/rmi_i2c.c | 1 - - drivers/input/rmi4/rmi_spi.c | 1 - - 4 files changed, 5 deletions(-) - ---- a/drivers/input/rmi4/rmi_bus.c -+++ b/drivers/input/rmi4/rmi_bus.c -@@ -427,4 +427,3 @@ MODULE_AUTHOR("Christopher Heiny <cheiny - MODULE_AUTHOR("Andrew Duggan <aduggan@synaptics.com"); - MODULE_DESCRIPTION("RMI bus"); - MODULE_LICENSE("GPL"); --MODULE_VERSION(RMI_DRIVER_VERSION); ---- a/drivers/input/rmi4/rmi_driver.h -+++ b/drivers/input/rmi4/rmi_driver.h -@@ -16,8 +16,6 @@ - #include <linux/input.h> - #include "rmi_bus.h" - --#define RMI_DRIVER_VERSION "2.0" -- - #define SYNAPTICS_INPUT_DEVICE_NAME "Synaptics RMI4 Touch Sensor" - #define SYNAPTICS_VENDOR_ID 0x06cb - ---- a/drivers/input/rmi4/rmi_i2c.c -+++ b/drivers/input/rmi4/rmi_i2c.c -@@ -391,4 +391,3 @@ MODULE_AUTHOR("Christopher Heiny <cheiny - MODULE_AUTHOR("Andrew Duggan <aduggan@synaptics.com>"); - MODULE_DESCRIPTION("RMI I2C driver"); - MODULE_LICENSE("GPL"); --MODULE_VERSION(RMI_DRIVER_VERSION); ---- a/drivers/input/rmi4/rmi_spi.c -+++ b/drivers/input/rmi4/rmi_spi.c -@@ -528,4 +528,3 @@ MODULE_AUTHOR("Christopher Heiny <cheiny - MODULE_AUTHOR("Andrew Duggan <aduggan@synaptics.com>"); - MODULE_DESCRIPTION("RMI SPI driver"); - MODULE_LICENSE("GPL"); --MODULE_VERSION(RMI_DRIVER_VERSION); diff --git a/0001-gpu-gma500-remove-unneeded-DRIVER_LICENSE-define.patch b/0001-gpu-gma500-remove-unneeded-DRIVER_LICENSE-define.patch deleted file mode 100644 index 35b02a3315c82f..00000000000000 --- a/0001-gpu-gma500-remove-unneeded-DRIVER_LICENSE-define.patch +++ /dev/null @@ -1,42 +0,0 @@ -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-keyboard-pmic8xxx-remove-unneeded-MODULE_VERSI.patch b/0002-Input-keyboard-pmic8xxx-remove-unneeded-MODULE_VERSI.patch deleted file mode 100644 index 7cc378c6c5928a..00000000000000 --- a/0002-Input-keyboard-pmic8xxx-remove-unneeded-MODULE_VERSI.patch +++ /dev/null @@ -1,24 +0,0 @@ -From af47b6864afc3d4fb3711c1244e6245de80e2b71 Mon Sep 17 00:00:00 2001 -From: Greg Kroah-Hartman <gregkh@linuxfoundation.org> -Date: Wed, 22 Nov 2017 18:33:36 +0100 -Subject: [PATCH 2/6] Input: keyboard: pmic8xxx: remove unneeded - MODULE_VERSION() usage - -MODULE_VERSION is useless for in-kernel drivers, so remove the use of it -in the pmic8xxx-keyboard driver. - -Cc: Dmitry Torokhov <dmitry.torokhov@gmail.com> -Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> ---- - drivers/input/keyboard/pmic8xxx-keypad.c | 1 - - 1 file changed, 1 deletion(-) - ---- a/drivers/input/keyboard/pmic8xxx-keypad.c -+++ b/drivers/input/keyboard/pmic8xxx-keypad.c -@@ -697,6 +697,5 @@ module_platform_driver(pmic8xxx_kp_drive - - MODULE_LICENSE("GPL v2"); - MODULE_DESCRIPTION("PMIC8XXX keypad driver"); --MODULE_VERSION("1.0"); - MODULE_ALIAS("platform:pmic8xxx_keypad"); - MODULE_AUTHOR("Trilok Soni <tsoni@codeaurora.org>"); 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 - diff --git a/0003-Input-mouse-elan_i2c-remove-unneeded-MODULE_VERSION-.patch b/0003-Input-mouse-elan_i2c-remove-unneeded-MODULE_VERSION-.patch deleted file mode 100644 index 94938e7e9e8605..00000000000000 --- a/0003-Input-mouse-elan_i2c-remove-unneeded-MODULE_VERSION-.patch +++ /dev/null @@ -1,31 +0,0 @@ -From a112171e14bfdaac46da06658edd6cb8905eadcc Mon Sep 17 00:00:00 2001 -From: Greg Kroah-Hartman <gregkh@linuxfoundation.org> -Date: Wed, 22 Nov 2017 18:34:37 +0100 -Subject: [PATCH 3/6] Input: mouse: elan_i2c: remove unneeded MODULE_VERSION() - usage - -MODULE_VERSION is useless for in-kernel drivers, so just remove all -usage of it in the elan_i2c mouse driver. Now that this is gone, the -ELAN_DRIVER_VERSION define was also removed as it was pointless. - -Cc: Dmitry Torokhov <dmitry.torokhov@gmail.com> -Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> ---- - drivers/input/mouse/elan_i2c_core.c | 2 -- - 1 file changed, 2 deletions(-) - ---- a/drivers/input/mouse/elan_i2c_core.c -+++ b/drivers/input/mouse/elan_i2c_core.c -@@ -42,7 +42,6 @@ - #include "elan_i2c.h" - - #define DRIVER_NAME "elan_i2c" --#define ELAN_DRIVER_VERSION "1.6.3" - #define ELAN_VENDOR_ID 0x04f3 - #define ETP_MAX_PRESSURE 255 - #define ETP_FWIDTH_REDUCE 90 -@@ -1294,4 +1293,3 @@ module_i2c_driver(elan_driver); - MODULE_AUTHOR("Duson Lin <dusonlin@emc.com.tw>"); - MODULE_DESCRIPTION("Elan I2C/SMBus Touchpad driver"); - MODULE_LICENSE("GPL"); --MODULE_VERSION(ELAN_DRIVER_VERSION); diff --git a/0004-Input-touchscreen-remove-unneeded-MODULE_VERSION-usa.patch b/0004-Input-touchscreen-remove-unneeded-MODULE_VERSION-usa.patch deleted file mode 100644 index 0770937e4075ab..00000000000000 --- a/0004-Input-touchscreen-remove-unneeded-MODULE_VERSION-usa.patch +++ /dev/null @@ -1,76 +0,0 @@ -From 69d8a45f89531a777dd22202f4841a2db1a467a5 Mon Sep 17 00:00:00 2001 -From: Greg Kroah-Hartman <gregkh@linuxfoundation.org> -Date: Wed, 22 Nov 2017 18:36:10 +0100 -Subject: [PATCH 4/6] Input: touchscreen: remove unneeded MODULE_VERSION() - usage - -MODULE_VERSION is useless for in-kernel drivers, so just remove all -usage of it in the touchscreen drivers. Along with this, some -DRV_VERSION macros were removed as they are also pointless. - -Cc: Dmitry Torokhov <dmitry.torokhov@gmail.com> -Cc: Sangwon Jee <jeesw@melfas.com> -Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> ---- - drivers/input/touchscreen/colibri-vf50-ts.c | 2 -- - drivers/input/touchscreen/elants_i2c.c | 2 -- - drivers/input/touchscreen/melfas_mip4.c | 1 - - drivers/input/touchscreen/wdt87xx_i2c.c | 2 -- - 4 files changed, 7 deletions(-) - ---- a/drivers/input/touchscreen/colibri-vf50-ts.c -+++ b/drivers/input/touchscreen/colibri-vf50-ts.c -@@ -28,7 +28,6 @@ - #include <linux/types.h> - - #define DRIVER_NAME "colibri-vf50-ts" --#define DRV_VERSION "1.0" - - #define VF_ADC_MAX ((1 << 12) - 1) - -@@ -382,4 +381,3 @@ module_platform_driver(vf50_touch_driver - MODULE_AUTHOR("Sanchayan Maity"); - MODULE_DESCRIPTION("Colibri VF50 Touchscreen driver"); - MODULE_LICENSE("GPL"); --MODULE_VERSION(DRV_VERSION); ---- a/drivers/input/touchscreen/elants_i2c.c -+++ b/drivers/input/touchscreen/elants_i2c.c -@@ -44,7 +44,6 @@ - - /* Device, Driver information */ - #define DEVICE_NAME "elants_i2c" --#define DRV_VERSION "1.0.9" - - /* Convert from rows or columns into resolution */ - #define ELAN_TS_RESOLUTION(n, m) (((n) - 1) * (m)) -@@ -1402,5 +1401,4 @@ module_i2c_driver(elants_i2c_driver); - - MODULE_AUTHOR("Scott Liu <scott.liu@emc.com.tw>"); - MODULE_DESCRIPTION("Elan I2c Touchscreen driver"); --MODULE_VERSION(DRV_VERSION); - MODULE_LICENSE("GPL"); ---- a/drivers/input/touchscreen/melfas_mip4.c -+++ b/drivers/input/touchscreen/melfas_mip4.c -@@ -1611,6 +1611,5 @@ static struct i2c_driver mip4_driver = { - module_i2c_driver(mip4_driver); - - MODULE_DESCRIPTION("MELFAS MIP4 Touchscreen"); --MODULE_VERSION("2016.10.31"); - MODULE_AUTHOR("Sangwon Jee <jeesw@melfas.com>"); - MODULE_LICENSE("GPL"); ---- a/drivers/input/touchscreen/wdt87xx_i2c.c -+++ b/drivers/input/touchscreen/wdt87xx_i2c.c -@@ -23,7 +23,6 @@ - #include <asm/unaligned.h> - - #define WDT87XX_NAME "wdt87xx_i2c" --#define WDT87XX_DRV_VER "0.9.8" - #define WDT87XX_FW_NAME "wdt87xx_fw.bin" - #define WDT87XX_CFG_NAME "wdt87xx_cfg.bin" - -@@ -1183,5 +1182,4 @@ module_i2c_driver(wdt87xx_driver); - - MODULE_AUTHOR("HN Chen <hn.chen@weidahitech.com>"); - MODULE_DESCRIPTION("WeidaHiTech WDT87XX Touchscreen driver"); --MODULE_VERSION(WDT87XX_DRV_VER); - MODULE_LICENSE("GPL"); diff --git a/0005-Input-misc-remove-unneeded-MODULE_VERSION-usage.patch b/0005-Input-misc-remove-unneeded-MODULE_VERSION-usage.patch deleted file mode 100644 index d506a13a31e568..00000000000000 --- a/0005-Input-misc-remove-unneeded-MODULE_VERSION-usage.patch +++ /dev/null @@ -1,56 +0,0 @@ -From 4e41f2f810772a815ca3c0bc62535f047379081e Mon Sep 17 00:00:00 2001 -From: Greg Kroah-Hartman <gregkh@linuxfoundation.org> -Date: Wed, 22 Nov 2017 18:37:30 +0100 -Subject: [PATCH 5/6] Input: misc: remove unneeded MODULE_VERSION() usage - -MODULE_VERSION is useless for in-kernel drivers, so just remove all -usage of it in the misc input drivers. Along with this, some -DRIVER_VERSION macros were removed as they are also pointless. - -Cc: Dmitry Torokhov <dmitry.torokhov@gmail.com> -Cc: Ville Syrjala <syrjala@sci.fi> -Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> ---- - drivers/input/misc/apanel.c | 2 -- - drivers/input/misc/ati_remote2.c | 2 -- - drivers/input/misc/uinput.c | 1 - - 3 files changed, 5 deletions(-) - ---- a/drivers/input/misc/apanel.c -+++ b/drivers/input/misc/apanel.c -@@ -26,7 +26,6 @@ - #include <linux/leds.h> - - #define APANEL_NAME "Fujitsu Application Panel" --#define APANEL_VERSION "1.3.1" - #define APANEL "apanel" - - /* How often we poll keys - msecs */ -@@ -345,7 +344,6 @@ module_exit(apanel_cleanup); - MODULE_AUTHOR("Stephen Hemminger <shemminger@linux-foundation.org>"); - MODULE_DESCRIPTION(APANEL_NAME " driver"); - MODULE_LICENSE("GPL"); --MODULE_VERSION(APANEL_VERSION); - - MODULE_ALIAS("dmi:*:svnFUJITSU:pnLifeBook*:pvr*:rvnFUJITSU:*"); - MODULE_ALIAS("dmi:*:svnFUJITSU:pnLifebook*:pvr*:rvnFUJITSU:*"); ---- a/drivers/input/misc/ati_remote2.c -+++ b/drivers/input/misc/ati_remote2.c -@@ -14,10 +14,8 @@ - #include <linux/module.h> - - #define DRIVER_DESC "ATI/Philips USB RF remote driver" --#define DRIVER_VERSION "0.3" - - MODULE_DESCRIPTION(DRIVER_DESC); --MODULE_VERSION(DRIVER_VERSION); - MODULE_AUTHOR("Ville Syrjala <syrjala@sci.fi>"); - MODULE_LICENSE("GPL"); - ---- a/drivers/input/misc/uinput.c -+++ b/drivers/input/misc/uinput.c -@@ -1085,4 +1085,3 @@ MODULE_ALIAS("devname:" UINPUT_NAME); - MODULE_AUTHOR("Aristeu Sergio Rozanski Filho"); - MODULE_DESCRIPTION("User level driver support for input subsystem"); - MODULE_LICENSE("GPL"); --MODULE_VERSION("0.3"); diff --git a/0006-Input-remove-remaining-unneeded-MODULE_VERSION-usage.patch b/0006-Input-remove-remaining-unneeded-MODULE_VERSION-usage.patch deleted file mode 100644 index c1b702416185cd..00000000000000 --- a/0006-Input-remove-remaining-unneeded-MODULE_VERSION-usage.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 4cf917cb1738f121aa77cdf632d41d829c41df51 Mon Sep 17 00:00:00 2001 -From: Greg Kroah-Hartman <gregkh@linuxfoundation.org> -Date: Wed, 22 Nov 2017 18:38:41 +0100 -Subject: [PATCH 6/6] Input: remove remaining unneeded MODULE_VERSION() usage - -MODULE_VERSION is useless for in-kernel drivers, so just remove all -usage of it in the remaining few input drivers that still used it -(input-polldev and sparse-keymap). - -Cc: Dmitry Torokhov <dmitry.torokhov@gmail.com> -Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> ---- - drivers/input/input-polldev.c | 1 - - drivers/input/sparse-keymap.c | 1 - - 2 files changed, 2 deletions(-) - ---- a/drivers/input/input-polldev.c -+++ b/drivers/input/input-polldev.c -@@ -20,7 +20,6 @@ - MODULE_AUTHOR("Dmitry Torokhov <dtor@mail.ru>"); - MODULE_DESCRIPTION("Generic implementation of a polled input device"); - MODULE_LICENSE("GPL v2"); --MODULE_VERSION("0.1"); - - static void input_polldev_queue_work(struct input_polled_dev *dev) - { ---- a/drivers/input/sparse-keymap.c -+++ b/drivers/input/sparse-keymap.c -@@ -21,7 +21,6 @@ - MODULE_AUTHOR("Dmitry Torokhov <dtor@mail.ru>"); - MODULE_DESCRIPTION("Generic support for sparse keymaps"); - MODULE_LICENSE("GPL v2"); --MODULE_VERSION("0.1"); - - static unsigned int sparse_keymap_get_key_index(struct input_dev *dev, - const struct key_entry *k) diff --git a/0006-scsi-csiostor-remove-unneeded-DRIVER_LICENSE-define.patch b/0006-scsi-csiostor-remove-unneeded-DRIVER_LICENSE-define.patch deleted file mode 100644 index df3222610aee78..00000000000000 --- a/0006-scsi-csiostor-remove-unneeded-DRIVER_LICENSE-define.patch +++ /dev/null @@ -1,46 +0,0 @@ -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 -@@ -1258,7 +1258,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" - @@ -1,18 +1,8 @@ # -usb-serial-pl2303-new-device-id-for-chilitag.patch acpi-sbshc-remove-raw-pointer-from-printk-message.patch -0001-Input-rmi4-remove-unneeded-MODULE_VERSION-usage.patch -0002-Input-keyboard-pmic8xxx-remove-unneeded-MODULE_VERSI.patch -0003-Input-mouse-elan_i2c-remove-unneeded-MODULE_VERSION-.patch -0004-Input-touchscreen-remove-unneeded-MODULE_VERSION-usa.patch -0005-Input-misc-remove-unneeded-MODULE_VERSION-usage.patch -0006-Input-remove-remaining-unneeded-MODULE_VERSION-usage.patch -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 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 diff --git a/usb-serial-pl2303-new-device-id-for-chilitag.patch b/usb-serial-pl2303-new-device-id-for-chilitag.patch deleted file mode 100644 index 890baa8cc0fcd6..00000000000000 --- a/usb-serial-pl2303-new-device-id-for-chilitag.patch +++ /dev/null @@ -1,37 +0,0 @@ -From foo@baz Thu Jan 25 09:48:55 CET 2018 -Date: Thu, 25 Jan 2018 09:48:55 +0100 -To: Greg KH <gregkh@linuxfoundation.org> -From: Greg Kroah-Hartman <gregkh@linuxfoundation.org> -Subject: [PATCH] USB: serial: pl2303: new device id for Chilitag - -This adds a new device id for Chilitag devices to the pl2303 driver. - -Reported-by: "Chu.Mike [朱堅宜]" <Mike-Chu@prolific.com.tw> -Cc: stable <stable@vger.kernel.org> -Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> - ---- - drivers/usb/serial/pl2303.c | 1 + - drivers/usb/serial/pl2303.h | 1 + - 2 files changed, 2 insertions(+) - ---- a/drivers/usb/serial/pl2303.c -+++ b/drivers/usb/serial/pl2303.c -@@ -38,6 +38,7 @@ static const struct usb_device_id id_tab - { USB_DEVICE(PL2303_VENDOR_ID, PL2303_PRODUCT_ID_RSAQ2) }, - { USB_DEVICE(PL2303_VENDOR_ID, PL2303_PRODUCT_ID_DCU11) }, - { USB_DEVICE(PL2303_VENDOR_ID, PL2303_PRODUCT_ID_RSAQ3) }, -+ { USB_DEVICE(PL2303_VENDOR_ID, PL2303_PRODUCT_ID_CHILITAG) }, - { USB_DEVICE(PL2303_VENDOR_ID, PL2303_PRODUCT_ID_PHAROS) }, - { USB_DEVICE(PL2303_VENDOR_ID, PL2303_PRODUCT_ID_ALDIGA) }, - { USB_DEVICE(PL2303_VENDOR_ID, PL2303_PRODUCT_ID_MMX) }, ---- a/drivers/usb/serial/pl2303.h -+++ b/drivers/usb/serial/pl2303.h -@@ -12,6 +12,7 @@ - #define PL2303_PRODUCT_ID_DCU11 0x1234 - #define PL2303_PRODUCT_ID_PHAROS 0xaaa0 - #define PL2303_PRODUCT_ID_RSAQ3 0xaaa2 -+#define PL2303_PRODUCT_ID_CHILITAG 0xaaa8 - #define PL2303_PRODUCT_ID_ALDIGA 0x0611 - #define PL2303_PRODUCT_ID_MMX 0x0612 - #define PL2303_PRODUCT_ID_GPRS 0x0609 diff --git a/usb_DEVICE_ATTR.patch b/usb_DEVICE_ATTR.patch index f48fb4fe431343..275d723c70e71e 100644 --- a/usb_DEVICE_ATTR.patch +++ b/usb_DEVICE_ATTR.patch @@ -1,129 +1,8 @@ --- - drivers/usb/chipidea/core.c | 10 +-- - drivers/usb/class/cdc-acm.c | 21 +++--- - drivers/usb/class/usblp.c | 6 - drivers/usb/gadget/function/f_mass_storage.c | 5 - - drivers/usb/gadget/udc/core.c | 13 ++-- - drivers/usb/host/ehci-sysfs.c | 12 +-- - drivers/usb/host/fotg210-hcd.c | 8 -- - drivers/usb/misc/cypress_cy7c63.c | 23 +++---- - drivers/usb/misc/cytherm.c | 54 +++++++---------- - drivers/usb/misc/trancevibrator.c | 9 +- - drivers/usb/misc/usbsevseg.c | 40 +++++-------- - drivers/usb/serial/ftdi_sio.c | 4 - - drivers/usb/storage/sierra_ms.c | 6 - - drivers/usb/usbip/stub_dev.c | 7 +- - drivers/usb/usbip/vhci_sysfs.c | 8 +- - drivers/usb/usbip/vudc_sysfs.c | 7 +- drivers/usb/wusbcore/cbaf.c | 82 +++++++++++---------------- - 17 files changed, 143 insertions(+), 172 deletions(-) + 2 files changed, 38 insertions(+), 49 deletions(-) ---- a/drivers/usb/chipidea/core.c -+++ b/drivers/usb/chipidea/core.c -@@ -835,8 +835,8 @@ static void ci_get_otg_capable(struct ci - } - } - --static ssize_t ci_role_show(struct device *dev, struct device_attribute *attr, -- char *buf) -+static ssize_t role_show(struct device *dev, struct device_attribute *attr, -+ char *buf) - { - struct ci_hdrc *ci = dev_get_drvdata(dev); - -@@ -846,8 +846,8 @@ static ssize_t ci_role_show(struct devic - return 0; - } - --static ssize_t ci_role_store(struct device *dev, -- struct device_attribute *attr, const char *buf, size_t n) -+static ssize_t role_store(struct device *dev, struct device_attribute *attr, -+ const char *buf, size_t n) - { - struct ci_hdrc *ci = dev_get_drvdata(dev); - enum ci_role role; -@@ -877,7 +877,7 @@ static ssize_t ci_role_store(struct devi - - return (ret == 0) ? n : ret; - } --static DEVICE_ATTR(role, 0644, ci_role_show, ci_role_store); -+static DEVICE_ATTR_RW(role); - - static struct attribute *ci_attrs[] = { - &dev_attr_role.attr, ---- a/drivers/usb/class/cdc-acm.c -+++ b/drivers/usb/class/cdc-acm.c -@@ -235,18 +235,18 @@ static int acm_start_wb(struct acm *acm, - /* - * attributes exported through sysfs - */ --static ssize_t show_caps --(struct device *dev, struct device_attribute *attr, char *buf) -+static ssize_t bmCapabilities_show(struct device *dev, -+ struct device_attribute *attr, char *buf) - { - struct usb_interface *intf = to_usb_interface(dev); - struct acm *acm = usb_get_intfdata(intf); - - return sprintf(buf, "%d", acm->ctrl_caps); - } --static DEVICE_ATTR(bmCapabilities, S_IRUGO, show_caps, NULL); -+static DEVICE_ATTR_RO(bmCapabilities); - --static ssize_t show_country_codes --(struct device *dev, struct device_attribute *attr, char *buf) -+static ssize_t wCountryCodes_show(struct device *dev, -+ struct device_attribute *attr, char *buf) - { - struct usb_interface *intf = to_usb_interface(dev); - struct acm *acm = usb_get_intfdata(intf); -@@ -254,19 +254,18 @@ static ssize_t show_country_codes - memcpy(buf, acm->country_codes, acm->country_code_size); - return acm->country_code_size; - } -+static DEVICE_ATTR_RO(wCountryCodes); - --static DEVICE_ATTR(wCountryCodes, S_IRUGO, show_country_codes, NULL); -- --static ssize_t show_country_rel_date --(struct device *dev, struct device_attribute *attr, char *buf) -+static ssize_t iCountryCodeRelDate_show(struct device *dev, -+ struct device_attribute *attr, -+ char *buf) - { - struct usb_interface *intf = to_usb_interface(dev); - struct acm *acm = usb_get_intfdata(intf); - - return sprintf(buf, "%d", acm->country_rel_date); - } -- --static DEVICE_ATTR(iCountryCodeRelDate, S_IRUGO, show_country_rel_date, NULL); -+static DEVICE_ATTR_RO(iCountryCodeRelDate); - /* - * Interrupt handlers for various ACM device responses - */ ---- a/drivers/usb/class/usblp.c -+++ b/drivers/usb/class/usblp.c -@@ -1066,7 +1066,8 @@ static struct usb_class_driver usblp_cla - .minor_base = USBLP_MINOR_BASE, - }; - --static ssize_t usblp_show_ieee1284_id(struct device *dev, struct device_attribute *attr, char *buf) -+static ssize_t ieee1284_id_show(struct device *dev, -+ struct device_attribute *attr, char *buf) - { - struct usb_interface *intf = to_usb_interface(dev); - struct usblp *usblp = usb_get_intfdata(intf); -@@ -1077,8 +1078,7 @@ static ssize_t usblp_show_ieee1284_id(st - - return sprintf(buf, "%s", usblp->device_id_string+2); - } -- --static DEVICE_ATTR(ieee1284_id, S_IRUGO, usblp_show_ieee1284_id, NULL); -+static DEVICE_ATTR_RO(ieee1284_id); - - static int usblp_probe(struct usb_interface *intf, - const struct usb_device_id *id) --- a/drivers/usb/gadget/function/f_mass_storage.c +++ b/drivers/usb/gadget/function/f_mass_storage.c @@ -2545,9 +2545,8 @@ static ssize_t file_store(struct device @@ -138,578 +17,6 @@ /****************************** FSG COMMON ******************************/ ---- a/drivers/usb/gadget/udc/core.c -+++ b/drivers/usb/gadget/udc/core.c -@@ -1419,8 +1419,8 @@ EXPORT_SYMBOL_GPL(usb_gadget_unregister_ - - /* ------------------------------------------------------------------------- */ - --static ssize_t usb_udc_srp_store(struct device *dev, -- struct device_attribute *attr, const char *buf, size_t n) -+static ssize_t srp_store(struct device *dev, struct device_attribute *attr, -+ const char *buf, size_t n) - { - struct usb_udc *udc = container_of(dev, struct usb_udc, dev); - -@@ -1429,10 +1429,11 @@ static ssize_t usb_udc_srp_store(struct - - return n; - } --static DEVICE_ATTR(srp, S_IWUSR, NULL, usb_udc_srp_store); -+static DEVICE_ATTR_WO(srp); - --static ssize_t usb_udc_softconn_store(struct device *dev, -- struct device_attribute *attr, const char *buf, size_t n) -+static ssize_t soft_connect_store(struct device *dev, -+ struct device_attribute *attr, -+ const char *buf, size_t n) - { - struct usb_udc *udc = container_of(dev, struct usb_udc, dev); - -@@ -1455,7 +1456,7 @@ static ssize_t usb_udc_softconn_store(st - - return n; - } --static DEVICE_ATTR(soft_connect, S_IWUSR, NULL, usb_udc_softconn_store); -+static DEVICE_ATTR_WO(soft_connect); - - static ssize_t state_show(struct device *dev, struct device_attribute *attr, - char *buf) ---- a/drivers/usb/host/ehci-sysfs.c -+++ b/drivers/usb/host/ehci-sysfs.c -@@ -7,7 +7,7 @@ - - - /* Display the ports dedicated to the companion controller */ --static ssize_t show_companion(struct device *dev, -+static ssize_t companion_show(struct device *dev, - struct device_attribute *attr, - char *buf) - { -@@ -34,7 +34,7 @@ static ssize_t show_companion(struct dev - * Syntax is "[-]portnum", where a leading '-' sign means - * return control of the port to the EHCI controller. - */ --static ssize_t store_companion(struct device *dev, -+static ssize_t companion_store(struct device *dev, - struct device_attribute *attr, - const char *buf, size_t count) - { -@@ -59,13 +59,13 @@ static ssize_t store_companion(struct de - set_owner(ehci, portnum, new_owner); - return count; - } --static DEVICE_ATTR(companion, 0644, show_companion, store_companion); -+static DEVICE_ATTR_RW(companion); - - - /* - * Display / Set uframe_periodic_max - */ --static ssize_t show_uframe_periodic_max(struct device *dev, -+static ssize_t uframe_periodic_max_show(struct device *dev, - struct device_attribute *attr, - char *buf) - { -@@ -78,7 +78,7 @@ static ssize_t show_uframe_periodic_max( - } - - --static ssize_t store_uframe_periodic_max(struct device *dev, -+static ssize_t uframe_periodic_max_store(struct device *dev, - struct device_attribute *attr, - const char *buf, size_t count) - { -@@ -143,7 +143,7 @@ out_unlock: - spin_unlock_irqrestore (&ehci->lock, flags); - return ret; - } --static DEVICE_ATTR(uframe_periodic_max, 0644, show_uframe_periodic_max, store_uframe_periodic_max); -+static DEVICE_ATTR_RW(uframe_periodic_max); - - - static inline int create_sysfs_files(struct ehci_hcd *ehci) ---- a/drivers/usb/host/fotg210-hcd.c -+++ b/drivers/usb/host/fotg210-hcd.c -@@ -4696,7 +4696,7 @@ static void scan_isoc(struct fotg210_hcd - - /* Display / Set uframe_periodic_max - */ --static ssize_t show_uframe_periodic_max(struct device *dev, -+static ssize_t uframe_periodic_max_show(struct device *dev, - struct device_attribute *attr, char *buf) - { - struct fotg210_hcd *fotg210; -@@ -4708,7 +4708,7 @@ static ssize_t show_uframe_periodic_max( - } - - --static ssize_t store_uframe_periodic_max(struct device *dev, -+static ssize_t uframe_periodic_max_store(struct device *dev, - struct device_attribute *attr, const char *buf, size_t count) - { - struct fotg210_hcd *fotg210; -@@ -4774,9 +4774,7 @@ out_unlock: - spin_unlock_irqrestore(&fotg210->lock, flags); - return ret; - } -- --static DEVICE_ATTR(uframe_periodic_max, 0644, show_uframe_periodic_max, -- store_uframe_periodic_max); -+static DEVICE_ATTR_RW(uframe_periodic_max); - - static inline int create_sysfs_files(struct fotg210_hcd *fotg210) - { ---- a/drivers/usb/misc/cypress_cy7c63.c -+++ b/drivers/usb/misc/cypress_cy7c63.c -@@ -144,17 +144,15 @@ error: - } - - /* attribute callback handler (write) */ --static ssize_t set_port0_handler(struct device *dev, -- struct device_attribute *attr, -- const char *buf, size_t count) -+static ssize_t port0_store(struct device *dev, struct device_attribute *attr, -+ const char *buf, size_t count) - { - return write_port(dev, attr, buf, count, 0, CYPRESS_WRITE_PORT_ID0); - } - - /* attribute callback handler (write) */ --static ssize_t set_port1_handler(struct device *dev, -- struct device_attribute *attr, -- const char *buf, size_t count) -+static ssize_t port1_store(struct device *dev, struct device_attribute *attr, -+ const char *buf, size_t count) - { - return write_port(dev, attr, buf, count, 1, CYPRESS_WRITE_PORT_ID1); - } -@@ -178,22 +176,21 @@ static ssize_t read_port(struct device * - } - - /* attribute callback handler (read) */ --static ssize_t get_port0_handler(struct device *dev, -- struct device_attribute *attr, char *buf) -+static ssize_t port0_show(struct device *dev, struct device_attribute *attr, -+ char *buf) - { - return read_port(dev, attr, buf, 0, CYPRESS_READ_PORT_ID0); - } - - /* attribute callback handler (read) */ --static ssize_t get_port1_handler(struct device *dev, -- struct device_attribute *attr, char *buf) -+static ssize_t port1_show(struct device *dev, struct device_attribute *attr, -+ char *buf) - { - return read_port(dev, attr, buf, 1, CYPRESS_READ_PORT_ID1); - } - --static DEVICE_ATTR(port0, S_IRUGO | S_IWUSR, get_port0_handler, set_port0_handler); -- --static DEVICE_ATTR(port1, S_IRUGO | S_IWUSR, get_port1_handler, set_port1_handler); -+static DEVICE_ATTR_RW(port0); -+static DEVICE_ATTR_RW(port1); - - - static int cypress_probe(struct usb_interface *interface, ---- a/drivers/usb/misc/cytherm.c -+++ b/drivers/usb/misc/cytherm.c -@@ -78,7 +78,8 @@ static int vendor_command(struct usb_dev - #define BRIGHTNESS 0x2c /* RAM location for brightness value */ - #define BRIGHTNESS_SEM 0x2b /* RAM location for brightness semaphore */ - --static ssize_t show_brightness(struct device *dev, struct device_attribute *attr, char *buf) -+static ssize_t brightness_show(struct device *dev, -+ struct device_attribute *attr, char *buf) - { - struct usb_interface *intf = to_usb_interface(dev); - struct usb_cytherm *cytherm = usb_get_intfdata(intf); -@@ -86,8 +87,9 @@ static ssize_t show_brightness(struct de - return sprintf(buf, "%i", cytherm->brightness); - } - --static ssize_t set_brightness(struct device *dev, struct device_attribute *attr, const char *buf, -- size_t count) -+static ssize_t brightness_store(struct device *dev, -+ struct device_attribute *attr, const char *buf, -+ size_t count) - { - struct usb_interface *intf = to_usb_interface(dev); - struct usb_cytherm *cytherm = usb_get_intfdata(intf); -@@ -121,15 +123,14 @@ static ssize_t set_brightness(struct dev - - return count; - } -- --static DEVICE_ATTR(brightness, S_IRUGO | S_IWUSR | S_IWGRP, -- show_brightness, set_brightness); -+static DEVICE_ATTR_RW(brightness); - - - #define TEMP 0x33 /* RAM location for temperature */ - #define SIGN 0x34 /* RAM location for temperature sign */ - --static ssize_t show_temp(struct device *dev, struct device_attribute *attr, char *buf) -+static ssize_t temp_show(struct device *dev, struct device_attribute *attr, -+ char *buf) - { - - struct usb_interface *intf = to_usb_interface(dev); -@@ -161,19 +162,13 @@ static ssize_t show_temp(struct device * - return sprintf(buf, "%c%i.%i", sign ? '-' : '+', temp >> 1, - 5*(temp - ((temp >> 1) << 1))); - } -- -- --static ssize_t set_temp(struct device *dev, struct device_attribute *attr, const char *buf, size_t count) --{ -- return count; --} -- --static DEVICE_ATTR(temp, S_IRUGO, show_temp, set_temp); -+static DEVICE_ATTR_RO(temp); - - - #define BUTTON 0x7a - --static ssize_t show_button(struct device *dev, struct device_attribute *attr, char *buf) -+static ssize_t button_show(struct device *dev, struct device_attribute *attr, -+ char *buf) - { - - struct usb_interface *intf = to_usb_interface(dev); -@@ -200,17 +195,11 @@ static ssize_t show_button(struct device - else - return sprintf(buf, "0"); - } -+static DEVICE_ATTR_RO(button); - - --static ssize_t set_button(struct device *dev, struct device_attribute *attr, const char *buf, size_t count) --{ -- return count; --} -- --static DEVICE_ATTR(button, S_IRUGO, show_button, set_button); -- -- --static ssize_t show_port0(struct device *dev, struct device_attribute *attr, char *buf) -+static ssize_t port0_show(struct device *dev, struct device_attribute *attr, -+ char *buf) - { - struct usb_interface *intf = to_usb_interface(dev); - struct usb_cytherm *cytherm = usb_get_intfdata(intf); -@@ -234,7 +223,8 @@ static ssize_t show_port0(struct device - } - - --static ssize_t set_port0(struct device *dev, struct device_attribute *attr, const char *buf, size_t count) -+static ssize_t port0_store(struct device *dev, struct device_attribute *attr, -+ const char *buf, size_t count) - { - struct usb_interface *intf = to_usb_interface(dev); - struct usb_cytherm *cytherm = usb_get_intfdata(intf); -@@ -263,10 +253,10 @@ static ssize_t set_port0(struct device * - - return count; - } -+static DEVICE_ATTR_RW(port0); - --static DEVICE_ATTR(port0, S_IRUGO | S_IWUSR | S_IWGRP, show_port0, set_port0); -- --static ssize_t show_port1(struct device *dev, struct device_attribute *attr, char *buf) -+static ssize_t port1_show(struct device *dev, struct device_attribute *attr, -+ char *buf) - { - struct usb_interface *intf = to_usb_interface(dev); - struct usb_cytherm *cytherm = usb_get_intfdata(intf); -@@ -290,7 +280,8 @@ static ssize_t show_port1(struct device - } - - --static ssize_t set_port1(struct device *dev, struct device_attribute *attr, const char *buf, size_t count) -+static ssize_t port1_store(struct device *dev, struct device_attribute *attr, -+ const char *buf, size_t count) - { - struct usb_interface *intf = to_usb_interface(dev); - struct usb_cytherm *cytherm = usb_get_intfdata(intf); -@@ -319,8 +310,7 @@ static ssize_t set_port1(struct device * - - return count; - } -- --static DEVICE_ATTR(port1, S_IRUGO | S_IWUSR | S_IWGRP, show_port1, set_port1); -+static DEVICE_ATTR_RW(port1); - - - ---- a/drivers/usb/misc/trancevibrator.c -+++ b/drivers/usb/misc/trancevibrator.c -@@ -30,7 +30,7 @@ struct trancevibrator { - unsigned int speed; - }; - --static ssize_t show_speed(struct device *dev, struct device_attribute *attr, -+static ssize_t speed_show(struct device *dev, struct device_attribute *attr, - char *buf) - { - struct usb_interface *intf = to_usb_interface(dev); -@@ -39,8 +39,8 @@ static ssize_t show_speed(struct device - return sprintf(buf, "%d\n", tv->speed); - } - --static ssize_t set_speed(struct device *dev, struct device_attribute *attr, -- const char *buf, size_t count) -+static ssize_t speed_store(struct device *dev, struct device_attribute *attr, -+ const char *buf, size_t count) - { - struct usb_interface *intf = to_usb_interface(dev); - struct trancevibrator *tv = usb_get_intfdata(intf); -@@ -69,8 +69,7 @@ static ssize_t set_speed(struct device * - } - return count; - } -- --static DEVICE_ATTR(speed, S_IRUGO | S_IWUSR, show_speed, set_speed); -+static DEVICE_ATTR_RW(speed); - - static int tv_probe(struct usb_interface *interface, - const struct usb_device_id *id) ---- a/drivers/usb/misc/usbsevseg.c -+++ b/drivers/usb/misc/usbsevseg.c -@@ -165,7 +165,7 @@ static void update_display_visual(struct - } - - #define MYDEV_ATTR_SIMPLE_UNSIGNED(name, update_fcn) \ --static ssize_t show_attr_##name(struct device *dev, \ -+static ssize_t name##_show(struct device *dev, \ - struct device_attribute *attr, char *buf) \ - { \ - struct usb_interface *intf = to_usb_interface(dev); \ -@@ -174,7 +174,7 @@ static ssize_t show_attr_##name(struct d - return sprintf(buf, "%u\n", mydev->name); \ - } \ - \ --static ssize_t set_attr_##name(struct device *dev, \ -+static ssize_t name##_store(struct device *dev, \ - struct device_attribute *attr, const char *buf, size_t count) \ - { \ - struct usb_interface *intf = to_usb_interface(dev); \ -@@ -185,10 +185,10 @@ static ssize_t set_attr_##name(struct de - \ - return count; \ - } \ --static DEVICE_ATTR(name, S_IRUGO | S_IWUSR, show_attr_##name, set_attr_##name); -+static DEVICE_ATTR_RW(name); - --static ssize_t show_attr_text(struct device *dev, -- struct device_attribute *attr, char *buf) -+static ssize_t text_show(struct device *dev, struct device_attribute *attr, -+ char *buf) - { - struct usb_interface *intf = to_usb_interface(dev); - struct usb_sevsegdev *mydev = usb_get_intfdata(intf); -@@ -196,8 +196,8 @@ static ssize_t show_attr_text(struct dev - return snprintf(buf, mydev->textlength, "%s\n", mydev->text); - } - --static ssize_t set_attr_text(struct device *dev, -- struct device_attribute *attr, const char *buf, size_t count) -+static ssize_t text_store(struct device *dev, struct device_attribute *attr, -+ const char *buf, size_t count) - { - struct usb_interface *intf = to_usb_interface(dev); - struct usb_sevsegdev *mydev = usb_get_intfdata(intf); -@@ -215,11 +215,10 @@ static ssize_t set_attr_text(struct devi - update_display_visual(mydev, GFP_KERNEL); - return count; - } -+static DEVICE_ATTR_RW(text); - --static DEVICE_ATTR(text, S_IRUGO | S_IWUSR, show_attr_text, set_attr_text); -- --static ssize_t show_attr_decimals(struct device *dev, -- struct device_attribute *attr, char *buf) -+static ssize_t decimals_show(struct device *dev, struct device_attribute *attr, -+ char *buf) - { - struct usb_interface *intf = to_usb_interface(dev); - struct usb_sevsegdev *mydev = usb_get_intfdata(intf); -@@ -240,8 +239,8 @@ static ssize_t show_attr_decimals(struct - return sizeof(mydev->decimals) + 1; - } - --static ssize_t set_attr_decimals(struct device *dev, -- struct device_attribute *attr, const char *buf, size_t count) -+static ssize_t decimals_store(struct device *dev, struct device_attribute *attr, -+ const char *buf, size_t count) - { - struct usb_interface *intf = to_usb_interface(dev); - struct usb_sevsegdev *mydev = usb_get_intfdata(intf); -@@ -264,11 +263,10 @@ static ssize_t set_attr_decimals(struct - - return count; - } -+static DEVICE_ATTR_RW(decimals); - --static DEVICE_ATTR(decimals, S_IRUGO | S_IWUSR, show_attr_decimals, set_attr_decimals); -- --static ssize_t show_attr_textmode(struct device *dev, -- struct device_attribute *attr, char *buf) -+static ssize_t textmode_show(struct device *dev, struct device_attribute *attr, -+ char *buf) - { - struct usb_interface *intf = to_usb_interface(dev); - struct usb_sevsegdev *mydev = usb_get_intfdata(intf); -@@ -293,8 +291,8 @@ static ssize_t show_attr_textmode(struct - return strlen(buf); - } - --static ssize_t set_attr_textmode(struct device *dev, -- struct device_attribute *attr, const char *buf, size_t count) -+static ssize_t textmode_store(struct device *dev, struct device_attribute *attr, -+ const char *buf, size_t count) - { - struct usb_interface *intf = to_usb_interface(dev); - struct usb_sevsegdev *mydev = usb_get_intfdata(intf); -@@ -308,9 +306,7 @@ static ssize_t set_attr_textmode(struct - update_display_visual(mydev, GFP_KERNEL); - return count; - } -- --static DEVICE_ATTR(textmode, S_IRUGO | S_IWUSR, show_attr_textmode, set_attr_textmode); -- -+static DEVICE_ATTR_RW(textmode); - - MYDEV_ATTR_SIMPLE_UNSIGNED(powered, update_display_powered); - MYDEV_ATTR_SIMPLE_UNSIGNED(mode_msb, update_display_mode); ---- a/drivers/usb/serial/ftdi_sio.c -+++ b/drivers/usb/serial/ftdi_sio.c -@@ -1690,7 +1690,7 @@ static DEVICE_ATTR_RW(latency_timer); - - /* Write an event character directly to the FTDI register. The ASCII - value is in the low 8 bits, with the enable bit in the 9th bit. */ --static ssize_t store_event_char(struct device *dev, -+static ssize_t event_char_store(struct device *dev, - struct device_attribute *attr, const char *valbuf, size_t count) - { - struct usb_serial_port *port = to_usb_serial_port(dev); -@@ -1717,7 +1717,7 @@ static ssize_t store_event_char(struct d - - return count; - } --static DEVICE_ATTR(event_char, S_IWUSR, NULL, store_event_char); -+static DEVICE_ATTR_WO(event_char); - - static int create_sysfs_attrs(struct usb_serial_port *port) - { ---- a/drivers/usb/storage/sierra_ms.c -+++ b/drivers/usb/storage/sierra_ms.c -@@ -90,8 +90,8 @@ static void debug_swoc(const struct devi - } - - --static ssize_t show_truinst(struct device *dev, struct device_attribute *attr, -- char *buf) -+static ssize_t truinst_show(struct device *dev, struct device_attribute *attr, -+ char *buf) - { - struct swoc_info *swocInfo; - struct usb_interface *intf = to_usb_interface(dev); -@@ -122,7 +122,7 @@ static ssize_t show_truinst(struct devic - } - return result; - } --static DEVICE_ATTR(truinst, S_IRUGO, show_truinst, NULL); -+static DEVICE_ATTR_RO(truinst); - - int sierra_ms_init(struct us_data *us) - { ---- a/drivers/usb/usbip/stub_dev.c -+++ b/drivers/usb/usbip/stub_dev.c -@@ -39,8 +39,9 @@ static DEVICE_ATTR_RO(usbip_status); - * is used to transfer usbip requests by kernel threads. -1 is a magic number - * by which usbip connection is finished. - */ --static ssize_t store_sockfd(struct device *dev, struct device_attribute *attr, -- const char *buf, size_t count) -+static ssize_t usbip_sockfd_store(struct device *dev, -+ struct device_attribute *attr, -+ const char *buf, size_t count) - { - struct stub_device *sdev = dev_get_drvdata(dev); - int sockfd = 0; -@@ -103,7 +104,7 @@ err: - spin_unlock_irq(&sdev->ud.lock); - return -EINVAL; - } --static DEVICE_ATTR(usbip_sockfd, S_IWUSR, NULL, store_sockfd); -+static DEVICE_ATTR_WO(usbip_sockfd); - - static int stub_add_files(struct device *dev) - { ---- a/drivers/usb/usbip/vhci_sysfs.c -+++ b/drivers/usb/usbip/vhci_sysfs.c -@@ -212,7 +212,7 @@ static int valid_port(__u32 pdev_nr, __u - return 1; - } - --static ssize_t store_detach(struct device *dev, struct device_attribute *attr, -+static ssize_t detach_store(struct device *dev, struct device_attribute *attr, - const char *buf, size_t count) - { - __u32 port = 0, pdev_nr = 0, rhport = 0; -@@ -250,7 +250,7 @@ static ssize_t store_detach(struct devic - - return count; - } --static DEVICE_ATTR(detach, S_IWUSR, NULL, store_detach); -+static DEVICE_ATTR_WO(detach); - - static int valid_args(__u32 pdev_nr, __u32 rhport, enum usb_device_speed speed) - { -@@ -286,7 +286,7 @@ static int valid_args(__u32 pdev_nr, __u - * - * write() returns 0 on success, else negative errno. - */ --static ssize_t store_attach(struct device *dev, struct device_attribute *attr, -+static ssize_t attach_store(struct device *dev, struct device_attribute *attr, - const char *buf, size_t count) - { - struct socket *socket; -@@ -380,7 +380,7 @@ static ssize_t store_attach(struct devic - - return count; - } --static DEVICE_ATTR(attach, S_IWUSR, NULL, store_attach); -+static DEVICE_ATTR_WO(attach); - - #define MAX_STATUS_NAME 16 - ---- a/drivers/usb/usbip/vudc_sysfs.c -+++ b/drivers/usb/usbip/vudc_sysfs.c -@@ -90,8 +90,9 @@ unlock: - } - static BIN_ATTR_RO(dev_desc, sizeof(struct usb_device_descriptor)); - --static ssize_t store_sockfd(struct device *dev, struct device_attribute *attr, -- const char *in, size_t count) -+static ssize_t usbip_sockfd_store(struct device *dev, -+ struct device_attribute *attr, -+ const char *in, size_t count) - { - struct vudc *udc = (struct vudc *) dev_get_drvdata(dev); - int rv; -@@ -180,7 +181,7 @@ unlock: - - return ret; - } --static DEVICE_ATTR(usbip_sockfd, S_IWUSR, NULL, store_sockfd); -+static DEVICE_ATTR_WO(usbip_sockfd); - - static ssize_t usbip_status_show(struct device *dev, - struct device_attribute *attr, char *out) --- a/drivers/usb/wusbcore/cbaf.c +++ b/drivers/usb/wusbcore/cbaf.c @@ -296,9 +296,8 @@ static int cbaf_cdid_get(struct cbaf *cb |