diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-12-13 13:45:23 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-12-13 13:45:23 +0100 |
| commit | 63cd2802e6c4d7ee878a9d24a5eecaf85b1e6123 (patch) | |
| tree | f22ddee1e73453a8f5064a5861503afb91e43aac | |
| parent | b9e9bac675d9ce5322e3afe3b5793c1efc25f83d (diff) | |
| download | patches-63cd2802e6c4d7ee878a9d24a5eecaf85b1e6123.tar.gz | |
add some and remove some that were merged
11 files changed, 344 insertions, 232 deletions
diff --git a/0001-Input-rmi4-remove-unneeded-MODULE_VERSION-usage.patch b/0001-Input-rmi4-remove-unneeded-MODULE_VERSION-usage.patch new file mode 100644 index 00000000000000..2f97b28aae2371 --- /dev/null +++ b/0001-Input-rmi4-remove-unneeded-MODULE_VERSION-usage.patch @@ -0,0 +1,50 @@ +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/0002-Input-keyboard-pmic8xxx-remove-unneeded-MODULE_VERSI.patch b/0002-Input-keyboard-pmic8xxx-remove-unneeded-MODULE_VERSI.patch new file mode 100644 index 00000000000000..7cc378c6c5928a --- /dev/null +++ b/0002-Input-keyboard-pmic8xxx-remove-unneeded-MODULE_VERSI.patch @@ -0,0 +1,24 @@ +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/0003-Input-mouse-elan_i2c-remove-unneeded-MODULE_VERSION-.patch b/0003-Input-mouse-elan_i2c-remove-unneeded-MODULE_VERSION-.patch new file mode 100644 index 00000000000000..94938e7e9e8605 --- /dev/null +++ b/0003-Input-mouse-elan_i2c-remove-unneeded-MODULE_VERSION-.patch @@ -0,0 +1,31 @@ +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 new file mode 100644 index 00000000000000..0770937e4075ab --- /dev/null +++ b/0004-Input-touchscreen-remove-unneeded-MODULE_VERSION-usa.patch @@ -0,0 +1,76 @@ +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/0004-net-usb-hso.c-remove-unneeded-DRIVER_LICENSE-define.patch b/0004-net-usb-hso.c-remove-unneeded-DRIVER_LICENSE-define.patch deleted file mode 100644 index a4cb06b03e955e..00000000000000 --- a/0004-net-usb-hso.c-remove-unneeded-DRIVER_LICENSE-define.patch +++ /dev/null @@ -1,43 +0,0 @@ -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-Input-misc-remove-unneeded-MODULE_VERSION-usage.patch b/0005-Input-misc-remove-unneeded-MODULE_VERSION-usage.patch new file mode 100644 index 00000000000000..d506a13a31e568 --- /dev/null +++ b/0005-Input-misc-remove-unneeded-MODULE_VERSION-usage.patch @@ -0,0 +1,56 @@ +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 new file mode 100644 index 00000000000000..c1b702416185cd --- /dev/null +++ b/0006-Input-remove-remaining-unneeded-MODULE_VERSION-usage.patch @@ -0,0 +1,36 @@ +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 index 1ae0f771a5fe70..df3222610aee78 100644 --- a/0006-scsi-csiostor-remove-unneeded-DRIVER_LICENSE-define.patch +++ b/0006-scsi-csiostor-remove-unneeded-DRIVER_LICENSE-define.patch @@ -25,7 +25,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> --- a/drivers/scsi/csiostor/csio_init.c +++ b/drivers/scsi/csiostor/csio_init.c -@@ -1255,7 +1255,7 @@ module_init(csio_init); +@@ -1258,7 +1258,7 @@ module_init(csio_init); module_exit(csio_exit); MODULE_AUTHOR(CSIO_DRV_AUTHOR); MODULE_DESCRIPTION(CSIO_DRV_DESC); diff --git a/efi-move-some-sysfs-files-to-be-read-only-by-root.patch b/efi-move-some-sysfs-files-to-be-read-only-by-root.patch deleted file mode 100644 index 0efc084f7e5857..00000000000000 --- a/efi-move-some-sysfs-files-to-be-read-only-by-root.patch +++ /dev/null @@ -1,122 +0,0 @@ -From foo@baz Tue Dec 5 09:14:53 CET 2017 -Date: Tue, 05 Dec 2017 09:14:53 +0100 -To: Greg KH <gregkh@linuxfoundation.org> -From: Greg Kroah-Hartman <gregkh@linuxfoundation.org> -Subject: [PATCH] efi: move some sysfs files to be read-only by root - -Thanks to the scripts/leaking_addresses.pl script, it was found that -some EFI values should not be readable by non-root users. - -So make them root-only, and to do that, add a __ATTR_RO_MODE() macro to -make this easier, and use it in other places at the same time. - -Reported-by: Linus Torvalds <torvalds@linux-foundation.org> -Tested-by: Dave Young <dyoung@redhat.com> -Cc: Matt Fleming <matt@codeblueprint.co.uk> -Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org> -Cc: stable <stable@vger.kernel.org> -Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> - ---- - drivers/firmware/efi/efi.c | 3 +-- - drivers/firmware/efi/esrt.c | 15 ++++++--------- - drivers/firmware/efi/runtime-map.c | 10 +++++----- - include/linux/sysfs.h | 6 ++++++ - 4 files changed, 18 insertions(+), 16 deletions(-) - ---- a/drivers/firmware/efi/efi.c -+++ b/drivers/firmware/efi/efi.c -@@ -143,8 +143,7 @@ static ssize_t systab_show(struct kobjec - return str - buf; - } - --static struct kobj_attribute efi_attr_systab = -- __ATTR(systab, 0400, systab_show, NULL); -+static struct kobj_attribute efi_attr_systab = __ATTR_RO_MODE(systab, 0400); - - #define EFI_FIELD(var) efi.var - ---- a/drivers/firmware/efi/esrt.c -+++ b/drivers/firmware/efi/esrt.c -@@ -106,7 +106,7 @@ static const struct sysfs_ops esre_attr_ - }; - - /* Generic ESRT Entry ("ESRE") support. */ --static ssize_t esre_fw_class_show(struct esre_entry *entry, char *buf) -+static ssize_t fw_class_show(struct esre_entry *entry, char *buf) - { - char *str = buf; - -@@ -117,18 +117,16 @@ static ssize_t esre_fw_class_show(struct - return str - buf; - } - --static struct esre_attribute esre_fw_class = __ATTR(fw_class, 0400, -- esre_fw_class_show, NULL); -+static struct esre_attribute esre_fw_class = __ATTR_RO_MODE(fw_class, 0400); - - #define esre_attr_decl(name, size, fmt) \ --static ssize_t esre_##name##_show(struct esre_entry *entry, char *buf) \ -+static ssize_t name##_show(struct esre_entry *entry, char *buf) \ - { \ - return sprintf(buf, fmt "\n", \ - le##size##_to_cpu(entry->esre.esre1->name)); \ - } \ - \ --static struct esre_attribute esre_##name = __ATTR(name, 0400, \ -- esre_##name##_show, NULL) -+static struct esre_attribute esre_##name = __ATTR_RO_MODE(name, 0400) - - esre_attr_decl(fw_type, 32, "%u"); - esre_attr_decl(fw_version, 32, "%u"); -@@ -193,14 +191,13 @@ static int esre_create_sysfs_entry(void - - /* support for displaying ESRT fields at the top level */ - #define esrt_attr_decl(name, size, fmt) \ --static ssize_t esrt_##name##_show(struct kobject *kobj, \ -+static ssize_t name##_show(struct kobject *kobj, \ - struct kobj_attribute *attr, char *buf)\ - { \ - return sprintf(buf, fmt "\n", le##size##_to_cpu(esrt->name)); \ - } \ - \ --static struct kobj_attribute esrt_##name = __ATTR(name, 0400, \ -- esrt_##name##_show, NULL) -+static struct kobj_attribute esrt_##name = __ATTR_RO_MODE(name, 0400) - - esrt_attr_decl(fw_resource_count, 32, "%u"); - esrt_attr_decl(fw_resource_count_max, 32, "%u"); ---- a/drivers/firmware/efi/runtime-map.c -+++ b/drivers/firmware/efi/runtime-map.c -@@ -63,11 +63,11 @@ static ssize_t map_attr_show(struct kobj - return map_attr->show(entry, buf); - } - --static struct map_attribute map_type_attr = __ATTR_RO(type); --static struct map_attribute map_phys_addr_attr = __ATTR_RO(phys_addr); --static struct map_attribute map_virt_addr_attr = __ATTR_RO(virt_addr); --static struct map_attribute map_num_pages_attr = __ATTR_RO(num_pages); --static struct map_attribute map_attribute_attr = __ATTR_RO(attribute); -+static struct map_attribute map_type_attr = __ATTR_RO_MODE(type, 0400); -+static struct map_attribute map_phys_addr_attr = __ATTR_RO_MODE(phys_addr, 0400); -+static struct map_attribute map_virt_addr_attr = __ATTR_RO_MODE(virt_addr, 0400); -+static struct map_attribute map_num_pages_attr = __ATTR_RO_MODE(num_pages, 0400); -+static struct map_attribute map_attribute_attr = __ATTR_RO_MODE(attribute, 0400); - - /* - * These are default attributes that are added for every memmap entry. ---- a/include/linux/sysfs.h -+++ b/include/linux/sysfs.h -@@ -117,6 +117,12 @@ struct attribute_group { - .show = _name##_show, \ - } - -+#define __ATTR_RO_MODE(_name, _mode) { \ -+ .attr = { .name = __stringify(_name), \ -+ .mode = VERIFY_OCTAL_PERMISSIONS(_mode) }, \ -+ .show = _name##_show, \ -+} -+ - #define __ATTR_WO(_name) { \ - .attr = { .name = __stringify(_name), .mode = S_IWUSR }, \ - .store = _name##_store, \ @@ -1,10 +1,14 @@ # -efi-move-some-sysfs-files-to-be-read-only-by-root.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 -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 diff --git a/usb_DEVICE_ATTR.patch b/usb_DEVICE_ATTR.patch index 75680c3f88299a..f48fb4fe431343 100644 --- a/usb_DEVICE_ATTR.patch +++ b/usb_DEVICE_ATTR.patch @@ -20,7 +20,7 @@ --- a/drivers/usb/chipidea/core.c +++ b/drivers/usb/chipidea/core.c -@@ -838,8 +838,8 @@ static void ci_get_otg_capable(struct ci +@@ -835,8 +835,8 @@ static void ci_get_otg_capable(struct ci } } @@ -31,7 +31,7 @@ { struct ci_hdrc *ci = dev_get_drvdata(dev); -@@ -849,8 +849,8 @@ static ssize_t ci_role_show(struct devic +@@ -846,8 +846,8 @@ static ssize_t ci_role_show(struct devic return 0; } @@ -42,7 +42,7 @@ { struct ci_hdrc *ci = dev_get_drvdata(dev); enum ci_role role; -@@ -880,7 +880,7 @@ static ssize_t ci_role_store(struct devi +@@ -877,7 +877,7 @@ static ssize_t ci_role_store(struct devi return (ret == 0) ? n : ret; } @@ -53,7 +53,7 @@ &dev_attr_role.attr, --- a/drivers/usb/class/cdc-acm.c +++ b/drivers/usb/class/cdc-acm.c -@@ -248,18 +248,18 @@ static int acm_start_wb(struct acm *acm, +@@ -235,18 +235,18 @@ static int acm_start_wb(struct acm *acm, /* * attributes exported through sysfs */ @@ -77,7 +77,7 @@ { struct usb_interface *intf = to_usb_interface(dev); struct acm *acm = usb_get_intfdata(intf); -@@ -267,19 +267,18 @@ static ssize_t show_country_codes +@@ -254,19 +254,18 @@ static ssize_t show_country_codes memcpy(buf, acm->country_codes, acm->country_code_size); return acm->country_code_size; } @@ -104,7 +104,7 @@ */ --- a/drivers/usb/class/usblp.c +++ b/drivers/usb/class/usblp.c -@@ -1081,7 +1081,8 @@ static struct usb_class_driver usblp_cla +@@ -1066,7 +1066,8 @@ static struct usb_class_driver usblp_cla .minor_base = USBLP_MINOR_BASE, }; @@ -114,7 +114,7 @@ { struct usb_interface *intf = to_usb_interface(dev); struct usblp *usblp = usb_get_intfdata(intf); -@@ -1092,8 +1093,7 @@ static ssize_t usblp_show_ieee1284_id(st +@@ -1077,8 +1078,7 @@ static ssize_t usblp_show_ieee1284_id(st return sprintf(buf, "%s", usblp->device_id_string+2); } @@ -126,7 +126,7 @@ const struct usb_device_id *id) --- a/drivers/usb/gadget/function/f_mass_storage.c +++ b/drivers/usb/gadget/function/f_mass_storage.c -@@ -2544,9 +2544,8 @@ static ssize_t file_store(struct device +@@ -2545,9 +2545,8 @@ static ssize_t file_store(struct device } static DEVICE_ATTR_RW(nofua); @@ -140,7 +140,7 @@ --- a/drivers/usb/gadget/udc/core.c +++ b/drivers/usb/gadget/udc/core.c -@@ -1426,8 +1426,8 @@ EXPORT_SYMBOL_GPL(usb_gadget_unregister_ +@@ -1419,8 +1419,8 @@ EXPORT_SYMBOL_GPL(usb_gadget_unregister_ /* ------------------------------------------------------------------------- */ @@ -151,7 +151,7 @@ { struct usb_udc *udc = container_of(dev, struct usb_udc, dev); -@@ -1436,10 +1436,11 @@ static ssize_t usb_udc_srp_store(struct +@@ -1429,10 +1429,11 @@ static ssize_t usb_udc_srp_store(struct return n; } @@ -166,7 +166,7 @@ { struct usb_udc *udc = container_of(dev, struct usb_udc, dev); -@@ -1462,7 +1463,7 @@ static ssize_t usb_udc_softconn_store(st +@@ -1455,7 +1456,7 @@ static ssize_t usb_udc_softconn_store(st return n; } @@ -177,7 +177,7 @@ char *buf) --- a/drivers/usb/host/ehci-sysfs.c +++ b/drivers/usb/host/ehci-sysfs.c -@@ -20,7 +20,7 @@ +@@ -7,7 +7,7 @@ /* Display the ports dedicated to the companion controller */ @@ -186,7 +186,7 @@ struct device_attribute *attr, char *buf) { -@@ -47,7 +47,7 @@ static ssize_t show_companion(struct dev +@@ -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. */ @@ -195,7 +195,7 @@ struct device_attribute *attr, const char *buf, size_t count) { -@@ -72,13 +72,13 @@ static ssize_t store_companion(struct de +@@ -59,13 +59,13 @@ static ssize_t store_companion(struct de set_owner(ehci, portnum, new_owner); return count; } @@ -211,7 +211,7 @@ struct device_attribute *attr, char *buf) { -@@ -91,7 +91,7 @@ static ssize_t show_uframe_periodic_max( +@@ -78,7 +78,7 @@ static ssize_t show_uframe_periodic_max( } @@ -220,7 +220,7 @@ struct device_attribute *attr, const char *buf, size_t count) { -@@ -156,7 +156,7 @@ out_unlock: +@@ -143,7 +143,7 @@ out_unlock: spin_unlock_irqrestore (&ehci->lock, flags); return ret; } @@ -231,7 +231,7 @@ static inline int create_sysfs_files(struct ehci_hcd *ehci) --- a/drivers/usb/host/fotg210-hcd.c +++ b/drivers/usb/host/fotg210-hcd.c -@@ -4709,7 +4709,7 @@ static void scan_isoc(struct fotg210_hcd +@@ -4696,7 +4696,7 @@ static void scan_isoc(struct fotg210_hcd /* Display / Set uframe_periodic_max */ @@ -240,7 +240,7 @@ struct device_attribute *attr, char *buf) { struct fotg210_hcd *fotg210; -@@ -4721,7 +4721,7 @@ static ssize_t show_uframe_periodic_max( +@@ -4708,7 +4708,7 @@ static ssize_t show_uframe_periodic_max( } @@ -249,7 +249,7 @@ struct device_attribute *attr, const char *buf, size_t count) { struct fotg210_hcd *fotg210; -@@ -4787,9 +4787,7 @@ out_unlock: +@@ -4774,9 +4774,7 @@ out_unlock: spin_unlock_irqrestore(&fotg210->lock, flags); return ret; } @@ -262,7 +262,7 @@ { --- a/drivers/usb/misc/cypress_cy7c63.c +++ b/drivers/usb/misc/cypress_cy7c63.c -@@ -147,17 +147,15 @@ error: +@@ -144,17 +144,15 @@ error: } /* attribute callback handler (write) */ @@ -284,7 +284,7 @@ { return write_port(dev, attr, buf, count, 1, CYPRESS_WRITE_PORT_ID1); } -@@ -181,22 +179,21 @@ static ssize_t read_port(struct device * +@@ -178,22 +176,21 @@ static ssize_t read_port(struct device * } /* attribute callback handler (read) */ @@ -315,7 +315,7 @@ static int cypress_probe(struct usb_interface *interface, --- a/drivers/usb/misc/cytherm.c +++ b/drivers/usb/misc/cytherm.c -@@ -82,7 +82,8 @@ static int vendor_command(struct usb_dev +@@ -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 */ @@ -325,7 +325,7 @@ { struct usb_interface *intf = to_usb_interface(dev); struct usb_cytherm *cytherm = usb_get_intfdata(intf); -@@ -90,8 +91,9 @@ static ssize_t show_brightness(struct de +@@ -86,8 +87,9 @@ static ssize_t show_brightness(struct de return sprintf(buf, "%i", cytherm->brightness); } @@ -337,7 +337,7 @@ { struct usb_interface *intf = to_usb_interface(dev); struct usb_cytherm *cytherm = usb_get_intfdata(intf); -@@ -125,15 +127,14 @@ static ssize_t set_brightness(struct dev +@@ -121,15 +123,14 @@ static ssize_t set_brightness(struct dev return count; } @@ -356,7 +356,7 @@ { struct usb_interface *intf = to_usb_interface(dev); -@@ -165,19 +166,13 @@ static ssize_t show_temp(struct device * +@@ -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))); } @@ -379,7 +379,7 @@ { struct usb_interface *intf = to_usb_interface(dev); -@@ -204,17 +199,11 @@ static ssize_t show_button(struct device +@@ -200,17 +195,11 @@ static ssize_t show_button(struct device else return sprintf(buf, "0"); } @@ -400,7 +400,7 @@ { struct usb_interface *intf = to_usb_interface(dev); struct usb_cytherm *cytherm = usb_get_intfdata(intf); -@@ -238,7 +227,8 @@ static ssize_t show_port0(struct device +@@ -234,7 +223,8 @@ static ssize_t show_port0(struct device } @@ -410,7 +410,7 @@ { struct usb_interface *intf = to_usb_interface(dev); struct usb_cytherm *cytherm = usb_get_intfdata(intf); -@@ -267,10 +257,10 @@ static ssize_t set_port0(struct device * +@@ -263,10 +253,10 @@ static ssize_t set_port0(struct device * return count; } @@ -424,7 +424,7 @@ { struct usb_interface *intf = to_usb_interface(dev); struct usb_cytherm *cytherm = usb_get_intfdata(intf); -@@ -294,7 +284,8 @@ static ssize_t show_port1(struct device +@@ -290,7 +280,8 @@ static ssize_t show_port1(struct device } @@ -434,7 +434,7 @@ { struct usb_interface *intf = to_usb_interface(dev); struct usb_cytherm *cytherm = usb_get_intfdata(intf); -@@ -323,8 +314,7 @@ static ssize_t set_port1(struct device * +@@ -319,8 +310,7 @@ static ssize_t set_port1(struct device * return count; } @@ -446,7 +446,7 @@ --- a/drivers/usb/misc/trancevibrator.c +++ b/drivers/usb/misc/trancevibrator.c -@@ -43,7 +43,7 @@ struct trancevibrator { +@@ -30,7 +30,7 @@ struct trancevibrator { unsigned int speed; }; @@ -455,7 +455,7 @@ char *buf) { struct usb_interface *intf = to_usb_interface(dev); -@@ -52,8 +52,8 @@ static ssize_t show_speed(struct device +@@ -39,8 +39,8 @@ static ssize_t show_speed(struct device return sprintf(buf, "%d\n", tv->speed); } @@ -466,7 +466,7 @@ { struct usb_interface *intf = to_usb_interface(dev); struct trancevibrator *tv = usb_get_intfdata(intf); -@@ -82,8 +82,7 @@ static ssize_t set_speed(struct device * +@@ -69,8 +69,7 @@ static ssize_t set_speed(struct device * } return count; } @@ -478,7 +478,7 @@ const struct usb_device_id *id) --- a/drivers/usb/misc/usbsevseg.c +++ b/drivers/usb/misc/usbsevseg.c -@@ -169,7 +169,7 @@ static void update_display_visual(struct +@@ -165,7 +165,7 @@ static void update_display_visual(struct } #define MYDEV_ATTR_SIMPLE_UNSIGNED(name, update_fcn) \ @@ -487,7 +487,7 @@ struct device_attribute *attr, char *buf) \ { \ struct usb_interface *intf = to_usb_interface(dev); \ -@@ -178,7 +178,7 @@ static ssize_t show_attr_##name(struct d +@@ -174,7 +174,7 @@ static ssize_t show_attr_##name(struct d return sprintf(buf, "%u\n", mydev->name); \ } \ \ @@ -496,7 +496,7 @@ struct device_attribute *attr, const char *buf, size_t count) \ { \ struct usb_interface *intf = to_usb_interface(dev); \ -@@ -189,10 +189,10 @@ static ssize_t set_attr_##name(struct de +@@ -185,10 +185,10 @@ static ssize_t set_attr_##name(struct de \ return count; \ } \ @@ -510,7 +510,7 @@ { struct usb_interface *intf = to_usb_interface(dev); struct usb_sevsegdev *mydev = usb_get_intfdata(intf); -@@ -200,8 +200,8 @@ static ssize_t show_attr_text(struct dev +@@ -196,8 +196,8 @@ static ssize_t show_attr_text(struct dev return snprintf(buf, mydev->textlength, "%s\n", mydev->text); } @@ -521,7 +521,7 @@ { struct usb_interface *intf = to_usb_interface(dev); struct usb_sevsegdev *mydev = usb_get_intfdata(intf); -@@ -219,11 +219,10 @@ static ssize_t set_attr_text(struct devi +@@ -215,11 +215,10 @@ static ssize_t set_attr_text(struct devi update_display_visual(mydev, GFP_KERNEL); return count; } @@ -536,7 +536,7 @@ { struct usb_interface *intf = to_usb_interface(dev); struct usb_sevsegdev *mydev = usb_get_intfdata(intf); -@@ -244,8 +243,8 @@ static ssize_t show_attr_decimals(struct +@@ -240,8 +239,8 @@ static ssize_t show_attr_decimals(struct return sizeof(mydev->decimals) + 1; } @@ -547,7 +547,7 @@ { struct usb_interface *intf = to_usb_interface(dev); struct usb_sevsegdev *mydev = usb_get_intfdata(intf); -@@ -268,11 +267,10 @@ static ssize_t set_attr_decimals(struct +@@ -264,11 +263,10 @@ static ssize_t set_attr_decimals(struct return count; } @@ -562,7 +562,7 @@ { struct usb_interface *intf = to_usb_interface(dev); struct usb_sevsegdev *mydev = usb_get_intfdata(intf); -@@ -297,8 +295,8 @@ static ssize_t show_attr_textmode(struct +@@ -293,8 +291,8 @@ static ssize_t show_attr_textmode(struct return strlen(buf); } @@ -573,7 +573,7 @@ { struct usb_interface *intf = to_usb_interface(dev); struct usb_sevsegdev *mydev = usb_get_intfdata(intf); -@@ -312,9 +310,7 @@ static ssize_t set_attr_textmode(struct +@@ -308,9 +306,7 @@ static ssize_t set_attr_textmode(struct update_display_visual(mydev, GFP_KERNEL); return count; } @@ -586,7 +586,7 @@ MYDEV_ATTR_SIMPLE_UNSIGNED(mode_msb, update_display_mode); --- a/drivers/usb/serial/ftdi_sio.c +++ b/drivers/usb/serial/ftdi_sio.c -@@ -1694,7 +1694,7 @@ static DEVICE_ATTR_RW(latency_timer); +@@ -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. */ @@ -595,7 +595,7 @@ struct device_attribute *attr, const char *valbuf, size_t count) { struct usb_serial_port *port = to_usb_serial_port(dev); -@@ -1721,7 +1721,7 @@ static ssize_t store_event_char(struct d +@@ -1717,7 +1717,7 @@ static ssize_t store_event_char(struct d return count; } @@ -628,7 +628,7 @@ { --- a/drivers/usb/usbip/stub_dev.c +++ b/drivers/usb/usbip/stub_dev.c -@@ -53,8 +53,9 @@ static DEVICE_ATTR_RO(usbip_status); +@@ -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. */ @@ -640,7 +640,7 @@ { struct stub_device *sdev = dev_get_drvdata(dev); int sockfd = 0; -@@ -117,7 +118,7 @@ err: +@@ -103,7 +104,7 @@ err: spin_unlock_irq(&sdev->ud.lock); return -EINVAL; } @@ -651,7 +651,7 @@ { --- a/drivers/usb/usbip/vhci_sysfs.c +++ b/drivers/usb/usbip/vhci_sysfs.c -@@ -226,7 +226,7 @@ static int valid_port(__u32 pdev_nr, __u +@@ -212,7 +212,7 @@ static int valid_port(__u32 pdev_nr, __u return 1; } @@ -660,7 +660,7 @@ const char *buf, size_t count) { __u32 port = 0, pdev_nr = 0, rhport = 0; -@@ -264,7 +264,7 @@ static ssize_t store_detach(struct devic +@@ -250,7 +250,7 @@ static ssize_t store_detach(struct devic return count; } @@ -669,7 +669,7 @@ static int valid_args(__u32 pdev_nr, __u32 rhport, enum usb_device_speed speed) { -@@ -300,7 +300,7 @@ static int valid_args(__u32 pdev_nr, __u +@@ -286,7 +286,7 @@ static int valid_args(__u32 pdev_nr, __u * * write() returns 0 on success, else negative errno. */ @@ -678,7 +678,7 @@ const char *buf, size_t count) { struct socket *socket; -@@ -394,7 +394,7 @@ static ssize_t store_attach(struct devic +@@ -380,7 +380,7 @@ static ssize_t store_attach(struct devic return count; } @@ -689,7 +689,7 @@ --- a/drivers/usb/usbip/vudc_sysfs.c +++ b/drivers/usb/usbip/vudc_sysfs.c -@@ -102,8 +102,9 @@ unlock: +@@ -90,8 +90,9 @@ unlock: } static BIN_ATTR_RO(dev_desc, sizeof(struct usb_device_descriptor)); @@ -701,7 +701,7 @@ { struct vudc *udc = (struct vudc *) dev_get_drvdata(dev); int rv; -@@ -192,7 +193,7 @@ unlock: +@@ -180,7 +181,7 @@ unlock: return ret; } @@ -712,7 +712,7 @@ struct device_attribute *attr, char *out) --- a/drivers/usb/wusbcore/cbaf.c +++ b/drivers/usb/wusbcore/cbaf.c -@@ -310,9 +310,8 @@ static int cbaf_cdid_get(struct cbaf *cb +@@ -296,9 +296,8 @@ static int cbaf_cdid_get(struct cbaf *cb return 0; } @@ -724,7 +724,7 @@ { struct usb_interface *iface = to_usb_interface(dev); struct cbaf *cbaf = usb_get_intfdata(iface); -@@ -322,9 +321,9 @@ static ssize_t cbaf_wusb_chid_show(struc +@@ -308,9 +307,9 @@ static ssize_t cbaf_wusb_chid_show(struc return scnprintf(buf, PAGE_SIZE, "%s\n", pr_chid); } @@ -737,7 +737,7 @@ { ssize_t result; struct usb_interface *iface = to_usb_interface(dev); -@@ -355,11 +354,10 @@ static ssize_t cbaf_wusb_chid_store(stru +@@ -341,11 +340,10 @@ static ssize_t cbaf_wusb_chid_store(stru return result; return size; } @@ -752,7 +752,7 @@ { struct usb_interface *iface = to_usb_interface(dev); struct cbaf *cbaf = usb_get_intfdata(iface); -@@ -367,9 +365,9 @@ static ssize_t cbaf_wusb_host_name_show( +@@ -353,9 +351,9 @@ static ssize_t cbaf_wusb_host_name_show( return scnprintf(buf, PAGE_SIZE, "%s\n", cbaf->host_name); } @@ -765,7 +765,7 @@ { ssize_t result; struct usb_interface *iface = to_usb_interface(dev); -@@ -381,12 +379,11 @@ static ssize_t cbaf_wusb_host_name_store +@@ -367,12 +365,11 @@ static ssize_t cbaf_wusb_host_name_store return size; } @@ -782,7 +782,7 @@ { struct usb_interface *iface = to_usb_interface(dev); struct cbaf *cbaf = usb_get_intfdata(iface); -@@ -394,9 +391,9 @@ static ssize_t cbaf_wusb_host_band_group +@@ -380,9 +377,9 @@ static ssize_t cbaf_wusb_host_band_group return scnprintf(buf, PAGE_SIZE, "0x%04x\n", cbaf->host_band_groups); } @@ -795,7 +795,7 @@ { ssize_t result; struct usb_interface *iface = to_usb_interface(dev); -@@ -411,10 +408,7 @@ static ssize_t cbaf_wusb_host_band_group +@@ -397,10 +394,7 @@ static ssize_t cbaf_wusb_host_band_group return size; } @@ -807,7 +807,7 @@ static const struct wusb_cbaf_device_info cbaf_device_info_defaults = { .Length_hdr = WUSB_AR_Length, -@@ -424,8 +418,8 @@ static const struct wusb_cbaf_device_inf +@@ -410,8 +404,8 @@ static const struct wusb_cbaf_device_inf .DeviceFriendlyName_hdr = WUSB_AR_DeviceFriendlyName, }; @@ -818,7 +818,7 @@ { struct usb_interface *iface = to_usb_interface(dev); struct cbaf *cbaf = usb_get_intfdata(iface); -@@ -435,9 +429,9 @@ static ssize_t cbaf_wusb_cdid_show(struc +@@ -421,9 +415,9 @@ static ssize_t cbaf_wusb_cdid_show(struc return scnprintf(buf, PAGE_SIZE, "%s\n", pr_cdid); } @@ -831,7 +831,7 @@ { ssize_t result; struct usb_interface *iface = to_usb_interface(dev); -@@ -464,32 +458,28 @@ static ssize_t cbaf_wusb_cdid_store(stru +@@ -450,32 +444,28 @@ static ssize_t cbaf_wusb_cdid_store(stru return size; } @@ -872,7 +872,7 @@ static const struct wusb_cbaf_cc_data cbaf_cc_data_defaults = { .AssociationTypeId_hdr = WUSB_AR_AssociationTypeId, -@@ -543,9 +533,9 @@ static int cbaf_cc_upload(struct cbaf *c +@@ -529,9 +519,9 @@ static int cbaf_cc_upload(struct cbaf *c return result; } @@ -885,7 +885,7 @@ { ssize_t result; struct usb_interface *iface = to_usb_interface(dev); -@@ -573,7 +563,7 @@ static ssize_t cbaf_wusb_ck_store(struct +@@ -559,7 +549,7 @@ static ssize_t cbaf_wusb_ck_store(struct return size; } |