140 files changed, 918 insertions, 1047 deletions
diff --git a/Documentation/ABI/testing/sysfs-devices-coredump b/Documentation/ABI/testing/sysfs-devices-coredump
new file mode 100644
index 000000000000..e459368533a4
--- /dev/null
+++ b/Documentation/ABI/testing/sysfs-devices-coredump
@@ -0,0 +1,10 @@
+What:           /sys/devices/.../coredump
+Date:           December 2017
+Contact:        Arend van Spriel <aspriel@gmail.com>
+Description:
+                The /sys/devices/.../coredump attribute is only present when the
+                device is bound to a driver, which provides the .coredump()
+                callback. The attribute is write only. Anything written to this
+                file will trigger the .coredump() callback.
+                Available when CONFIG_DEV_COREDUMP is enabled.
diff --git a/Documentation/driver-api/firmware/built-in-fw.rst b/Documentation/driver-api/firmware/built-in-fw.rst
index 7300e66857f8..396cdf591ac5 100644
--- a/Documentation/driver-api/firmware/built-in-fw.rst
+++ b/Documentation/driver-api/firmware/built-in-fw.rst
@@ -11,13 +11,8 @@ options:
  * CONFIG_EXTRA_FIRMWARE
  * CONFIG_EXTRA_FIRMWARE_DIR
-This should not be confused with CONFIG_FIRMWARE_IN_KERNEL, this is for drivers
-which enables firmware to be built as part of the kernel build process. This
-option, CONFIG_FIRMWARE_IN_KERNEL, will build all firmware for all drivers
-enabled which ship its firmware inside the Linux kernel source tree.
 There are a few reasons why you might want to consider building your firmware
-into the kernel with CONFIG_EXTRA_FIRMWARE though:
+into the kernel with CONFIG_EXTRA_FIRMWARE:
 * Speed
 * Firmware is needed for accessing the boot device, and the user doesn't
diff --git a/Documentation/driver-api/firmware/fallback-mechanisms.rst b/Documentation/driver-api/firmware/fallback-mechanisms.rst
index d19354794e67..4055ac76b288 100644
--- a/Documentation/driver-api/firmware/fallback-mechanisms.rst
+++ b/Documentation/driver-api/firmware/fallback-mechanisms.rst
@@ -71,7 +71,7 @@ via fw_create_instance(). This call creates a new struct device named after
 the firmware requested, and establishes it in the device hierarchy by
 associating the device used to make the request as the device's parent.
 The sysfs directory's file attributes are defined and controlled through
-the new device's class (firmare_class) and group (fw_dev_attr_groups).
+the new device's class (firmware_class) and group (fw_dev_attr_groups).
 This is actually where the original firmware_class.c file name comes from,
 as originally the only firmware loading mechanism available was the
 mechanism we now use as a fallback mechanism.
diff --git a/Documentation/x86/microcode.txt b/Documentation/x86/microcode.txt
index f57e1b45e628..79fdb4a8148a 100644
--- a/Documentation/x86/microcode.txt
+++ b/Documentation/x86/microcode.txt
@@ -108,12 +108,11 @@ packages already put them there.
 ====================
 The loader supports also loading of a builtin microcode supplied through
-the regular firmware builtin method CONFIG_FIRMWARE_IN_KERNEL. Only
+the regular builtin firmware method CONFIG_EXTRA_FIRMWARE. Only 64-bit is
-64-bit is currently supported.
+currently supported.
 Here's an example:
-CONFIG_FIRMWARE_IN_KERNEL=y
 CONFIG_EXTRA_FIRMWARE="intel-ucode/06-3a-09 amd-ucode/microcode_amd_fam15h.bin"
 CONFIG_EXTRA_FIRMWARE_DIR="/lib/firmware"
diff --git a/arch/arc/configs/axs101_defconfig b/arch/arc/configs/axs101_defconfig
index ec7c849a5c8e..09f85154c5a4 100644
--- a/arch/arc/configs/axs101_defconfig
+++ b/arch/arc/configs/axs101_defconfig
@@ -44,7 +44,6 @@ CONFIG_IP_PNP_RARP=y
 CONFIG_DEVTMPFS=y
 # CONFIG_STANDALONE is not set
 # CONFIG_PREVENT_FIRMWARE_BUILD is not set
-# CONFIG_FIRMWARE_IN_KERNEL is not set
 CONFIG_SCSI=y
 CONFIG_BLK_DEV_SD=y
 CONFIG_NETDEVICES=y
diff --git a/arch/arc/configs/axs103_defconfig b/arch/arc/configs/axs103_defconfig
index 63d3cf69e0b0..09fed3ef22b6 100644
--- a/arch/arc/configs/axs103_defconfig
+++ b/arch/arc/configs/axs103_defconfig
@@ -44,7 +44,6 @@ CONFIG_IP_PNP_RARP=y
 CONFIG_DEVTMPFS=y
 # CONFIG_STANDALONE is not set
 # CONFIG_PREVENT_FIRMWARE_BUILD is not set
-# CONFIG_FIRMWARE_IN_KERNEL is not set
 CONFIG_BLK_DEV_LOOP=y
 CONFIG_SCSI=y
 CONFIG_BLK_DEV_SD=y
diff --git a/arch/arc/configs/axs103_smp_defconfig b/arch/arc/configs/axs103_smp_defconfig
index f613ecac14a7..ea2f6d817d1a 100644
--- a/arch/arc/configs/axs103_smp_defconfig
+++ b/arch/arc/configs/axs103_smp_defconfig
@@ -45,7 +45,6 @@ CONFIG_IP_PNP_RARP=y
 CONFIG_DEVTMPFS=y
 # CONFIG_STANDALONE is not set
 # CONFIG_PREVENT_FIRMWARE_BUILD is not set
-# CONFIG_FIRMWARE_IN_KERNEL is not set
 CONFIG_BLK_DEV_LOOP=y
 CONFIG_SCSI=y
 CONFIG_BLK_DEV_SD=y
diff --git a/arch/arc/configs/haps_hs_defconfig b/arch/arc/configs/haps_hs_defconfig
index db04ea4dd2d9..ab231c040efe 100644
--- a/arch/arc/configs/haps_hs_defconfig
+++ b/arch/arc/configs/haps_hs_defconfig
@@ -40,7 +40,6 @@ CONFIG_INET=y
 CONFIG_DEVTMPFS=y
 # CONFIG_STANDALONE is not set
 # CONFIG_PREVENT_FIRMWARE_BUILD is not set
-# CONFIG_FIRMWARE_IN_KERNEL is not set
 # CONFIG_BLK_DEV is not set
 CONFIG_NETDEVICES=y
 # CONFIG_NET_VENDOR_ARC is not set
diff --git a/arch/arc/configs/haps_hs_smp_defconfig b/arch/arc/configs/haps_hs_smp_defconfig
index 3507be2af6fe..cf449cbf440d 100644
--- a/arch/arc/configs/haps_hs_smp_defconfig
+++ b/arch/arc/configs/haps_hs_smp_defconfig
@@ -43,7 +43,6 @@ CONFIG_INET=y
 CONFIG_DEVTMPFS=y
 # CONFIG_STANDALONE is not set
 # CONFIG_PREVENT_FIRMWARE_BUILD is not set
-# CONFIG_FIRMWARE_IN_KERNEL is not set
 # CONFIG_BLK_DEV is not set
 CONFIG_NETDEVICES=y
 # CONFIG_NET_VENDOR_ARC is not set
diff --git a/arch/arc/configs/hsdk_defconfig b/arch/arc/configs/hsdk_defconfig
index ac6b0ed8341e..1b54c72f4296 100644
--- a/arch/arc/configs/hsdk_defconfig
+++ b/arch/arc/configs/hsdk_defconfig
@@ -32,7 +32,6 @@ CONFIG_INET=y
 CONFIG_DEVTMPFS=y
 # CONFIG_STANDALONE is not set
 # CONFIG_PREVENT_FIRMWARE_BUILD is not set
-# CONFIG_FIRMWARE_IN_KERNEL is not set
 CONFIG_SCSI=y
 CONFIG_BLK_DEV_SD=y
 CONFIG_NETDEVICES=y
diff --git a/arch/arc/configs/nsim_700_defconfig b/arch/arc/configs/nsim_700_defconfig
index 6dff83a238b8..31c2c70b34a1 100644
--- a/arch/arc/configs/nsim_700_defconfig
+++ b/arch/arc/configs/nsim_700_defconfig
@@ -36,7 +36,6 @@ CONFIG_INET=y
 CONFIG_DEVTMPFS=y
 # CONFIG_STANDALONE is not set
 # CONFIG_PREVENT_FIRMWARE_BUILD is not set
-# CONFIG_FIRMWARE_IN_KERNEL is not set
 # CONFIG_BLK_DEV is not set
 CONFIG_NETDEVICES=y
 CONFIG_ARC_EMAC=y
diff --git a/arch/arc/configs/nsim_hs_defconfig b/arch/arc/configs/nsim_hs_defconfig
index 31ee51b987e7..a578c721d50f 100644
--- a/arch/arc/configs/nsim_hs_defconfig
+++ b/arch/arc/configs/nsim_hs_defconfig
@@ -40,7 +40,6 @@ CONFIG_INET=y
 CONFIG_DEVTMPFS=y
 # CONFIG_STANDALONE is not set
 # CONFIG_PREVENT_FIRMWARE_BUILD is not set
-# CONFIG_FIRMWARE_IN_KERNEL is not set
 # CONFIG_BLK_DEV is not set
 # CONFIG_INPUT_MOUSEDEV_PSAUX is not set
 # CONFIG_INPUT_KEYBOARD is not set
diff --git a/arch/arc/configs/nsim_hs_smp_defconfig b/arch/arc/configs/nsim_hs_smp_defconfig
index 8d3b1f67cae4..37d7395f3272 100644
--- a/arch/arc/configs/nsim_hs_smp_defconfig
+++ b/arch/arc/configs/nsim_hs_smp_defconfig
@@ -39,7 +39,6 @@ CONFIG_INET=y
 CONFIG_DEVTMPFS=y
 # CONFIG_STANDALONE is not set
 # CONFIG_PREVENT_FIRMWARE_BUILD is not set
-# CONFIG_FIRMWARE_IN_KERNEL is not set
 # CONFIG_BLK_DEV is not set
 # CONFIG_INPUT_MOUSEDEV_PSAUX is not set
 # CONFIG_INPUT_KEYBOARD is not set
diff --git a/arch/arc/configs/nsimosci_defconfig b/arch/arc/configs/nsimosci_defconfig
index 6168ce2ac2ef..1e1470e2a7f0 100644
--- a/arch/arc/configs/nsimosci_defconfig
+++ b/arch/arc/configs/nsimosci_defconfig
@@ -35,7 +35,6 @@ CONFIG_INET=y
 CONFIG_DEVTMPFS=y
 # CONFIG_STANDALONE is not set
 # CONFIG_PREVENT_FIRMWARE_BUILD is not set
-# CONFIG_FIRMWARE_IN_KERNEL is not set
 # CONFIG_BLK_DEV is not set
 CONFIG_NETDEVICES=y
 CONFIG_EZCHIP_NPS_MANAGEMENT_ENET=y
diff --git a/arch/arc/configs/nsimosci_hs_defconfig b/arch/arc/configs/nsimosci_hs_defconfig
index a70bdeb2b3fd..084a6e42685b 100644
--- a/arch/arc/configs/nsimosci_hs_defconfig
+++ b/arch/arc/configs/nsimosci_hs_defconfig
@@ -36,7 +36,6 @@ CONFIG_INET=y
 CONFIG_DEVTMPFS=y
 # CONFIG_STANDALONE is not set
 # CONFIG_PREVENT_FIRMWARE_BUILD is not set
-# CONFIG_FIRMWARE_IN_KERNEL is not set
 # CONFIG_BLK_DEV is not set
 CONFIG_NETDEVICES=y
 CONFIG_EZCHIP_NPS_MANAGEMENT_ENET=y
diff --git a/arch/arc/configs/nsimosci_hs_smp_defconfig b/arch/arc/configs/nsimosci_hs_smp_defconfig
index ef96406c446e..f36d47990415 100644
--- a/arch/arc/configs/nsimosci_hs_smp_defconfig
+++ b/arch/arc/configs/nsimosci_hs_smp_defconfig
@@ -39,7 +39,6 @@ CONFIG_INET=y
 CONFIG_DEVTMPFS=y
 # CONFIG_STANDALONE is not set
 # CONFIG_PREVENT_FIRMWARE_BUILD is not set
-# CONFIG_FIRMWARE_IN_KERNEL is not set
 # CONFIG_BLK_DEV is not set
 CONFIG_NETDEVICES=y
 # CONFIG_NET_VENDOR_ARC is not set
diff --git a/arch/arc/configs/tb10x_defconfig b/arch/arc/configs/tb10x_defconfig
index f30182549395..1aca2e8fd1ba 100644
--- a/arch/arc/configs/tb10x_defconfig
+++ b/arch/arc/configs/tb10x_defconfig
@@ -42,7 +42,6 @@ CONFIG_IP_MULTICAST=y
 # CONFIG_IPV6 is not set
 # CONFIG_WIRELESS is not set
 CONFIG_DEVTMPFS=y
-# CONFIG_FIRMWARE_IN_KERNEL is not set
 CONFIG_NETDEVICES=y
 # CONFIG_NET_CADENCE is not set
 # CONFIG_NET_VENDOR_BROADCOM is not set
diff --git a/arch/arc/configs/vdk_hs38_defconfig b/arch/arc/configs/vdk_hs38_defconfig
index 4fcf4f2503f6..f629493929ea 100644
--- a/arch/arc/configs/vdk_hs38_defconfig
+++ b/arch/arc/configs/vdk_hs38_defconfig
@@ -31,7 +31,6 @@ CONFIG_DEVTMPFS=y
 CONFIG_DEVTMPFS_MOUNT=y
 # CONFIG_STANDALONE is not set
 # CONFIG_PREVENT_FIRMWARE_BUILD is not set
-# CONFIG_FIRMWARE_IN_KERNEL is not set
 CONFIG_MTD=y
 CONFIG_MTD_CMDLINE_PARTS=y
 CONFIG_MTD_BLOCK=y
diff --git a/arch/arc/configs/vdk_hs38_smp_defconfig b/arch/arc/configs/vdk_hs38_smp_defconfig
index 7b71464f6c2f..21f0ca26a05d 100644
--- a/arch/arc/configs/vdk_hs38_smp_defconfig
+++ b/arch/arc/configs/vdk_hs38_smp_defconfig
@@ -34,7 +34,6 @@ CONFIG_DEVTMPFS=y
 CONFIG_DEVTMPFS_MOUNT=y
 # CONFIG_STANDALONE is not set
 # CONFIG_PREVENT_FIRMWARE_BUILD is not set
-# CONFIG_FIRMWARE_IN_KERNEL is not set
 CONFIG_MTD=y
 CONFIG_MTD_CMDLINE_PARTS=y
 CONFIG_MTD_BLOCK=y
diff --git a/arch/arm/configs/cns3420vb_defconfig b/arch/arm/configs/cns3420vb_defconfig
index 63a953d855a6..c6dcd6e4f4e6 100644
--- a/arch/arm/configs/cns3420vb_defconfig
+++ b/arch/arm/configs/cns3420vb_defconfig
@@ -28,7 +28,6 @@ CONFIG_ZBOOT_ROM_TEXT=0x0
 CONFIG_ZBOOT_ROM_BSS=0x0
 CONFIG_CMDLINE="console=ttyS0,38400 mem=128M root=/dev/mmcblk0p1 ro rootwait"
 CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
-# CONFIG_FIRMWARE_IN_KERNEL is not set
 CONFIG_MTD=y
 CONFIG_MTD_CMDLINE_PARTS=y
 CONFIG_MTD_BLOCK=y
diff --git a/arch/arm/configs/magician_defconfig b/arch/arm/configs/magician_defconfig
index ec5674c229a3..de5be2fc7306 100644
--- a/arch/arm/configs/magician_defconfig
+++ b/arch/arm/configs/magician_defconfig
@@ -54,7 +54,6 @@ CONFIG_BT_BNEP_PROTO_FILTER=y
 CONFIG_BT_HIDP=m
 CONFIG_BT_HCIBTUSB=m
 CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
-# CONFIG_FIRMWARE_IN_KERNEL is not set
 CONFIG_MTD=y
 CONFIG_MTD_CMDLINE_PARTS=y
 CONFIG_MTD_BLOCK=y
diff --git a/arch/arm/configs/mini2440_defconfig b/arch/arm/configs/mini2440_defconfig
index cf7dcb2c86e6..88ea02e7ba19 100644
--- a/arch/arm/configs/mini2440_defconfig
+++ b/arch/arm/configs/mini2440_defconfig
@@ -77,7 +77,6 @@ CONFIG_MAC80211=m
 CONFIG_MAC80211_MESH=y
 CONFIG_MAC80211_LEDS=y
 CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
-# CONFIG_FIRMWARE_IN_KERNEL is not set
 CONFIG_CONNECTOR=m
 CONFIG_MTD=y
 CONFIG_MTD_CMDLINE_PARTS=y
diff --git a/arch/arm/configs/mv78xx0_defconfig b/arch/arm/configs/mv78xx0_defconfig
index 752e2e74de5b..0448bd8075ac 100644
--- a/arch/arm/configs/mv78xx0_defconfig
+++ b/arch/arm/configs/mv78xx0_defconfig
@@ -37,7 +37,6 @@ CONFIG_IP_PNP_BOOTP=y
 # CONFIG_IPV6 is not set
 CONFIG_NET_PKTGEN=m
 CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
-# CONFIG_FIRMWARE_IN_KERNEL is not set
 CONFIG_MTD=y
 CONFIG_MTD_CMDLINE_PARTS=y
 CONFIG_MTD_BLOCK=y
diff --git a/arch/arm/configs/mxs_defconfig b/arch/arm/configs/mxs_defconfig
index e5822ab01b7d..bbfb6759447b 100644
--- a/arch/arm/configs/mxs_defconfig
+++ b/arch/arm/configs/mxs_defconfig
@@ -46,7 +46,6 @@ CONFIG_CAN_FLEXCAN=m
 # CONFIG_WIRELESS is not set
 CONFIG_DEVTMPFS=y
 CONFIG_DEVTMPFS_MOUNT=y
-# CONFIG_FIRMWARE_IN_KERNEL is not set
 CONFIG_MTD=y
 CONFIG_MTD_CMDLINE_PARTS=y
 CONFIG_MTD_BLOCK=y
diff --git a/arch/arm/configs/orion5x_defconfig b/arch/arm/configs/orion5x_defconfig
index b831baddae02..bf9046331f6e 100644
--- a/arch/arm/configs/orion5x_defconfig
+++ b/arch/arm/configs/orion5x_defconfig
@@ -60,7 +60,6 @@ CONFIG_IP_PNP_BOOTP=y
 CONFIG_NET_DSA=y
 CONFIG_NET_PKTGEN=m
 CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
-# CONFIG_FIRMWARE_IN_KERNEL is not set
 CONFIG_MTD=y
 CONFIG_MTD_CMDLINE_PARTS=y
 CONFIG_MTD_BLOCK=y
diff --git a/arch/arm/configs/tegra_defconfig b/arch/arm/configs/tegra_defconfig
index c819be04187e..c7b99ebf5fcf 100644
--- a/arch/arm/configs/tegra_defconfig
+++ b/arch/arm/configs/tegra_defconfig
@@ -75,7 +75,6 @@ CONFIG_RFKILL_INPUT=y
 CONFIG_RFKILL_GPIO=y
 CONFIG_DEVTMPFS=y
 CONFIG_DEVTMPFS_MOUNT=y
-# CONFIG_FIRMWARE_IN_KERNEL is not set
 CONFIG_DMA_CMA=y
 CONFIG_CMA_SIZE_MBYTES=64
 CONFIG_TEGRA_GMI=y
diff --git a/arch/arm/configs/vf610m4_defconfig b/arch/arm/configs/vf610m4_defconfig
index b7ecb83a95b6..a89f035c3b01 100644
--- a/arch/arm/configs/vf610m4_defconfig
+++ b/arch/arm/configs/vf610m4_defconfig
@@ -23,7 +23,6 @@ CONFIG_BINFMT_SHARED_FLAT=y
 # CONFIG_UEVENT_HELPER is not set
 # CONFIG_STANDALONE is not set
 # CONFIG_PREVENT_FIRMWARE_BUILD is not set
-# CONFIG_FIRMWARE_IN_KERNEL is not set
 # CONFIG_ALLOW_DEV_COREDUMP is not set
 CONFIG_BLK_DEV_RAM=y
 CONFIG_BLK_DEV_RAM_COUNT=4
diff --git a/arch/arm/mach-pxa/sharpsl_pm.c b/arch/arm/mach-pxa/sharpsl_pm.c
index 398ba9ba2632..ef9fd9b759cb 100644
--- a/arch/arm/mach-pxa/sharpsl_pm.c
+++ b/arch/arm/mach-pxa/sharpsl_pm.c
@@ -802,8 +802,8 @@ static ssize_t battery_voltage_show(struct device *dev, struct device_attribute
        return sprintf(buf, "%d\n", sharpsl_pm.battstat.mainbat_voltage);
 }
-static DEVICE_ATTR(battery_percentage, 0444, battery_percentage_show, NULL);
+static DEVICE_ATTR_RO(battery_percentage);
-static DEVICE_ATTR(battery_voltage, 0444, battery_voltage_show, NULL);
+static DEVICE_ATTR_RO(battery_voltage);
 extern void (*apm_get_power_status)(struct apm_power_info *);
diff --git a/arch/m68k/configs/amiga_defconfig b/arch/m68k/configs/amiga_defconfig
index e0b285e1e75f..52fa7fbdefa2 100644
--- a/arch/m68k/configs/amiga_defconfig
+++ b/arch/m68k/configs/amiga_defconfig
@@ -313,7 +313,6 @@ CONFIG_NET_DEVLINK=m
 # CONFIG_UEVENT_HELPER is not set
 CONFIG_DEVTMPFS=y
 CONFIG_DEVTMPFS_MOUNT=y
-# CONFIG_FIRMWARE_IN_KERNEL is not set
 CONFIG_TEST_ASYNC_DRIVER_PROBE=m
 CONFIG_CONNECTOR=m
 CONFIG_PARPORT=m
diff --git a/arch/m68k/configs/apollo_defconfig b/arch/m68k/configs/apollo_defconfig
index 3281026a3e15..b00fe19e1c04 100644
--- a/arch/m68k/configs/apollo_defconfig
+++ b/arch/m68k/configs/apollo_defconfig
@@ -311,7 +311,6 @@ CONFIG_NET_DEVLINK=m
 # CONFIG_UEVENT_HELPER is not set
 CONFIG_DEVTMPFS=y
 CONFIG_DEVTMPFS_MOUNT=y
-# CONFIG_FIRMWARE_IN_KERNEL is not set
 CONFIG_TEST_ASYNC_DRIVER_PROBE=m
 CONFIG_CONNECTOR=m
 CONFIG_BLK_DEV_LOOP=y
diff --git a/arch/m68k/configs/atari_defconfig b/arch/m68k/configs/atari_defconfig
index e943fad480cf..2871d75b912f 100644
--- a/arch/m68k/configs/atari_defconfig
+++ b/arch/m68k/configs/atari_defconfig
@@ -311,7 +311,6 @@ CONFIG_NET_DEVLINK=m
 # CONFIG_UEVENT_HELPER is not set
 CONFIG_DEVTMPFS=y
 CONFIG_DEVTMPFS_MOUNT=y
-# CONFIG_FIRMWARE_IN_KERNEL is not set
 CONFIG_TEST_ASYNC_DRIVER_PROBE=m
 CONFIG_CONNECTOR=m
 CONFIG_PARPORT=m
diff --git a/arch/m68k/configs/bvme6000_defconfig b/arch/m68k/configs/bvme6000_defconfig
index 700c2310c336..2c90328433bf 100644
--- a/arch/m68k/configs/bvme6000_defconfig
+++ b/arch/m68k/configs/bvme6000_defconfig
@@ -309,7 +309,6 @@ CONFIG_NET_DEVLINK=m
 # CONFIG_UEVENT_HELPER is not set
 CONFIG_DEVTMPFS=y
 CONFIG_DEVTMPFS_MOUNT=y
-# CONFIG_FIRMWARE_IN_KERNEL is not set
 CONFIG_TEST_ASYNC_DRIVER_PROBE=m
 CONFIG_CONNECTOR=m
 CONFIG_BLK_DEV_LOOP=y
diff --git a/arch/m68k/configs/hp300_defconfig b/arch/m68k/configs/hp300_defconfig
index 271d57fa4301..177c91d63826 100644
--- a/arch/m68k/configs/hp300_defconfig
+++ b/arch/m68k/configs/hp300_defconfig
@@ -311,7 +311,6 @@ CONFIG_NET_DEVLINK=m
 # CONFIG_UEVENT_HELPER is not set
 CONFIG_DEVTMPFS=y
 CONFIG_DEVTMPFS_MOUNT=y
-# CONFIG_FIRMWARE_IN_KERNEL is not set
 CONFIG_TEST_ASYNC_DRIVER_PROBE=m
 CONFIG_CONNECTOR=m
 CONFIG_BLK_DEV_LOOP=y
diff --git a/arch/m68k/configs/mac_defconfig b/arch/m68k/configs/mac_defconfig
index 88761b867975..efbcaffa30ed 100644
--- a/arch/m68k/configs/mac_defconfig
+++ b/arch/m68k/configs/mac_defconfig
@@ -313,7 +313,6 @@ CONFIG_NET_DEVLINK=m
 # CONFIG_UEVENT_HELPER is not set
 CONFIG_DEVTMPFS=y
 CONFIG_DEVTMPFS_MOUNT=y
-# CONFIG_FIRMWARE_IN_KERNEL is not set
 CONFIG_TEST_ASYNC_DRIVER_PROBE=m
 CONFIG_CONNECTOR=m
 CONFIG_BLK_DEV_SWIM=m
diff --git a/arch/m68k/configs/multi_defconfig b/arch/m68k/configs/multi_defconfig
index 7cb35dadf03b..e78a205d266a 100644
--- a/arch/m68k/configs/multi_defconfig
+++ b/arch/m68k/configs/multi_defconfig
@@ -323,7 +323,6 @@ CONFIG_NET_DEVLINK=m
 # CONFIG_UEVENT_HELPER is not set
 CONFIG_DEVTMPFS=y
 CONFIG_DEVTMPFS_MOUNT=y
-# CONFIG_FIRMWARE_IN_KERNEL is not set
 CONFIG_TEST_ASYNC_DRIVER_PROBE=m
 CONFIG_CONNECTOR=m
 CONFIG_PARPORT=m
diff --git a/arch/m68k/configs/mvme147_defconfig b/arch/m68k/configs/mvme147_defconfig
index b139d7b68393..0d42ecacfd7a 100644
--- a/arch/m68k/configs/mvme147_defconfig
+++ b/arch/m68k/configs/mvme147_defconfig
@@ -308,7 +308,6 @@ CONFIG_NET_DEVLINK=m
 # CONFIG_UEVENT_HELPER is not set
 CONFIG_DEVTMPFS=y
 CONFIG_DEVTMPFS_MOUNT=y
-# CONFIG_FIRMWARE_IN_KERNEL is not set
 CONFIG_TEST_ASYNC_DRIVER_PROBE=m
 CONFIG_CONNECTOR=m
 CONFIG_BLK_DEV_LOOP=y
diff --git a/arch/m68k/configs/mvme16x_defconfig b/arch/m68k/configs/mvme16x_defconfig
index 398346138769..8dc609c5b8aa 100644
--- a/arch/m68k/configs/mvme16x_defconfig
+++ b/arch/m68k/configs/mvme16x_defconfig
@@ -309,7 +309,6 @@ CONFIG_NET_DEVLINK=m
 # CONFIG_UEVENT_HELPER is not set
 CONFIG_DEVTMPFS=y
 CONFIG_DEVTMPFS_MOUNT=y
-# CONFIG_FIRMWARE_IN_KERNEL is not set
 CONFIG_TEST_ASYNC_DRIVER_PROBE=m
 CONFIG_CONNECTOR=m
 CONFIG_BLK_DEV_LOOP=y
diff --git a/arch/m68k/configs/q40_defconfig b/arch/m68k/configs/q40_defconfig
index 14c608326f6d..11c96087fc5d 100644
--- a/arch/m68k/configs/q40_defconfig
+++ b/arch/m68k/configs/q40_defconfig
@@ -309,7 +309,6 @@ CONFIG_NET_DEVLINK=m
 # CONFIG_UEVENT_HELPER is not set
 CONFIG_DEVTMPFS=y
 CONFIG_DEVTMPFS_MOUNT=y
-# CONFIG_FIRMWARE_IN_KERNEL is not set
 CONFIG_TEST_ASYNC_DRIVER_PROBE=m
 CONFIG_CONNECTOR=m
 CONFIG_PARPORT=m
diff --git a/arch/m68k/configs/sun3_defconfig b/arch/m68k/configs/sun3_defconfig
index 97dec0bf52f1..ddba205ee1aa 100644
--- a/arch/m68k/configs/sun3_defconfig
+++ b/arch/m68k/configs/sun3_defconfig
@@ -306,7 +306,6 @@ CONFIG_NET_DEVLINK=m
 # CONFIG_UEVENT_HELPER is not set
 CONFIG_DEVTMPFS=y
 CONFIG_DEVTMPFS_MOUNT=y
-# CONFIG_FIRMWARE_IN_KERNEL is not set
 CONFIG_TEST_ASYNC_DRIVER_PROBE=m
 CONFIG_CONNECTOR=m
 CONFIG_BLK_DEV_LOOP=y
diff --git a/arch/m68k/configs/sun3x_defconfig b/arch/m68k/configs/sun3x_defconfig
index 56df28d6d91d..88d09a14c684 100644
--- a/arch/m68k/configs/sun3x_defconfig
+++ b/arch/m68k/configs/sun3x_defconfig
@@ -306,7 +306,6 @@ CONFIG_NET_DEVLINK=m
 # CONFIG_UEVENT_HELPER is not set
 CONFIG_DEVTMPFS=y
 CONFIG_DEVTMPFS_MOUNT=y
-# CONFIG_FIRMWARE_IN_KERNEL is not set
 CONFIG_TEST_ASYNC_DRIVER_PROBE=m
 CONFIG_CONNECTOR=m
 CONFIG_BLK_DEV_LOOP=y
diff --git a/arch/mips/configs/ar7_defconfig b/arch/mips/configs/ar7_defconfig
index 92fca3c42eac..5651f4d8f45c 100644
--- a/arch/mips/configs/ar7_defconfig
+++ b/arch/mips/configs/ar7_defconfig
@@ -82,7 +82,6 @@ CONFIG_MAC80211=m
 CONFIG_MAC80211_RC_PID=y
 CONFIG_MAC80211_RC_DEFAULT_PID=y
 CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
-# CONFIG_FIRMWARE_IN_KERNEL is not set
 CONFIG_MTD=y
 CONFIG_MTD_BLOCK=y
 CONFIG_MTD_CFI=y
diff --git a/arch/mips/configs/ath25_defconfig b/arch/mips/configs/ath25_defconfig
index 2c829950be17..b8d48038e74f 100644
--- a/arch/mips/configs/ath25_defconfig
+++ b/arch/mips/configs/ath25_defconfig
@@ -38,7 +38,6 @@ CONFIG_CFG80211=m
 CONFIG_MAC80211=m
 CONFIG_MAC80211_DEBUGFS=y
 CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
-# CONFIG_FIRMWARE_IN_KERNEL is not set
 CONFIG_MTD=y
 CONFIG_MTD_REDBOOT_PARTS=y
 CONFIG_MTD_REDBOOT_DIRECTORY_BLOCK=-2
diff --git a/arch/mips/configs/ath79_defconfig b/arch/mips/configs/ath79_defconfig
index 25ed914933e5..951c4231bdb8 100644
--- a/arch/mips/configs/ath79_defconfig
+++ b/arch/mips/configs/ath79_defconfig
@@ -39,7 +39,6 @@ CONFIG_CFG80211=m
 CONFIG_MAC80211=m
 CONFIG_MAC80211_DEBUGFS=y
 CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
-# CONFIG_FIRMWARE_IN_KERNEL is not set
 CONFIG_MTD=y
 CONFIG_MTD_REDBOOT_PARTS=y
 CONFIG_MTD_REDBOOT_DIRECTORY_BLOCK=-2
diff --git a/arch/mips/configs/pic32mzda_defconfig b/arch/mips/configs/pic32mzda_defconfig
index 52192c632ae8..41190c2036e6 100644
--- a/arch/mips/configs/pic32mzda_defconfig
+++ b/arch/mips/configs/pic32mzda_defconfig
@@ -26,7 +26,6 @@ CONFIG_BINFMT_MISC=m
 # CONFIG_SUSPEND is not set
 CONFIG_DEVTMPFS=y
 CONFIG_DEVTMPFS_MOUNT=y
-# CONFIG_FIRMWARE_IN_KERNEL is not set
 # CONFIG_ALLOW_DEV_COREDUMP is not set
 CONFIG_BLK_DEV_LOOP=m
 CONFIG_SCSI=y
diff --git a/arch/mips/configs/qi_lb60_defconfig b/arch/mips/configs/qi_lb60_defconfig
index 3f1333517405..3b02ff9a7c64 100644
--- a/arch/mips/configs/qi_lb60_defconfig
+++ b/arch/mips/configs/qi_lb60_defconfig
@@ -42,7 +42,6 @@ CONFIG_TCP_CONG_WESTWOOD=y
 # CONFIG_TCP_CONG_HTCP is not set
 # CONFIG_IPV6 is not set
 CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
-# CONFIG_FIRMWARE_IN_KERNEL is not set
 CONFIG_MTD=y
 CONFIG_MTD_BLOCK=y
 CONFIG_MTD_NAND=y
diff --git a/arch/mips/configs/rm200_defconfig b/arch/mips/configs/rm200_defconfig
index 99679e514042..5f71aa598b06 100644
--- a/arch/mips/configs/rm200_defconfig
+++ b/arch/mips/configs/rm200_defconfig
@@ -325,15 +325,6 @@ CONFIG_USB_SERIAL_EDGEPORT=m
 CONFIG_USB_SERIAL_EDGEPORT_TI=m
 CONFIG_USB_SERIAL_KEYSPAN_PDA=m
 CONFIG_USB_SERIAL_KEYSPAN=m
-CONFIG_USB_SERIAL_KEYSPAN_MPR=y
-CONFIG_USB_SERIAL_KEYSPAN_USA28X=y
-CONFIG_USB_SERIAL_KEYSPAN_USA28XA=y
-CONFIG_USB_SERIAL_KEYSPAN_USA28XB=y
-CONFIG_USB_SERIAL_KEYSPAN_USA19W=y
-CONFIG_USB_SERIAL_KEYSPAN_USA19QW=y
-CONFIG_USB_SERIAL_KEYSPAN_USA19QI=y
-CONFIG_USB_SERIAL_KEYSPAN_USA49W=y
-CONFIG_USB_SERIAL_KEYSPAN_USA49WLC=y
 CONFIG_USB_SERIAL_KLSI=m
 CONFIG_USB_SERIAL_KOBIL_SCT=m
 CONFIG_USB_SERIAL_MCT_U232=m
diff --git a/arch/mips/configs/rt305x_defconfig b/arch/mips/configs/rt305x_defconfig
index c695b7b1c4ae..dbe6a4639d05 100644
--- a/arch/mips/configs/rt305x_defconfig
+++ b/arch/mips/configs/rt305x_defconfig
@@ -76,7 +76,6 @@ CONFIG_VLAN_8021Q=y
 CONFIG_NET_SCHED=y
 CONFIG_HAMRADIO=y
 CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
-# CONFIG_FIRMWARE_IN_KERNEL is not set
 CONFIG_MTD=y
 CONFIG_MTD_CMDLINE_PARTS=y
 CONFIG_MTD_BLOCK=y
diff --git a/arch/mips/configs/xway_defconfig b/arch/mips/configs/xway_defconfig
index 4365108bef77..fa750d501c11 100644
--- a/arch/mips/configs/xway_defconfig
+++ b/arch/mips/configs/xway_defconfig
@@ -75,7 +75,6 @@ CONFIG_VLAN_8021Q=y
 CONFIG_NET_SCHED=y
 CONFIG_HAMRADIO=y
 CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
-# CONFIG_FIRMWARE_IN_KERNEL is not set
 CONFIG_MTD=y
 CONFIG_MTD_CMDLINE_PARTS=y
 CONFIG_MTD_BLOCK=y
diff --git a/arch/mn10300/configs/asb2364_defconfig b/arch/mn10300/configs/asb2364_defconfig
index b1d80cee97ee..a84c3153f22a 100644
--- a/arch/mn10300/configs/asb2364_defconfig
+++ b/arch/mn10300/configs/asb2364_defconfig
@@ -44,7 +44,6 @@ CONFIG_IPV6=y
 # CONFIG_INET6_XFRM_MODE_TRANSPORT is not set
 # CONFIG_INET6_XFRM_MODE_TUNNEL is not set
 # CONFIG_INET6_XFRM_MODE_BEET is not set
-# CONFIG_FIRMWARE_IN_KERNEL is not set
 CONFIG_CONNECTOR=y
 CONFIG_MTD=y
 CONFIG_MTD_DEBUG=y
diff --git a/arch/powerpc/configs/44x/warp_defconfig b/arch/powerpc/configs/44x/warp_defconfig
index b5c866073efd..6c02f53271cd 100644
--- a/arch/powerpc/configs/44x/warp_defconfig
+++ b/arch/powerpc/configs/44x/warp_defconfig
@@ -28,7 +28,6 @@ CONFIG_NETFILTER=y
 CONFIG_VLAN_8021Q=y
 CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
 # CONFIG_STANDALONE is not set
-# CONFIG_FIRMWARE_IN_KERNEL is not set
 CONFIG_MTD=y
 CONFIG_MTD_CMDLINE_PARTS=y
 CONFIG_MTD_BLOCK=y
diff --git a/arch/powerpc/configs/c2k_defconfig b/arch/powerpc/configs/c2k_defconfig
index f1552af9eecc..4bb832a41d55 100644
--- a/arch/powerpc/configs/c2k_defconfig
+++ b/arch/powerpc/configs/c2k_defconfig
@@ -272,18 +272,6 @@ CONFIG_USB_SERIAL_EDGEPORT=m
 CONFIG_USB_SERIAL_EDGEPORT_TI=m
 CONFIG_USB_SERIAL_KEYSPAN_PDA=m
 CONFIG_USB_SERIAL_KEYSPAN=m
-CONFIG_USB_SERIAL_KEYSPAN_MPR=y
-CONFIG_USB_SERIAL_KEYSPAN_USA28=y
-CONFIG_USB_SERIAL_KEYSPAN_USA28X=y
-CONFIG_USB_SERIAL_KEYSPAN_USA28XA=y
-CONFIG_USB_SERIAL_KEYSPAN_USA28XB=y
-CONFIG_USB_SERIAL_KEYSPAN_USA19=y
-CONFIG_USB_SERIAL_KEYSPAN_USA18X=y
-CONFIG_USB_SERIAL_KEYSPAN_USA19W=y
-CONFIG_USB_SERIAL_KEYSPAN_USA19QW=y
-CONFIG_USB_SERIAL_KEYSPAN_USA19QI=y
-CONFIG_USB_SERIAL_KEYSPAN_USA49W=y
-CONFIG_USB_SERIAL_KEYSPAN_USA49WLC=y
 CONFIG_USB_SERIAL_KLSI=m
 CONFIG_USB_SERIAL_KOBIL_SCT=m
 CONFIG_USB_SERIAL_MCT_U232=m
diff --git a/arch/powerpc/configs/g5_defconfig b/arch/powerpc/configs/g5_defconfig
index 063817fee61c..67c39f4acede 100644
--- a/arch/powerpc/configs/g5_defconfig
+++ b/arch/powerpc/configs/g5_defconfig
@@ -189,18 +189,6 @@ CONFIG_USB_SERIAL_GARMIN=m
 CONFIG_USB_SERIAL_IPW=m
 CONFIG_USB_SERIAL_KEYSPAN_PDA=m
 CONFIG_USB_SERIAL_KEYSPAN=m
-CONFIG_USB_SERIAL_KEYSPAN_MPR=y
-CONFIG_USB_SERIAL_KEYSPAN_USA28=y
-CONFIG_USB_SERIAL_KEYSPAN_USA28X=y
-CONFIG_USB_SERIAL_KEYSPAN_USA28XA=y
-CONFIG_USB_SERIAL_KEYSPAN_USA28XB=y
-CONFIG_USB_SERIAL_KEYSPAN_USA19=y
-CONFIG_USB_SERIAL_KEYSPAN_USA18X=y
-CONFIG_USB_SERIAL_KEYSPAN_USA19W=y
-CONFIG_USB_SERIAL_KEYSPAN_USA19QW=y
-CONFIG_USB_SERIAL_KEYSPAN_USA19QI=y
-CONFIG_USB_SERIAL_KEYSPAN_USA49W=y
-CONFIG_USB_SERIAL_KEYSPAN_USA49WLC=y
 CONFIG_USB_SERIAL_KLSI=m
 CONFIG_USB_SERIAL_KOBIL_SCT=m
 CONFIG_USB_SERIAL_MCT_U232=m
diff --git a/arch/powerpc/configs/maple_defconfig b/arch/powerpc/configs/maple_defconfig
index 078cdb427fc9..59e47ec85336 100644
--- a/arch/powerpc/configs/maple_defconfig
+++ b/arch/powerpc/configs/maple_defconfig
@@ -82,18 +82,6 @@ CONFIG_USB_SERIAL_CYPRESS_M8=m
 CONFIG_USB_SERIAL_GARMIN=m
 CONFIG_USB_SERIAL_IPW=m
 CONFIG_USB_SERIAL_KEYSPAN=y
-CONFIG_USB_SERIAL_KEYSPAN_MPR=y
-CONFIG_USB_SERIAL_KEYSPAN_USA28=y
-CONFIG_USB_SERIAL_KEYSPAN_USA28X=y
-CONFIG_USB_SERIAL_KEYSPAN_USA28XA=y
-CONFIG_USB_SERIAL_KEYSPAN_USA28XB=y
-CONFIG_USB_SERIAL_KEYSPAN_USA19=y
-CONFIG_USB_SERIAL_KEYSPAN_USA18X=y
-CONFIG_USB_SERIAL_KEYSPAN_USA19W=y
-CONFIG_USB_SERIAL_KEYSPAN_USA19QW=y
-CONFIG_USB_SERIAL_KEYSPAN_USA19QI=y
-CONFIG_USB_SERIAL_KEYSPAN_USA49W=y
-CONFIG_USB_SERIAL_KEYSPAN_USA49WLC=y
 CONFIG_USB_SERIAL_TI=m
 CONFIG_EXT2_FS=y
 CONFIG_EXT4_FS=y
diff --git a/arch/powerpc/configs/mpc512x_defconfig b/arch/powerpc/configs/mpc512x_defconfig
index 10be5773ad5d..c2b1c4404683 100644
--- a/arch/powerpc/configs/mpc512x_defconfig
+++ b/arch/powerpc/configs/mpc512x_defconfig
@@ -39,7 +39,6 @@ CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
 CONFIG_DEVTMPFS=y
 CONFIG_DEVTMPFS_MOUNT=y
 # CONFIG_PREVENT_FIRMWARE_BUILD is not set
-# CONFIG_FIRMWARE_IN_KERNEL is not set
 CONFIG_MTD=y
 CONFIG_MTD_CMDLINE_PARTS=y
 CONFIG_MTD_BLOCK=y
diff --git a/arch/powerpc/configs/pmac32_defconfig b/arch/powerpc/configs/pmac32_defconfig
index 1aab9a62a681..62948d198d7f 100644
--- a/arch/powerpc/configs/pmac32_defconfig
+++ b/arch/powerpc/configs/pmac32_defconfig
@@ -264,18 +264,6 @@ CONFIG_USB_SERIAL_VISOR=m
 CONFIG_USB_SERIAL_IPAQ=m
 CONFIG_USB_SERIAL_KEYSPAN_PDA=m
 CONFIG_USB_SERIAL_KEYSPAN=m
-CONFIG_USB_SERIAL_KEYSPAN_MPR=y
-CONFIG_USB_SERIAL_KEYSPAN_USA28=y
-CONFIG_USB_SERIAL_KEYSPAN_USA28X=y
-CONFIG_USB_SERIAL_KEYSPAN_USA28XA=y
-CONFIG_USB_SERIAL_KEYSPAN_USA28XB=y
-CONFIG_USB_SERIAL_KEYSPAN_USA19=y
-CONFIG_USB_SERIAL_KEYSPAN_USA18X=y
-CONFIG_USB_SERIAL_KEYSPAN_USA19W=y
-CONFIG_USB_SERIAL_KEYSPAN_USA19QW=y
-CONFIG_USB_SERIAL_KEYSPAN_USA19QI=y
-CONFIG_USB_SERIAL_KEYSPAN_USA49W=y
-CONFIG_USB_SERIAL_KEYSPAN_USA49WLC=y
 CONFIG_USB_APPLEDISPLAY=m
 CONFIG_LEDS_TRIGGER_DEFAULT_ON=y
 CONFIG_EXT2_FS=y
diff --git a/arch/powerpc/configs/ppc6xx_defconfig b/arch/powerpc/configs/ppc6xx_defconfig
index da0e8d535eb8..7ee736f20774 100644
--- a/arch/powerpc/configs/ppc6xx_defconfig
+++ b/arch/powerpc/configs/ppc6xx_defconfig
@@ -347,7 +347,6 @@ CONFIG_MAC80211_DEBUGFS=y
 CONFIG_NET_9P=m
 CONFIG_NET_9P_VIRTIO=m
 CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
-# CONFIG_FIRMWARE_IN_KERNEL is not set
 CONFIG_DEBUG_DEVRES=y
 CONFIG_CONNECTOR=y
 CONFIG_PARPORT=m
diff --git a/arch/powerpc/configs/ps3_defconfig b/arch/powerpc/configs/ps3_defconfig
index 2efa025bf483..187e2f7c12c8 100644
--- a/arch/powerpc/configs/ps3_defconfig
+++ b/arch/powerpc/configs/ps3_defconfig
@@ -64,7 +64,6 @@ CONFIG_CFG80211_WEXT=y
 CONFIG_MAC80211=m
 # CONFIG_MAC80211_RC_MINSTREL is not set
 CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
-# CONFIG_FIRMWARE_IN_KERNEL is not set
 CONFIG_BLK_DEV_LOOP=y
 CONFIG_BLK_DEV_RAM=y
 CONFIG_BLK_DEV_RAM_SIZE=65535
diff --git a/arch/powerpc/configs/wii_defconfig b/arch/powerpc/configs/wii_defconfig
index 9c7400a19e9d..0b0f78823a1b 100644
--- a/arch/powerpc/configs/wii_defconfig
+++ b/arch/powerpc/configs/wii_defconfig
@@ -43,7 +43,6 @@ CONFIG_CFG80211=y
 CONFIG_MAC80211=y
 CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
 # CONFIG_STANDALONE is not set
-# CONFIG_FIRMWARE_IN_KERNEL is not set
 CONFIG_BLK_DEV_LOOP=y
 CONFIG_BLK_DEV_RAM=y
 CONFIG_BLK_DEV_RAM_COUNT=2
diff --git a/arch/s390/configs/zfcpdump_defconfig b/arch/s390/configs/zfcpdump_defconfig
index 04e042edbab7..7dc7f58c4287 100644
--- a/arch/s390/configs/zfcpdump_defconfig
+++ b/arch/s390/configs/zfcpdump_defconfig
@@ -26,7 +26,6 @@ CONFIG_NET=y
 # CONFIG_IUCV is not set
 CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
 CONFIG_DEVTMPFS=y
-# CONFIG_FIRMWARE_IN_KERNEL is not set
 CONFIG_BLK_DEV_RAM=y
 # CONFIG_BLK_DEV_XPRAM is not set
 # CONFIG_DCSSBLK is not set
diff --git a/arch/s390/kernel/smp.c b/arch/s390/kernel/smp.c
index b8c1a85bcf2d..a919b2f0141d 100644
--- a/arch/s390/kernel/smp.c
+++ b/arch/s390/kernel/smp.c
@@ -1151,7 +1151,7 @@ static ssize_t __ref rescan_store(struct device *dev,
        rc = smp_rescan_cpus();
        return rc ? rc : count;
 }
-static DEVICE_ATTR(rescan, 0200, NULL, rescan_store);
+static DEVICE_ATTR_WO(rescan);
 #endif /* CONFIG_HOTPLUG_CPU */
 static int __init s390_smp_init(void)
diff --git a/arch/s390/kernel/topology.c b/arch/s390/kernel/topology.c
index 4d5b65e527b5..4b6e0397f66d 100644
--- a/arch/s390/kernel/topology.c
+++ b/arch/s390/kernel/topology.c
@@ -404,8 +404,7 @@ out:
        put_online_cpus();
        return rc ? rc : count;
 }
-static DEVICE_ATTR(dispatching, 0644, dispatching_show,
+static DEVICE_ATTR_RW(dispatching);
-                         dispatching_store);
 static ssize_t cpu_polarization_show(struct device *dev,
                                     struct device_attribute *attr, char *buf)
diff --git a/arch/sh/configs/polaris_defconfig b/arch/sh/configs/polaris_defconfig
index 0a432b5f50e7..87641b7d6c4e 100644
--- a/arch/sh/configs/polaris_defconfig
+++ b/arch/sh/configs/polaris_defconfig
@@ -38,7 +38,6 @@ CONFIG_IP_MULTICAST=y
 # CONFIG_INET_XFRM_MODE_BEET is not set
 # CONFIG_IPV6 is not set
 CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
-# CONFIG_FIRMWARE_IN_KERNEL is not set
 CONFIG_MTD=y
 CONFIG_MTD_CMDLINE_PARTS=y
 CONFIG_MTD_BLOCK=y
diff --git a/arch/sh/drivers/push-switch.c b/arch/sh/drivers/push-switch.c
index a17181160233..762bc5619910 100644
--- a/arch/sh/drivers/push-switch.c
+++ b/arch/sh/drivers/push-switch.c
@@ -24,7 +24,7 @@ static ssize_t switch_show(struct device *dev,
        struct push_switch_platform_info *psw_info = dev->platform_data;
        return sprintf(buf, "%s\n", psw_info->name);
 }
-static DEVICE_ATTR(switch, S_IRUGO, switch_show, NULL);
+static DEVICE_ATTR_RO(switch);
 static void switch_timer(struct timer_list *t)
 {
diff --git a/arch/tile/configs/tilegx_defconfig b/arch/tile/configs/tilegx_defconfig
index 9f94435cc44f..357a4c271ad4 100644
--- a/arch/tile/configs/tilegx_defconfig
+++ b/arch/tile/configs/tilegx_defconfig
@@ -159,7 +159,6 @@ CONFIG_DNS_RESOLVER=y
 CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
 CONFIG_DEVTMPFS=y
 CONFIG_DEVTMPFS_MOUNT=y
-# CONFIG_FIRMWARE_IN_KERNEL is not set
 CONFIG_CONNECTOR=y
 CONFIG_BLK_DEV_LOOP=y
 CONFIG_BLK_DEV_CRYPTOLOOP=m
diff --git a/arch/tile/configs/tilepro_defconfig b/arch/tile/configs/tilepro_defconfig
index 1c5bd4f8ffca..da2858755fa1 100644
--- a/arch/tile/configs/tilepro_defconfig
+++ b/arch/tile/configs/tilepro_defconfig
@@ -289,7 +289,6 @@ CONFIG_DNS_RESOLVER=y
 CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
 CONFIG_DEVTMPFS=y
 CONFIG_DEVTMPFS_MOUNT=y
-# CONFIG_FIRMWARE_IN_KERNEL is not set
 CONFIG_CONNECTOR=y
 CONFIG_BLK_DEV_LOOP=y
 CONFIG_BLK_DEV_CRYPTOLOOP=m
diff --git a/arch/tile/kernel/sysfs.c b/arch/tile/kernel/sysfs.c
index 825867c53853..b09456a3d77a 100644
--- a/arch/tile/kernel/sysfs.c
+++ b/arch/tile/kernel/sysfs.c
@@ -38,7 +38,7 @@ static ssize_t chip_width_show(struct device *dev,
 {
        return sprintf(page, "%u\n", smp_width);
 }
-static DEVICE_ATTR(chip_width, 0444, chip_width_show, NULL);
+static DEVICE_ATTR_RO(chip_width);
 static ssize_t chip_height_show(struct device *dev,
                                struct device_attribute *attr,
@@ -46,7 +46,7 @@ static ssize_t chip_height_show(struct device *dev,
 {
        return sprintf(page, "%u\n", smp_height);
 }
-static DEVICE_ATTR(chip_height, 0444, chip_height_show, NULL);
+static DEVICE_ATTR_RO(chip_height);
 static ssize_t chip_serial_show(struct device *dev,
                                struct device_attribute *attr,
@@ -54,7 +54,7 @@ static ssize_t chip_serial_show(struct device *dev,
 {
        return get_hv_confstr(page, HV_CONFSTR_CHIP_SERIAL_NUM);
 }
-static DEVICE_ATTR(chip_serial, 0444, chip_serial_show, NULL);
+static DEVICE_ATTR_RO(chip_serial);
 static ssize_t chip_revision_show(struct device *dev,
                                  struct device_attribute *attr,
@@ -62,7 +62,7 @@ static ssize_t chip_revision_show(struct device *dev,
 {
        return get_hv_confstr(page, HV_CONFSTR_CHIP_REV);
 }
-static DEVICE_ATTR(chip_revision, 0444, chip_revision_show, NULL);
+static DEVICE_ATTR_RO(chip_revision);
 static ssize_t type_show(struct device *dev,
@@ -71,7 +71,7 @@ static ssize_t type_show(struct device *dev,
 {
        return sprintf(page, "tilera\n");
 }
-static DEVICE_ATTR(type, 0444, type_show, NULL);
+static DEVICE_ATTR_RO(type);
 #define HV_CONF_ATTR(name, conf)                                        \
        static ssize_t name ## _show(struct device *dev,                \
@@ -184,7 +184,7 @@ static ssize_t hv_stats_store(struct device *dev,
        return n < 0 ? n : count;
 }
-static DEVICE_ATTR(hv_stats, 0644, hv_stats_show, hv_stats_store);
+static DEVICE_ATTR_RW(hv_stats);
 static int hv_stats_device_add(struct device *dev, struct subsys_interface *sif)
 {
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index d416fd9fdb3b..72d5149bcaa1 100644
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -1265,9 +1265,9 @@ config MICROCODE
          CONFIG_BLK_DEV_INITRD in order for the loader to be able to scan the
          initrd for microcode blobs.
-          In addition, you can build-in the microcode into the kernel. For that you
+          In addition, you can build the microcode into the kernel. For that you
-          need to enable FIRMWARE_IN_KERNEL and add the vendor-supplied microcode
+          need to add the vendor-supplied microcode to the CONFIG_EXTRA_FIRMWARE
-          to the CONFIG_EXTRA_FIRMWARE config option.
+          config option.
 config MICROCODE_INTEL
        bool "Intel microcode loading support"
diff --git a/arch/x86/kernel/cpu/microcode/core.c b/arch/x86/kernel/cpu/microcode/core.c
index e4fc595cd6ea..319dd65f98a2 100644
--- a/arch/x86/kernel/cpu/microcode/core.c
+++ b/arch/x86/kernel/cpu/microcode/core.c
@@ -560,7 +560,7 @@ static ssize_t pf_show(struct device *dev,
        return sprintf(buf, "0x%x\n", uci->cpu_sig.pf);
 }
-static DEVICE_ATTR(reload, 0200, NULL, reload_store);
+static DEVICE_ATTR_WO(reload);
 static DEVICE_ATTR(version, 0400, version_show, NULL);
 static DEVICE_ATTR(processor_flags, 0400, pf_show, NULL);
diff --git a/drivers/acpi/device_sysfs.c b/drivers/acpi/device_sysfs.c
index a041689e5701..545e91420cde 100644
--- a/drivers/acpi/device_sysfs.c
+++ b/drivers/acpi/device_sysfs.c
@@ -357,7 +357,7 @@ static ssize_t real_power_state_show(struct device *dev,
        return sprintf(buf, "%s\n", acpi_power_state_string(state));
 }
-static DEVICE_ATTR(real_power_state, 0444, real_power_state_show, NULL);
+static DEVICE_ATTR_RO(real_power_state);
 static ssize_t power_state_show(struct device *dev,
                                struct device_attribute *attr, char *buf)
@@ -367,7 +367,7 @@ static ssize_t power_state_show(struct device *dev,
        return sprintf(buf, "%s\n", acpi_power_state_string(adev->power.state));
 }
-static DEVICE_ATTR(power_state, 0444, power_state_show, NULL);
+static DEVICE_ATTR_RO(power_state);
 static ssize_t
 acpi_eject_store(struct device *d, struct device_attribute *attr,
@@ -462,7 +462,7 @@ static ssize_t description_show(struct device *dev,
        return result;
 }
-static DEVICE_ATTR(description, 0444, description_show, NULL);
+static DEVICE_ATTR_RO(description);
 static ssize_t
 acpi_device_sun_show(struct device *dev, struct device_attribute *attr,
diff --git a/drivers/base/Kconfig b/drivers/base/Kconfig
index 2415ad9f6dd4..784ff0003c1b 100644
--- a/drivers/base/Kconfig
+++ b/drivers/base/Kconfig
@@ -86,10 +86,9 @@ config FW_LOADER
          require userspace firmware loading support, but a module built
          out-of-tree does.
-config FIRMWARE_IN_KERNEL
+config EXTRA_FIRMWARE
-        bool "Include in-kernel firmware blobs in kernel binary"
+        string "External firmware blobs to build into the kernel binary"
        depends on FW_LOADER
-        default y
        help
          Various drivers in the kernel source tree may require firmware,
          which is generally available in your distribution's linux-firmware
@@ -99,23 +98,6 @@ config FIRMWARE_IN_KERNEL
          /lib/firmware/ on your system, so they can be loaded by userspace
          helpers on request.
-          Enabling this option will build each required firmware blob
-          specified by EXTRA_FIRMWARE into the kernel directly, where
-          request_firmware() will find them without having to call out to
-          userspace. This may be useful if your root file system requires a
-          device that uses such firmware and you do not wish to use an
-          initrd.
-          This single option controls the inclusion of firmware for
-          every driver that uses request_firmware(), which avoids a
-          proliferation of 'Include firmware for xxx device' options.
-          Say 'N' and let firmware be loaded from userspace.
-config EXTRA_FIRMWARE
-        string "External firmware blobs to build into the kernel binary"
-        depends on FW_LOADER
-        help
          This option allows firmware to be built into the kernel for the case
          where the user either cannot or doesn't want to provide it from
          userspace at runtime (for example, when the firmware in question is
@@ -126,11 +108,11 @@ config EXTRA_FIRMWARE
          firmware files -- the same names that appear in MODULE_FIRMWARE()
          and request_firmware() in the source. These files should exist under
          the directory specified by the EXTRA_FIRMWARE_DIR option, which is
-          by default the firmware subdirectory of the kernel source tree.
+          /lib/firmware by default.
          For example, you might set CONFIG_EXTRA_FIRMWARE="usb8388.bin", copy
-          the usb8388.bin file into the firmware directory, and build the kernel.
+          the usb8388.bin file into /lib/firmware, and build the kernel. Then
-          Then any request_firmware("usb8388.bin") will be satisfied internally
+          any request_firmware("usb8388.bin") will be satisfied internally
          without needing to call out to userspace.
          WARNING: If you include additional firmware files into your binary
diff --git a/drivers/base/arch_topology.c b/drivers/base/arch_topology.c
index 4de87b0b53c8..52ec5174bcb1 100644
--- a/drivers/base/arch_topology.c
+++ b/drivers/base/arch_topology.c
@@ -1,15 +1,9 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
 * Arch specific cpu topology information
 *
 * Copyright (C) 2016, ARM Ltd.
 * Written by: Juri Lelli, ARM Ltd.
- *
- * This file is subject to the terms and conditions of the GNU General Public
- * License.  See the file "COPYING" in the main directory of this archive
- * for more details.
- *
- * Released under the GPLv2 only.
- * SPDX-License-Identifier: GPL-2.0
 */
 #include <linux/acpi.h>
diff --git a/drivers/base/attribute_container.c b/drivers/base/attribute_container.c
index 95e3ef82f3b7..20736aaa0e69 100644
--- a/drivers/base/attribute_container.c
+++ b/drivers/base/attribute_container.c
@@ -1,10 +1,9 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
 * attribute_container.c - implementation of a simple container for classes
 *
 * Copyright (c) 2005 - James Bottomley <James.Bottomley@steeleye.com>
 *
- * This file is licensed under GPLv2
- *
 * The basic idea here is to enable a device to be attached to an
 * aritrary numer of classes without having to allocate storage for them.
 * Instead, the contained classes select the devices they need to attach
diff --git a/drivers/base/bus.c b/drivers/base/bus.c
index 22a64fd3309b..ef6183306b40 100644
--- a/drivers/base/bus.c
+++ b/drivers/base/bus.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
 * bus.c - bus driver management
 *
@@ -5,9 +6,6 @@
 * Copyright (c) 2002-3 Open Source Development Labs
 * Copyright (c) 2007 Greg Kroah-Hartman <gregkh@suse.de>
 * Copyright (c) 2007 Novell Inc.
- *
- * This file is released under the GPLv2
- *
 */
 #include <linux/async.h>
@@ -309,7 +307,7 @@ int bus_for_each_dev(struct bus_type *bus, struct device *start,
        klist_iter_init_node(&bus->p->klist_devices, &i,
                             (start ? &start->p->knode_bus : NULL));
-        while ((dev = next_device(&i)) && !error)
+        while (!error && (dev = next_device(&i)))
                error = fn(dev, data);
        klist_iter_exit(&i);
        return error;
diff --git a/drivers/base/cacheinfo.c b/drivers/base/cacheinfo.c
index 07532d83be0b..edf726267282 100644
--- a/drivers/base/cacheinfo.c
+++ b/drivers/base/cacheinfo.c
@@ -1,20 +1,9 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
 * cacheinfo support - processor cache information via sysfs
 *
 * Based on arch/x86/kernel/cpu/intel_cacheinfo.c
 * Author: Sudeep Holla <sudeep.holla@arm.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- *
- * This program is distributed "as is" WITHOUT ANY WARRANTY of any
- * kind, whether express or implied; without even the implied warranty
- * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
diff --git a/drivers/base/class.c b/drivers/base/class.c
index 52eb8e644acd..54def4e02f00 100644
--- a/drivers/base/class.c
+++ b/drivers/base/class.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
 * class.c - basic device class management
 *
@@ -5,9 +6,6 @@
 * Copyright (c) 2002-3 Open Source Development Labs
 * Copyright (c) 2003-2004 Greg Kroah-Hartman
 * Copyright (c) 2003-2004 IBM Corp.
- *
- * This file is released under the GPLv2
- *
 */
 #include <linux/device.h>
diff --git a/drivers/base/component.c b/drivers/base/component.c
index 89b032f2ffd2..8946dfee4768 100644
--- a/drivers/base/component.c
+++ b/drivers/base/component.c
@@ -1,10 +1,7 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
 * Componentized device handling.
 *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- *
 * This is work in progress.  We gather up the component devices into a list,
 * and bind them when instructed.  At the moment, we're specific to the DRM
 * subsystem, and only handles one master device, but this doesn't have to be
@@ -17,6 +14,7 @@
 #include <linux/module.h>
 #include <linux/mutex.h>
 #include <linux/slab.h>
+#include <linux/debugfs.h>
 struct component;
@@ -41,6 +39,7 @@ struct master {
        const struct component_master_ops *ops;
        struct device *dev;
        struct component_match *match;
+        struct dentry *dentry;
 };
 struct component {
@@ -56,6 +55,80 @@ static DEFINE_MUTEX(component_mutex);
 static LIST_HEAD(component_list);
 static LIST_HEAD(masters);
+#ifdef CONFIG_DEBUG_FS
+static struct dentry *component_debugfs_dir;
+static int component_devices_show(struct seq_file *s, void *data)
+{
+        struct master *m = s->private;
+        struct component_match *match = m->match;
+        size_t i;
+        mutex_lock(&component_mutex);
+        seq_printf(s, "%-40s %20s\n", "master name", "status");
+        seq_puts(s, "-------------------------------------------------------------\n");
+        seq_printf(s, "%-40s %20s\n\n",
+                   dev_name(m->dev), m->bound ? "bound" : "not bound");
+        seq_printf(s, "%-40s %20s\n", "device name", "status");
+        seq_puts(s, "-------------------------------------------------------------\n");
+        for (i = 0; i < match->num; i++) {
+                struct device *d = (struct device *)match->compare[i].data;
+                seq_printf(s, "%-40s %20s\n", dev_name(d),
+                           match->compare[i].component ?
+                           "registered" : "not registered");
+        }
+        mutex_unlock(&component_mutex);
+        return 0;
+}
+static int component_devices_open(struct inode *inode, struct file *file)
+{
+        return single_open(file, component_devices_show, inode->i_private);
+}
+static const struct file_operations component_devices_fops = {
+        .open = component_devices_open,
+        .read = seq_read,
+        .llseek = seq_lseek,
+        .release = single_release,
+};
+static int __init component_debug_init(void)
+{
+        component_debugfs_dir = debugfs_create_dir("device_component", NULL);
+        return 0;
+}
+core_initcall(component_debug_init);
+static void component_master_debugfs_add(struct master *m)
+{
+        m->dentry = debugfs_create_file(dev_name(m->dev), 0444,
+                                        component_debugfs_dir,
+                                        m, &component_devices_fops);
+}
+static void component_master_debugfs_del(struct master *m)
+{
+        debugfs_remove(m->dentry);
+        m->dentry = NULL;
+}
+#else
+static void component_master_debugfs_add(struct master *m)
+{ }
+static void component_master_debugfs_del(struct master *m)
+{ }
+#endif
 static struct master *__master_find(struct device *dev,
        const struct component_master_ops *ops)
 {
@@ -290,6 +363,7 @@ static void free_master(struct master *master)
        struct component_match *match = master->match;
        int i;
+        component_master_debugfs_del(master);
        list_del(&master->node);
        if (match) {
@@ -323,6 +397,7 @@ int component_master_add_with_match(struct device *dev,
        master->ops = ops;
        master->match = match;
+        component_master_debugfs_add(master);
        /* Add to the list of available masters. */
        mutex_lock(&component_mutex);
        list_add(&master->node, &masters);
diff --git a/drivers/base/container.c b/drivers/base/container.c
index ecbfbe2e908f..1ba42d2d3532 100644
--- a/drivers/base/container.c
+++ b/drivers/base/container.c
@@ -1,12 +1,9 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
 * System bus type for containers.
 *
 * Copyright (C) 2013, Intel Corporation
 * Author: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
 */
 #include <linux/container.h>
diff --git a/drivers/base/core.c b/drivers/base/core.c
index 110230d86527..61515ef91184 100644
--- a/drivers/base/core.c
+++ b/drivers/base/core.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
 * drivers/base/core.c - core driver model code (device registration, etc)
 *
@@ -5,9 +6,6 @@
 * Copyright (c) 2002-3 Open Source Development Labs
 * Copyright (c) 2006 Greg Kroah-Hartman <gregkh@suse.de>
 * Copyright (c) 2006 Novell, Inc.
- *
- * This file is released under the GPLv2
- *
 */
 #include <linux/device.h>
@@ -2116,7 +2114,7 @@ int device_for_each_child(struct device *parent, void *data,
                return 0;
        klist_iter_init(&parent->p->klist_children, &i);
-        while ((child = next_device(&i)) && !error)
+        while (!error && (child = next_device(&i)))
                error = fn(child, data);
        klist_iter_exit(&i);
        return error;
diff --git a/drivers/base/cpu.c b/drivers/base/cpu.c
index d99038487a0d..d21a2d913107 100644
--- a/drivers/base/cpu.c
+++ b/drivers/base/cpu.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
 * CPU subsystem support
 */
diff --git a/drivers/base/dd.c b/drivers/base/dd.c
index 2c964f56dafe..de6fd092bf2f 100644
--- a/drivers/base/dd.c
+++ b/drivers/base/dd.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
 * drivers/base/dd.c - The core device/driver interactions.
 *
@@ -13,8 +14,6 @@
 * Copyright (c) 2002-3 Open Source Development Labs
 * Copyright (c) 2007-2009 Greg Kroah-Hartman <gregkh@suse.de>
 * Copyright (c) 2007-2009 Novell Inc.
- *
- * This file is released under the GPLv2
 */
 #include <linux/device.h>
@@ -289,6 +288,18 @@ static void driver_bound(struct device *dev)
        kobject_uevent(&dev->kobj, KOBJ_BIND);
 }
+static ssize_t coredump_store(struct device *dev, struct device_attribute *attr,
+                            const char *buf, size_t count)
+{
+        device_lock(dev);
+        if (dev->driver->coredump)
+                dev->driver->coredump(dev);
+        device_unlock(dev);
+        return count;
+}
+static DEVICE_ATTR_WO(coredump);
 static int driver_sysfs_add(struct device *dev)
 {
        int ret;
@@ -298,14 +309,26 @@ static int driver_sysfs_add(struct device *dev)
                                             BUS_NOTIFY_BIND_DRIVER, dev);
        ret = sysfs_create_link(&dev->driver->p->kobj, &dev->kobj,
+                                kobject_name(&dev->kobj));
+        if (ret)
+                goto fail;
+        ret = sysfs_create_link(&dev->kobj, &dev->driver->p->kobj,
+                                "driver");
+        if (ret)
+                goto rm_dev;
+        if (!IS_ENABLED(CONFIG_DEV_COREDUMP) || !dev->driver->coredump ||
+            !device_create_file(dev, &dev_attr_coredump))
+                return 0;
+        sysfs_remove_link(&dev->kobj, "driver");
+rm_dev:
+        sysfs_remove_link(&dev->driver->p->kobj,
                          kobject_name(&dev->kobj));
-        if (ret == 0) {
-                ret = sysfs_create_link(&dev->kobj, &dev->driver->p->kobj,
+fail:
-                                        "driver");
-                if (ret)
-                        sysfs_remove_link(&dev->driver->p->kobj,
-                                        kobject_name(&dev->kobj));
-        }
        return ret;
 }
@@ -314,6 +337,8 @@ static void driver_sysfs_remove(struct device *dev)
        struct device_driver *drv = dev->driver;
        if (drv) {
+                if (drv->coredump)
+                        device_remove_file(dev, &dev_attr_coredump);
                sysfs_remove_link(&drv->p->kobj, kobject_name(&dev->kobj));
                sysfs_remove_link(&dev->kobj, "driver");
        }
diff --git a/drivers/base/devcoredump.c b/drivers/base/devcoredump.c
index 7be310f7db73..f1a3353f3494 100644
--- a/drivers/base/devcoredump.c
+++ b/drivers/base/devcoredump.c
@@ -1,23 +1,8 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
- * This file is provided under the GPLv2 license.
- *
- * GPL LICENSE SUMMARY
- *
 * Copyright(c) 2014 Intel Mobile Communications GmbH
 * Copyright(c) 2015 Intel Deutschland GmbH
 *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of version 2 of the GNU General Public License as
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * The full GNU General Public License is included in this distribution
- * in the file called COPYING.
- *
 * Contact Information:
 *  Intel Linux Wireless <ilw@linux.intel.com>
 * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497
diff --git a/drivers/base/devres.c b/drivers/base/devres.c
index 71d577025285..95b67281cd2a 100644
--- a/drivers/base/devres.c
+++ b/drivers/base/devres.c
@@ -1,10 +1,9 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
 * drivers/base/devres.c - device resource management
 *
 * Copyright (c) 2006  SUSE Linux Products GmbH
 * Copyright (c) 2006  Tejun Heo <teheo@suse.de>
- *
- * This file is released under the GPLv2.
 */
 #include <linux/device.h>
diff --git a/drivers/base/dma-contiguous.c b/drivers/base/dma-contiguous.c
index ea9726e71468..d987dcd1bd56 100644
--- a/drivers/base/dma-contiguous.c
+++ b/drivers/base/dma-contiguous.c
@@ -1,14 +1,10 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
 * Contiguous Memory Allocator for DMA mapping framework
 * Copyright (c) 2010-2011 by Samsung Electronics.
 * Written by:
 *      Marek Szyprowski <m.szyprowski@samsung.com>
 *      Michal Nazarewicz <mina86@mina86.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License or (at your optional) any later version of the license.
 */
 #define pr_fmt(fmt) "cma: " fmt
diff --git a/drivers/base/dma-mapping.c b/drivers/base/dma-mapping.c
index e584eddef0a7..3b118353ea17 100644
--- a/drivers/base/dma-mapping.c
+++ b/drivers/base/dma-mapping.c
@@ -1,10 +1,9 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
 * drivers/base/dma-mapping.c - arch-independent dma-mapping routines
 *
 * Copyright (c) 2006  SUSE Linux Products GmbH
 * Copyright (c) 2006  Tejun Heo <teheo@suse.de>
- *
- * This file is released under the GPLv2.
 */
 #include <linux/acpi.h>
diff --git a/drivers/base/driver.c b/drivers/base/driver.c
index 4eabfe28d2b3..ba912558a510 100644
--- a/drivers/base/driver.c
+++ b/drivers/base/driver.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
 * driver.c - centralized device driver management
 *
@@ -5,9 +6,6 @@
 * Copyright (c) 2002-3 Open Source Development Labs
 * Copyright (c) 2007 Greg Kroah-Hartman <gregkh@suse.de>
 * Copyright (c) 2007 Novell Inc.
- *
- * This file is released under the GPLv2
- *
 */
 #include <linux/device.h>
@@ -52,7 +50,7 @@ int driver_for_each_device(struct device_driver *drv, struct device *start,
        klist_iter_init_node(&drv->p->klist_devices, &i,
                             start ? &start->p->knode_driver : NULL);
-        while ((dev = next_device(&i)) && !error)
+        while (!error && (dev = next_device(&i)))
                error = fn(dev, data);
        klist_iter_exit(&i);
        return error;
diff --git a/drivers/base/firmware.c b/drivers/base/firmware.c
index 113815556809..8dff940e0db9 100644
--- a/drivers/base/firmware.c
+++ b/drivers/base/firmware.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
 * firmware.c - firmware subsystem hoohaw.
 *
@@ -5,8 +6,6 @@
 * Copyright (c) 2002-3 Open Source Development Labs
 * Copyright (c) 2007 Greg Kroah-Hartman <gregkh@suse.de>
 * Copyright (c) 2007 Novell Inc.
- *
- * This file is released under the GPLv2
 */
 #include <linux/kobject.h>
 #include <linux/module.h>
diff --git a/drivers/base/firmware_class.c b/drivers/base/firmware_class.c
index 4b57cf5bc81d..7dd36ace6152 100644
--- a/drivers/base/firmware_class.c
+++ b/drivers/base/firmware_class.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
 * firmware_class.c - Multi purpose firmware loading support
 *
@@ -41,6 +42,96 @@ MODULE_AUTHOR("Manuel Estrada Sainz");
 MODULE_DESCRIPTION("Multi purpose firmware loading support");
 MODULE_LICENSE("GPL");
+enum fw_status {
+        FW_STATUS_UNKNOWN,
+        FW_STATUS_LOADING,
+        FW_STATUS_DONE,
+        FW_STATUS_ABORTED,
+};
+/*
+ * Concurrent request_firmware() for the same firmware need to be
+ * serialized.  struct fw_state is simple state machine which hold the
+ * state of the firmware loading.
+ */
+struct fw_state {
+        struct completion completion;
+        enum fw_status status;
+};
+/* firmware behavior options */
+#define FW_OPT_UEVENT   (1U << 0)
+#define FW_OPT_NOWAIT   (1U << 1)
+#define FW_OPT_USERHELPER       (1U << 2)
+#define FW_OPT_NO_WARN  (1U << 3)
+#define FW_OPT_NOCACHE  (1U << 4)
+#define FW_OPT_NOFALLBACK (1U << 5)
+struct firmware_cache {
+        /* firmware_buf instance will be added into the below list */
+        spinlock_t lock;
+        struct list_head head;
+        int state;
+#ifdef CONFIG_PM_SLEEP
+        /*
+         * Names of firmware images which have been cached successfully
+         * will be added into the below list so that device uncache
+         * helper can trace which firmware images have been cached
+         * before.
+         */
+        spinlock_t name_lock;
+        struct list_head fw_names;
+        struct delayed_work work;
+        struct notifier_block   pm_notify;
+#endif
+};
+struct fw_priv {
+        struct kref ref;
+        struct list_head list;
+        struct firmware_cache *fwc;
+        struct fw_state fw_st;
+        void *data;
+        size_t size;
+        size_t allocated_size;
+#ifdef CONFIG_FW_LOADER_USER_HELPER
+        bool is_paged_buf;
+        bool need_uevent;
+        struct page **pages;
+        int nr_pages;
+        int page_array_size;
+        struct list_head pending_list;
+#endif
+        const char *fw_name;
+};
+struct fw_cache_entry {
+        struct list_head list;
+        const char *name;
+};
+struct fw_name_devm {
+        unsigned long magic;
+        const char *name;
+};
+static inline struct fw_priv *to_fw_priv(struct kref *ref)
+{
+        return container_of(ref, struct fw_priv, ref);
+}
+#define FW_LOADER_NO_CACHE      0
+#define FW_LOADER_START_CACHE   1
+/* fw_lock could be moved to 'struct fw_sysfs' but since it is just
+ * guarding for corner cases a global lock should be OK */
+static DEFINE_MUTEX(fw_lock);
+static struct firmware_cache fw_cache;
 /* Builtin firmware support */
 #ifdef CONFIG_FW_LOADER
@@ -48,6 +139,14 @@ MODULE_LICENSE("GPL");
 extern struct builtin_fw __start_builtin_fw[];
 extern struct builtin_fw __end_builtin_fw[];
+static void fw_copy_to_prealloc_buf(struct firmware *fw,
+                                    void *buf, size_t size)
+{
+        if (!buf || size < fw->size)
+                return;
+        memcpy(buf, fw->data, fw->size);
+}
 static bool fw_get_builtin_firmware(struct firmware *fw, const char *name,
                                    void *buf, size_t size)
 {
@@ -57,9 +156,8 @@ static bool fw_get_builtin_firmware(struct firmware *fw, const char *name,
                if (strcmp(name, b_fw->name) == 0) {
                        fw->size = b_fw->size;
                        fw->data = b_fw->data;
+                        fw_copy_to_prealloc_buf(fw, buf, size);
-                        if (buf && fw->size <= size)
-                                memcpy(buf, fw->data, fw->size);
                        return true;
                }
        }
@@ -93,13 +191,6 @@ static inline bool fw_is_builtin_firmware(const struct firmware *fw)
 }
 #endif
-enum fw_status {
-        FW_STATUS_UNKNOWN,
-        FW_STATUS_LOADING,
-        FW_STATUS_DONE,
-        FW_STATUS_ABORTED,
-};
 static int loading_timeout = 60;        /* In seconds */
 static inline long firmware_loading_timeout(void)
@@ -107,29 +198,17 @@ static inline long firmware_loading_timeout(void)
        return loading_timeout > 0 ? loading_timeout * HZ : MAX_JIFFY_OFFSET;
 }
-/*
+static void fw_state_init(struct fw_priv *fw_priv)
- * Concurrent request_firmware() for the same firmware need to be
- * serialized.  struct fw_state is simple state machine which hold the
- * state of the firmware loading.
- */
-struct fw_state {
-        struct completion completion;
-        enum fw_status status;
-};
-static void fw_state_init(struct fw_state *fw_st)
 {
+        struct fw_state *fw_st = &fw_priv->fw_st;
        init_completion(&fw_st->completion);
        fw_st->status = FW_STATUS_UNKNOWN;
 }
-static inline bool __fw_state_is_done(enum fw_status status)
+static int __fw_state_wait_common(struct fw_priv *fw_priv, long timeout)
-{
-        return status == FW_STATUS_DONE || status == FW_STATUS_ABORTED;
-}
-static int __fw_state_wait_common(struct fw_state *fw_st, long timeout)
 {
+        struct fw_state *fw_st = &fw_priv->fw_st;
        long ret;
        ret = wait_for_completion_killable_timeout(&fw_st->completion, timeout);
@@ -141,226 +220,172 @@ static int __fw_state_wait_common(struct fw_state *fw_st, long timeout)
        return ret < 0 ? ret : 0;
 }
-static void __fw_state_set(struct fw_state *fw_st,
+static void __fw_state_set(struct fw_priv *fw_priv,
                           enum fw_status status)
 {
+        struct fw_state *fw_st = &fw_priv->fw_st;
        WRITE_ONCE(fw_st->status, status);
        if (status == FW_STATUS_DONE || status == FW_STATUS_ABORTED)
                complete_all(&fw_st->completion);
 }
-#define fw_state_start(fw_st)                                   \
+static inline void fw_state_start(struct fw_priv *fw_priv)
-        __fw_state_set(fw_st, FW_STATUS_LOADING)
-#define fw_state_done(fw_st)                                    \
-        __fw_state_set(fw_st, FW_STATUS_DONE)
-#define fw_state_aborted(fw_st)                                 \
-        __fw_state_set(fw_st, FW_STATUS_ABORTED)
-#define fw_state_wait(fw_st)                                    \
-        __fw_state_wait_common(fw_st, MAX_SCHEDULE_TIMEOUT)
-static int __fw_state_check(struct fw_state *fw_st, enum fw_status status)
 {
-        return fw_st->status == status;
+        __fw_state_set(fw_priv, FW_STATUS_LOADING);
 }
-#define fw_state_is_aborted(fw_st)                              \
+static inline void fw_state_done(struct fw_priv *fw_priv)
-        __fw_state_check(fw_st, FW_STATUS_ABORTED)
+{
+        __fw_state_set(fw_priv, FW_STATUS_DONE);
-#ifdef CONFIG_FW_LOADER_USER_HELPER
+}
-#define fw_state_aborted(fw_st)                                 \
-        __fw_state_set(fw_st, FW_STATUS_ABORTED)
-#define fw_state_is_done(fw_st)                                 \
-        __fw_state_check(fw_st, FW_STATUS_DONE)
-#define fw_state_is_loading(fw_st)                              \
-        __fw_state_check(fw_st, FW_STATUS_LOADING)
-#define fw_state_wait_timeout(fw_st, timeout)                   \
-        __fw_state_wait_common(fw_st, timeout)
-#endif /* CONFIG_FW_LOADER_USER_HELPER */
-/* firmware behavior options */
+static inline void fw_state_aborted(struct fw_priv *fw_priv)
-#define FW_OPT_UEVENT   (1U << 0)
+{
-#define FW_OPT_NOWAIT   (1U << 1)
+        __fw_state_set(fw_priv, FW_STATUS_ABORTED);
-#ifdef CONFIG_FW_LOADER_USER_HELPER
+}
-#define FW_OPT_USERHELPER       (1U << 2)
-#else
-#define FW_OPT_USERHELPER       0
-#endif
-#ifdef CONFIG_FW_LOADER_USER_HELPER_FALLBACK
-#define FW_OPT_FALLBACK         FW_OPT_USERHELPER
-#else
-#define FW_OPT_FALLBACK         0
-#endif
-#define FW_OPT_NO_WARN  (1U << 3)
-#define FW_OPT_NOCACHE  (1U << 4)
-struct firmware_cache {
+static inline int fw_state_wait(struct fw_priv *fw_priv)
-        /* firmware_buf instance will be added into the below list */
+{
-        spinlock_t lock;
+        return __fw_state_wait_common(fw_priv, MAX_SCHEDULE_TIMEOUT);
-        struct list_head head;
+}
-        int state;
-#ifdef CONFIG_PM_SLEEP
+static bool __fw_state_check(struct fw_priv *fw_priv,
-        /*
+                             enum fw_status status)
-         * Names of firmware images which have been cached successfully
+{
-         * will be added into the below list so that device uncache
+        struct fw_state *fw_st = &fw_priv->fw_st;
-         * helper can trace which firmware images have been cached
-         * before.
-         */
-        spinlock_t name_lock;
-        struct list_head fw_names;
-        struct delayed_work work;
+        return fw_st->status == status;
+}
-        struct notifier_block   pm_notify;
+static inline bool fw_state_is_aborted(struct fw_priv *fw_priv)
-#endif
+{
-};
+        return __fw_state_check(fw_priv, FW_STATUS_ABORTED);
+}
-struct firmware_buf {
-        struct kref ref;
-        struct list_head list;
-        struct firmware_cache *fwc;
-        struct fw_state fw_st;
-        void *data;
-        size_t size;
-        size_t allocated_size;
 #ifdef CONFIG_FW_LOADER_USER_HELPER
-        bool is_paged_buf;
-        bool need_uevent;
-        struct page **pages;
-        int nr_pages;
-        int page_array_size;
-        struct list_head pending_list;
-#endif
-        const char *fw_id;
-};
-struct fw_cache_entry {
+static inline bool fw_sysfs_done(struct fw_priv *fw_priv)
-        struct list_head list;
+{
-        const char *name;
+        return __fw_state_check(fw_priv, FW_STATUS_DONE);
-};
+}
-struct fw_name_devm {
+static inline bool fw_sysfs_loading(struct fw_priv *fw_priv)
-        unsigned long magic;
+{
-        const char *name;
+        return __fw_state_check(fw_priv, FW_STATUS_LOADING);
-};
+}
-#define to_fwbuf(d) container_of(d, struct firmware_buf, ref)
+static inline int fw_sysfs_wait_timeout(struct fw_priv *fw_priv,  long timeout)
+{
+        return __fw_state_wait_common(fw_priv, timeout);
+}
-#define FW_LOADER_NO_CACHE      0
+#endif /* CONFIG_FW_LOADER_USER_HELPER */
-#define FW_LOADER_START_CACHE   1
 static int fw_cache_piggyback_on_request(const char *name);
-/* fw_lock could be moved to 'struct firmware_priv' but since it is just
+static struct fw_priv *__allocate_fw_priv(const char *fw_name,
- * guarding for corner cases a global lock should be OK */
+                                          struct firmware_cache *fwc,
-static DEFINE_MUTEX(fw_lock);
+                                          void *dbuf, size_t size)
-static struct firmware_cache fw_cache;
-static struct firmware_buf *__allocate_fw_buf(const char *fw_name,
-                                              struct firmware_cache *fwc,
-                                              void *dbuf, size_t size)
 {
-        struct firmware_buf *buf;
+        struct fw_priv *fw_priv;
-        buf = kzalloc(sizeof(*buf), GFP_ATOMIC);
+        fw_priv = kzalloc(sizeof(*fw_priv), GFP_ATOMIC);
-        if (!buf)
+        if (!fw_priv)
                return NULL;
-        buf->fw_id = kstrdup_const(fw_name, GFP_ATOMIC);
+        fw_priv->fw_name = kstrdup_const(fw_name, GFP_ATOMIC);
-        if (!buf->fw_id) {
+        if (!fw_priv->fw_name) {
-                kfree(buf);
+                kfree(fw_priv);
                return NULL;
        }
-        kref_init(&buf->ref);
+        kref_init(&fw_priv->ref);
-        buf->fwc = fwc;
+        fw_priv->fwc = fwc;
-        buf->data = dbuf;
+        fw_priv->data = dbuf;
-        buf->allocated_size = size;
+        fw_priv->allocated_size = size;
-        fw_state_init(&buf->fw_st);
+        fw_state_init(fw_priv);
 #ifdef CONFIG_FW_LOADER_USER_HELPER
-        INIT_LIST_HEAD(&buf->pending_list);
+        INIT_LIST_HEAD(&fw_priv->pending_list);
 #endif
-        pr_debug("%s: fw-%s buf=%p\n", __func__, fw_name, buf);
+        pr_debug("%s: fw-%s fw_priv=%p\n", __func__, fw_name, fw_priv);
-        return buf;
+        return fw_priv;
 }
-static struct firmware_buf *__fw_lookup_buf(const char *fw_name)
+static struct fw_priv *__lookup_fw_priv(const char *fw_name)
 {
-        struct firmware_buf *tmp;
+        struct fw_priv *tmp;
        struct firmware_cache *fwc = &fw_cache;
        list_for_each_entry(tmp, &fwc->head, list)
-                if (!strcmp(tmp->fw_id, fw_name))
+                if (!strcmp(tmp->fw_name, fw_name))
                        return tmp;
        return NULL;
 }
 /* Returns 1 for batching firmware requests with the same name */
-static int fw_lookup_and_allocate_buf(const char *fw_name,
+static int alloc_lookup_fw_priv(const char *fw_name,
-                                      struct firmware_cache *fwc,
+                                struct firmware_cache *fwc,
-                                      struct firmware_buf **buf, void *dbuf,
+                                struct fw_priv **fw_priv, void *dbuf,
-                                      size_t size)
+                                size_t size)
 {
-        struct firmware_buf *tmp;
+        struct fw_priv *tmp;
        spin_lock(&fwc->lock);
-        tmp = __fw_lookup_buf(fw_name);
+        tmp = __lookup_fw_priv(fw_name);
        if (tmp) {
                kref_get(&tmp->ref);
                spin_unlock(&fwc->lock);
-                *buf = tmp;
+                *fw_priv = tmp;
-                pr_debug("batched request - sharing the same struct firmware_buf and lookup for multiple requests\n");
+                pr_debug("batched request - sharing the same struct fw_priv and lookup for multiple requests\n");
                return 1;
        }
-        tmp = __allocate_fw_buf(fw_name, fwc, dbuf, size);
+        tmp = __allocate_fw_priv(fw_name, fwc, dbuf, size);
        if (tmp)
                list_add(&tmp->list, &fwc->head);
        spin_unlock(&fwc->lock);
-        *buf = tmp;
+        *fw_priv = tmp;
        return tmp ? 0 : -ENOMEM;
 }
-static void __fw_free_buf(struct kref *ref)
+static void __free_fw_priv(struct kref *ref)
        __releases(&fwc->lock)
 {
-        struct firmware_buf *buf = to_fwbuf(ref);
+        struct fw_priv *fw_priv = to_fw_priv(ref);
-        struct firmware_cache *fwc = buf->fwc;
+        struct firmware_cache *fwc = fw_priv->fwc;
-        pr_debug("%s: fw-%s buf=%p data=%p size=%u\n",
+        pr_debug("%s: fw-%s fw_priv=%p data=%p size=%u\n",
-                 __func__, buf->fw_id, buf, buf->data,
+                 __func__, fw_priv->fw_name, fw_priv, fw_priv->data,
-                 (unsigned int)buf->size);
+                 (unsigned int)fw_priv->size);
-        list_del(&buf->list);
+        list_del(&fw_priv->list);
        spin_unlock(&fwc->lock);
 #ifdef CONFIG_FW_LOADER_USER_HELPER
-        if (buf->is_paged_buf) {
+        if (fw_priv->is_paged_buf) {
                int i;
-                vunmap(buf->data);
+                vunmap(fw_priv->data);
-                for (i = 0; i < buf->nr_pages; i++)
+                for (i = 0; i < fw_priv->nr_pages; i++)
-                        __free_page(buf->pages[i]);
+                        __free_page(fw_priv->pages[i]);
-                vfree(buf->pages);
+                vfree(fw_priv->pages);
        } else
 #endif
-        if (!buf->allocated_size)
+        if (!fw_priv->allocated_size)
-                vfree(buf->data);
+                vfree(fw_priv->data);
-        kfree_const(buf->fw_id);
+        kfree_const(fw_priv->fw_name);
-        kfree(buf);
+        kfree(fw_priv);
 }
-static void fw_free_buf(struct firmware_buf *buf)
+static void free_fw_priv(struct fw_priv *fw_priv)
 {
-        struct firmware_cache *fwc = buf->fwc;
+        struct firmware_cache *fwc = fw_priv->fwc;
        spin_lock(&fwc->lock);
-        if (!kref_put(&buf->ref, __fw_free_buf))
+        if (!kref_put(&fw_priv->ref, __free_fw_priv))
                spin_unlock(&fwc->lock);
 }
@@ -383,7 +408,7 @@ module_param_string(path, fw_path_para, sizeof(fw_path_para), 0644);
 MODULE_PARM_DESC(path, "customized firmware image search path with a higher priority than default path");
 static int
-fw_get_filesystem_firmware(struct device *device, struct firmware_buf *buf)
+fw_get_filesystem_firmware(struct device *device, struct fw_priv *fw_priv)
 {
        loff_t size;
        int i, len;
@@ -393,9 +418,9 @@ fw_get_filesystem_firmware(struct device *device, struct firmware_buf *buf)
        size_t msize = INT_MAX;
        /* Already populated data member means we're loading into a buffer */
-        if (buf->data) {
+        if (fw_priv->data) {
                id = READING_FIRMWARE_PREALLOC_BUFFER;
-                msize = buf->allocated_size;
+                msize = fw_priv->allocated_size;
        }
        path = __getname();
@@ -408,15 +433,15 @@ fw_get_filesystem_firmware(struct device *device, struct firmware_buf *buf)
                        continue;
                len = snprintf(path, PATH_MAX, "%s/%s",
-                               fw_path[i], buf->fw_id);
+                               fw_path[i], fw_priv->fw_name);
                if (len >= PATH_MAX) {
                        rc = -ENAMETOOLONG;
                        break;
                }
-                buf->size = 0;
+                fw_priv->size = 0;
-                rc = kernel_read_file_from_path(path, &buf->data, &size, msize,
+                rc = kernel_read_file_from_path(path, &fw_priv->data, &size,
-                                                id);
+                                                msize, id);
                if (rc) {
                        if (rc == -ENOENT)
                                dev_dbg(device, "loading %s failed with error %d\n",
@@ -426,9 +451,9 @@ fw_get_filesystem_firmware(struct device *device, struct firmware_buf *buf)
                                         path, rc);
                        continue;
                }
-                dev_dbg(device, "direct-loading %s\n", buf->fw_id);
+                dev_dbg(device, "direct-loading %s\n", fw_priv->fw_name);
-                buf->size = size;
+                fw_priv->size = size;
-                fw_state_done(&buf->fw_st);
+                fw_state_done(fw_priv);
                break;
        }
        __putname(path);
@@ -444,22 +469,22 @@ static void firmware_free_data(const struct firmware *fw)
                vfree(fw->data);
                return;
        }
-        fw_free_buf(fw->priv);
+        free_fw_priv(fw->priv);
 }
 /* store the pages buffer info firmware from buf */
-static void fw_set_page_data(struct firmware_buf *buf, struct firmware *fw)
+static void fw_set_page_data(struct fw_priv *fw_priv, struct firmware *fw)
 {
-        fw->priv = buf;
+        fw->priv = fw_priv;
 #ifdef CONFIG_FW_LOADER_USER_HELPER
-        fw->pages = buf->pages;
+        fw->pages = fw_priv->pages;
 #endif
-        fw->size = buf->size;
+        fw->size = fw_priv->size;
-        fw->data = buf->data;
+        fw->data = fw_priv->data;
-        pr_debug("%s: fw-%s buf=%p data=%p size=%u\n",
+        pr_debug("%s: fw-%s fw_priv=%p data=%p size=%u\n",
-                 __func__, buf->fw_id, buf, buf->data,
+                 __func__, fw_priv->fw_name, fw_priv, fw_priv->data,
-                 (unsigned int)buf->size);
+                 (unsigned int)fw_priv->size);
 }
 #ifdef CONFIG_PM_SLEEP
@@ -523,13 +548,13 @@ static int fw_add_devm_name(struct device *dev, const char *name)
 }
 #endif
-static int assign_firmware_buf(struct firmware *fw, struct device *device,
+static int assign_fw(struct firmware *fw, struct device *device,
-                               unsigned int opt_flags)
+                     unsigned int opt_flags)
 {
-        struct firmware_buf *buf = fw->priv;
+        struct fw_priv *fw_priv = fw->priv;
        mutex_lock(&fw_lock);
-        if (!buf->size || fw_state_is_aborted(&buf->fw_st)) {
+        if (!fw_priv->size || fw_state_is_aborted(fw_priv)) {
                mutex_unlock(&fw_lock);
                return -ENOENT;
        }
@@ -544,20 +569,20 @@ static int assign_firmware_buf(struct firmware *fw, struct device *device,
        /* don't cache firmware handled without uevent */
        if (device && (opt_flags & FW_OPT_UEVENT) &&
            !(opt_flags & FW_OPT_NOCACHE))
-                fw_add_devm_name(device, buf->fw_id);
+                fw_add_devm_name(device, fw_priv->fw_name);
        /*
         * After caching firmware image is started, let it piggyback
         * on request firmware.
         */
        if (!(opt_flags & FW_OPT_NOCACHE) &&
-            buf->fwc->state == FW_LOADER_START_CACHE) {
+            fw_priv->fwc->state == FW_LOADER_START_CACHE) {
-                if (fw_cache_piggyback_on_request(buf->fw_id))
+                if (fw_cache_piggyback_on_request(fw_priv->fw_name))
-                        kref_get(&buf->ref);
+                        kref_get(&fw_priv->ref);
        }
        /* pass the pages buffer to driver at the last minute */
-        fw_set_page_data(buf, fw);
+        fw_set_page_data(fw_priv, fw);
        mutex_unlock(&fw_lock);
        return 0;
 }
@@ -566,49 +591,50 @@ static int assign_firmware_buf(struct firmware *fw, struct device *device,
 * user-mode helper code
 */
 #ifdef CONFIG_FW_LOADER_USER_HELPER
-struct firmware_priv {
+struct fw_sysfs {
        bool nowait;
        struct device dev;
-        struct firmware_buf *buf;
+        struct fw_priv *fw_priv;
        struct firmware *fw;
 };
-static struct firmware_priv *to_firmware_priv(struct device *dev)
+static struct fw_sysfs *to_fw_sysfs(struct device *dev)
 {
-        return container_of(dev, struct firmware_priv, dev);
+        return container_of(dev, struct fw_sysfs, dev);
 }
-static void __fw_load_abort(struct firmware_buf *buf)
+static void __fw_load_abort(struct fw_priv *fw_priv)
 {
        /*
         * There is a small window in which user can write to 'loading'
         * between loading done and disappearance of 'loading'
         */
-        if (fw_state_is_done(&buf->fw_st))
+        if (fw_sysfs_done(fw_priv))
                return;
-        list_del_init(&buf->pending_list);
+        list_del_init(&fw_priv->pending_list);
-        fw_state_aborted(&buf->fw_st);
+        fw_state_aborted(fw_priv);
 }
-static void fw_load_abort(struct firmware_priv *fw_priv)
+static void fw_load_abort(struct fw_sysfs *fw_sysfs)
 {
-        struct firmware_buf *buf = fw_priv->buf;
+        struct fw_priv *fw_priv = fw_sysfs->fw_priv;
-        __fw_load_abort(buf);
+        __fw_load_abort(fw_priv);
 }
 static LIST_HEAD(pending_fw_head);
 static void kill_pending_fw_fallback_reqs(bool only_kill_custom)
 {
-        struct firmware_buf *buf;
+        struct fw_priv *fw_priv;
-        struct firmware_buf *next;
+        struct fw_priv *next;
        mutex_lock(&fw_lock);
-        list_for_each_entry_safe(buf, next, &pending_fw_head, pending_list) {
+        list_for_each_entry_safe(fw_priv, next, &pending_fw_head,
-                if (!buf->need_uevent || !only_kill_custom)
+                                 pending_list) {
-                         __fw_load_abort(buf);
+                if (!fw_priv->need_uevent || !only_kill_custom)
+                         __fw_load_abort(fw_priv);
        }
        mutex_unlock(&fw_lock);
 }
@@ -651,18 +677,18 @@ ATTRIBUTE_GROUPS(firmware_class);
 static void fw_dev_release(struct device *dev)
 {
-        struct firmware_priv *fw_priv = to_firmware_priv(dev);
+        struct fw_sysfs *fw_sysfs = to_fw_sysfs(dev);
-        kfree(fw_priv);
+        kfree(fw_sysfs);
 }
-static int do_firmware_uevent(struct firmware_priv *fw_priv, struct kobj_uevent_env *env)
+static int do_firmware_uevent(struct fw_sysfs *fw_sysfs, struct kobj_uevent_env *env)
 {
-        if (add_uevent_var(env, "FIRMWARE=%s", fw_priv->buf->fw_id))
+        if (add_uevent_var(env, "FIRMWARE=%s", fw_sysfs->fw_priv->fw_name))
                return -ENOMEM;
        if (add_uevent_var(env, "TIMEOUT=%i", loading_timeout))
                return -ENOMEM;
-        if (add_uevent_var(env, "ASYNC=%d", fw_priv->nowait))
+        if (add_uevent_var(env, "ASYNC=%d", fw_sysfs->nowait))
                return -ENOMEM;
        return 0;
@@ -670,12 +696,12 @@ static int do_firmware_uevent(struct firmware_priv *fw_priv, struct kobj_uevent_
 static int firmware_uevent(struct device *dev, struct kobj_uevent_env *env)
 {
-        struct firmware_priv *fw_priv = to_firmware_priv(dev);
+        struct fw_sysfs *fw_sysfs = to_fw_sysfs(dev);
        int err = 0;
        mutex_lock(&fw_lock);
-        if (fw_priv->buf)
+        if (fw_sysfs->fw_priv)
-                err = do_firmware_uevent(fw_priv, env);
+                err = do_firmware_uevent(fw_sysfs, env);
        mutex_unlock(&fw_lock);
        return err;
 }
@@ -687,15 +713,25 @@ static struct class firmware_class = {
        .dev_release    = fw_dev_release,
 };
+static inline int register_sysfs_loader(void)
+{
+        return class_register(&firmware_class);
+}
+static inline void unregister_sysfs_loader(void)
+{
+        class_unregister(&firmware_class);
+}
 static ssize_t firmware_loading_show(struct device *dev,
                                     struct device_attribute *attr, char *buf)
 {
-        struct firmware_priv *fw_priv = to_firmware_priv(dev);
+        struct fw_sysfs *fw_sysfs = to_fw_sysfs(dev);
        int loading = 0;
        mutex_lock(&fw_lock);
-        if (fw_priv->buf)
+        if (fw_sysfs->fw_priv)
-                loading = fw_state_is_loading(&fw_priv->buf->fw_st);
+                loading = fw_sysfs_loading(fw_sysfs->fw_priv);
        mutex_unlock(&fw_lock);
        return sprintf(buf, "%d\n", loading);
@@ -707,14 +743,15 @@ static ssize_t firmware_loading_show(struct device *dev,
 #endif
 /* one pages buffer should be mapped/unmapped only once */
-static int fw_map_pages_buf(struct firmware_buf *buf)
+static int map_fw_priv_pages(struct fw_priv *fw_priv)
 {
-        if (!buf->is_paged_buf)
+        if (!fw_priv->is_paged_buf)
                return 0;
-        vunmap(buf->data);
+        vunmap(fw_priv->data);
-        buf->data = vmap(buf->pages, buf->nr_pages, 0, PAGE_KERNEL_RO);
+        fw_priv->data = vmap(fw_priv->pages, fw_priv->nr_pages, 0,
-        if (!buf->data)
+                             PAGE_KERNEL_RO);
+        if (!fw_priv->data)
                return -ENOMEM;
        return 0;
 }
@@ -736,32 +773,32 @@ static ssize_t firmware_loading_store(struct device *dev,
                                      struct device_attribute *attr,
                                      const char *buf, size_t count)
 {
-        struct firmware_priv *fw_priv = to_firmware_priv(dev);
+        struct fw_sysfs *fw_sysfs = to_fw_sysfs(dev);
-        struct firmware_buf *fw_buf;
+        struct fw_priv *fw_priv;
        ssize_t written = count;
        int loading = simple_strtol(buf, NULL, 10);
        int i;
        mutex_lock(&fw_lock);
-        fw_buf = fw_priv->buf;
+        fw_priv = fw_sysfs->fw_priv;
-        if (fw_state_is_aborted(&fw_buf->fw_st))
+        if (fw_state_is_aborted(fw_priv))
                goto out;
        switch (loading) {
        case 1:
                /* discarding any previous partial load */
-                if (!fw_state_is_done(&fw_buf->fw_st)) {
+                if (!fw_sysfs_done(fw_priv)) {
-                        for (i = 0; i < fw_buf->nr_pages; i++)
+                        for (i = 0; i < fw_priv->nr_pages; i++)
-                                __free_page(fw_buf->pages[i]);
+                                __free_page(fw_priv->pages[i]);
-                        vfree(fw_buf->pages);
+                        vfree(fw_priv->pages);
-                        fw_buf->pages = NULL;
+                        fw_priv->pages = NULL;
-                        fw_buf->page_array_size = 0;
+                        fw_priv->page_array_size = 0;
-                        fw_buf->nr_pages = 0;
+                        fw_priv->nr_pages = 0;
-                        fw_state_start(&fw_buf->fw_st);
+                        fw_state_start(fw_priv);
                }
                break;
        case 0:
-                if (fw_state_is_loading(&fw_buf->fw_st)) {
+                if (fw_sysfs_loading(fw_priv)) {
                        int rc;
                        /*
@@ -770,25 +807,25 @@ static ssize_t firmware_loading_store(struct device *dev,
                         * see the mapped 'buf->data' once the loading
                         * is completed.
                         * */
-                        rc = fw_map_pages_buf(fw_buf);
+                        rc = map_fw_priv_pages(fw_priv);
                        if (rc)
                                dev_err(dev, "%s: map pages failed\n",
                                        __func__);
                        else
                                rc = security_kernel_post_read_file(NULL,
-                                                fw_buf->data, fw_buf->size,
+                                                fw_priv->data, fw_priv->size,
                                                READING_FIRMWARE);
                        /*
                         * Same logic as fw_load_abort, only the DONE bit
                         * is ignored and we set ABORT only on failure.
                         */
-                        list_del_init(&fw_buf->pending_list);
+                        list_del_init(&fw_priv->pending_list);
                        if (rc) {
-                                fw_state_aborted(&fw_buf->fw_st);
+                                fw_state_aborted(fw_priv);
                                written = rc;
                        } else {
-                                fw_state_done(&fw_buf->fw_st);
+                                fw_state_done(fw_priv);
                        }
                        break;
                }
@@ -797,7 +834,7 @@ static ssize_t firmware_loading_store(struct device *dev,
                dev_err(dev, "%s: unexpected value (%d)\n", __func__, loading);
                /* fallthrough */
        case -1:
-                fw_load_abort(fw_priv);
+                fw_load_abort(fw_sysfs);
                break;
        }
 out:
@@ -807,16 +844,16 @@ out:
 static DEVICE_ATTR(loading, 0644, firmware_loading_show, firmware_loading_store);
-static void firmware_rw_buf(struct firmware_buf *buf, char *buffer,
+static void firmware_rw_data(struct fw_priv *fw_priv, char *buffer,
                           loff_t offset, size_t count, bool read)
 {
        if (read)
-                memcpy(buffer, buf->data + offset, count);
+                memcpy(buffer, fw_priv->data + offset, count);
        else
-                memcpy(buf->data + offset, buffer, count);
+                memcpy(fw_priv->data + offset, buffer, count);
 }
-static void firmware_rw(struct firmware_buf *buf, char *buffer,
+static void firmware_rw(struct fw_priv *fw_priv, char *buffer,
                        loff_t offset, size_t count, bool read)
 {
        while (count) {
@@ -825,14 +862,14 @@ static void firmware_rw(struct firmware_buf *buf, char *buffer,
                int page_ofs = offset & (PAGE_SIZE-1);
                int page_cnt = min_t(size_t, PAGE_SIZE - page_ofs, count);
-                page_data = kmap(buf->pages[page_nr]);
+                page_data = kmap(fw_priv->pages[page_nr]);
                if (read)
                        memcpy(buffer, page_data + page_ofs, page_cnt);
                else
                        memcpy(page_data + page_ofs, buffer, page_cnt);
-                kunmap(buf->pages[page_nr]);
+                kunmap(fw_priv->pages[page_nr]);
                buffer += page_cnt;
                offset += page_cnt;
                count -= page_cnt;
@@ -844,69 +881,69 @@ static ssize_t firmware_data_read(struct file *filp, struct kobject *kobj,
                                  char *buffer, loff_t offset, size_t count)
 {
        struct device *dev = kobj_to_dev(kobj);
-        struct firmware_priv *fw_priv = to_firmware_priv(dev);
+        struct fw_sysfs *fw_sysfs = to_fw_sysfs(dev);
-        struct firmware_buf *buf;
+        struct fw_priv *fw_priv;
        ssize_t ret_count;
        mutex_lock(&fw_lock);
-        buf = fw_priv->buf;
+        fw_priv = fw_sysfs->fw_priv;
-        if (!buf || fw_state_is_done(&buf->fw_st)) {
+        if (!fw_priv || fw_sysfs_done(fw_priv)) {
                ret_count = -ENODEV;
                goto out;
        }
-        if (offset > buf->size) {
+        if (offset > fw_priv->size) {
                ret_count = 0;
                goto out;
        }
-        if (count > buf->size - offset)
+        if (count > fw_priv->size - offset)
-                count = buf->size - offset;
+                count = fw_priv->size - offset;
        ret_count = count;
-        if (buf->data)
+        if (fw_priv->data)
-                firmware_rw_buf(buf, buffer, offset, count, true);
+                firmware_rw_data(fw_priv, buffer, offset, count, true);
        else
-                firmware_rw(buf, buffer, offset, count, true);
+                firmware_rw(fw_priv, buffer, offset, count, true);
 out:
        mutex_unlock(&fw_lock);
        return ret_count;
 }
-static int fw_realloc_buffer(struct firmware_priv *fw_priv, int min_size)
+static int fw_realloc_pages(struct fw_sysfs *fw_sysfs, int min_size)
 {
-        struct firmware_buf *buf = fw_priv->buf;
+        struct fw_priv *fw_priv= fw_sysfs->fw_priv;
        int pages_needed = PAGE_ALIGN(min_size) >> PAGE_SHIFT;
        /* If the array of pages is too small, grow it... */
-        if (buf->page_array_size < pages_needed) {
+        if (fw_priv->page_array_size < pages_needed) {
                int new_array_size = max(pages_needed,
-                                         buf->page_array_size * 2);
+                                         fw_priv->page_array_size * 2);
                struct page **new_pages;
                new_pages = vmalloc(new_array_size * sizeof(void *));
                if (!new_pages) {
-                        fw_load_abort(fw_priv);
+                        fw_load_abort(fw_sysfs);
                        return -ENOMEM;
                }
-                memcpy(new_pages, buf->pages,
+                memcpy(new_pages, fw_priv->pages,
-                       buf->page_array_size * sizeof(void *));
+                       fw_priv->page_array_size * sizeof(void *));
-                memset(&new_pages[buf->page_array_size], 0, sizeof(void *) *
+                memset(&new_pages[fw_priv->page_array_size], 0, sizeof(void *) *
-                       (new_array_size - buf->page_array_size));
+                       (new_array_size - fw_priv->page_array_size));
-                vfree(buf->pages);
+                vfree(fw_priv->pages);
-                buf->pages = new_pages;
+                fw_priv->pages = new_pages;
-                buf->page_array_size = new_array_size;
+                fw_priv->page_array_size = new_array_size;
        }
-        while (buf->nr_pages < pages_needed) {
+        while (fw_priv->nr_pages < pages_needed) {
-                buf->pages[buf->nr_pages] =
+                fw_priv->pages[fw_priv->nr_pages] =
                        alloc_page(GFP_KERNEL | __GFP_HIGHMEM);
-                if (!buf->pages[buf->nr_pages]) {
+                if (!fw_priv->pages[fw_priv->nr_pages]) {
-                        fw_load_abort(fw_priv);
+                        fw_load_abort(fw_sysfs);
                        return -ENOMEM;
                }
-                buf->nr_pages++;
+                fw_priv->nr_pages++;
        }
        return 0;
 }
@@ -928,37 +965,37 @@ static ssize_t firmware_data_write(struct file *filp, struct kobject *kobj,
                                   char *buffer, loff_t offset, size_t count)
 {
        struct device *dev = kobj_to_dev(kobj);
-        struct firmware_priv *fw_priv = to_firmware_priv(dev);
+        struct fw_sysfs *fw_sysfs = to_fw_sysfs(dev);
-        struct firmware_buf *buf;
+        struct fw_priv *fw_priv;
        ssize_t retval;
        if (!capable(CAP_SYS_RAWIO))
                return -EPERM;
        mutex_lock(&fw_lock);
-        buf = fw_priv->buf;
+        fw_priv = fw_sysfs->fw_priv;
-        if (!buf || fw_state_is_done(&buf->fw_st)) {
+        if (!fw_priv || fw_sysfs_done(fw_priv)) {
                retval = -ENODEV;
                goto out;
        }
-        if (buf->data) {
+        if (fw_priv->data) {
-                if (offset + count > buf->allocated_size) {
+                if (offset + count > fw_priv->allocated_size) {
                        retval = -ENOMEM;
                        goto out;
                }
-                firmware_rw_buf(buf, buffer, offset, count, false);
+                firmware_rw_data(fw_priv, buffer, offset, count, false);
                retval = count;
        } else {
-                retval = fw_realloc_buffer(fw_priv, offset + count);
+                retval = fw_realloc_pages(fw_sysfs, offset + count);
                if (retval)
                        goto out;
                retval = count;
-                firmware_rw(buf, buffer, offset, count, false);
+                firmware_rw(fw_priv, buffer, offset, count, false);
        }
-        buf->size = max_t(size_t, offset + count, buf->size);
+        fw_priv->size = max_t(size_t, offset + count, fw_priv->size);
 out:
        mutex_unlock(&fw_lock);
        return retval;
@@ -991,22 +1028,22 @@ static const struct attribute_group *fw_dev_attr_groups[] = {
        NULL
 };
-static struct firmware_priv *
+static struct fw_sysfs *
 fw_create_instance(struct firmware *firmware, const char *fw_name,
                   struct device *device, unsigned int opt_flags)
 {
-        struct firmware_priv *fw_priv;
+        struct fw_sysfs *fw_sysfs;
        struct device *f_dev;
-        fw_priv = kzalloc(sizeof(*fw_priv), GFP_KERNEL);
+        fw_sysfs = kzalloc(sizeof(*fw_sysfs), GFP_KERNEL);
-        if (!fw_priv) {
+        if (!fw_sysfs) {
-                fw_priv = ERR_PTR(-ENOMEM);
+                fw_sysfs = ERR_PTR(-ENOMEM);
                goto exit;
        }
-        fw_priv->nowait = !!(opt_flags & FW_OPT_NOWAIT);
+        fw_sysfs->nowait = !!(opt_flags & FW_OPT_NOWAIT);
-        fw_priv->fw = firmware;
+        fw_sysfs->fw = firmware;
-        f_dev = &fw_priv->dev;
+        f_dev = &fw_sysfs->dev;
        device_initialize(f_dev);
        dev_set_name(f_dev, "%s", fw_name);
@@ -1014,20 +1051,20 @@ fw_create_instance(struct firmware *firmware, const char *fw_name,
        f_dev->class = &firmware_class;
        f_dev->groups = fw_dev_attr_groups;
 exit:
-        return fw_priv;
+        return fw_sysfs;
 }
 /* load a firmware via user helper */
-static int _request_firmware_load(struct firmware_priv *fw_priv,
+static int _request_firmware_load(struct fw_sysfs *fw_sysfs,
                                  unsigned int opt_flags, long timeout)
 {
        int retval = 0;
-        struct device *f_dev = &fw_priv->dev;
+        struct device *f_dev = &fw_sysfs->dev;
-        struct firmware_buf *buf = fw_priv->buf;
+        struct fw_priv *fw_priv = fw_sysfs->fw_priv;
        /* fall back on userspace loading */
-        if (!buf->data)
+        if (!fw_priv->data)
-                buf->is_paged_buf = true;
+                fw_priv->is_paged_buf = true;
        dev_set_uevent_suppress(f_dev, true);
@@ -1038,31 +1075,31 @@ static int _request_firmware_load(struct firmware_priv *fw_priv,
        }
        mutex_lock(&fw_lock);
-        list_add(&buf->pending_list, &pending_fw_head);
+        list_add(&fw_priv->pending_list, &pending_fw_head);
        mutex_unlock(&fw_lock);
        if (opt_flags & FW_OPT_UEVENT) {
-                buf->need_uevent = true;
+                fw_priv->need_uevent = true;
                dev_set_uevent_suppress(f_dev, false);
-                dev_dbg(f_dev, "firmware: requesting %s\n", buf->fw_id);
+                dev_dbg(f_dev, "firmware: requesting %s\n", fw_priv->fw_name);
-                kobject_uevent(&fw_priv->dev.kobj, KOBJ_ADD);
+                kobject_uevent(&fw_sysfs->dev.kobj, KOBJ_ADD);
        } else {
                timeout = MAX_JIFFY_OFFSET;
        }
-        retval = fw_state_wait_timeout(&buf->fw_st, timeout);
+        retval = fw_sysfs_wait_timeout(fw_priv, timeout);
        if (retval < 0) {
                mutex_lock(&fw_lock);
-                fw_load_abort(fw_priv);
+                fw_load_abort(fw_sysfs);
                mutex_unlock(&fw_lock);
        }
-        if (fw_state_is_aborted(&buf->fw_st)) {
+        if (fw_state_is_aborted(fw_priv)) {
                if (retval == -ERESTARTSYS)
                        retval = -EINTR;
                else
                        retval = -EAGAIN;
-        } else if (buf->is_paged_buf && !buf->data)
+        } else if (fw_priv->is_paged_buf && !fw_priv->data)
                retval = -ENOMEM;
        device_del(f_dev);
@@ -1075,7 +1112,7 @@ static int fw_load_from_user_helper(struct firmware *firmware,
                                    const char *name, struct device *device,
                                    unsigned int opt_flags)
 {
-        struct firmware_priv *fw_priv;
+        struct fw_sysfs *fw_sysfs;
        long timeout;
        int ret;
@@ -1096,17 +1133,17 @@ static int fw_load_from_user_helper(struct firmware *firmware,
                }
        }
-        fw_priv = fw_create_instance(firmware, name, device, opt_flags);
+        fw_sysfs = fw_create_instance(firmware, name, device, opt_flags);
-        if (IS_ERR(fw_priv)) {
+        if (IS_ERR(fw_sysfs)) {
-                ret = PTR_ERR(fw_priv);
+                ret = PTR_ERR(fw_sysfs);
                goto out_unlock;
        }
-        fw_priv->buf = firmware->priv;
+        fw_sysfs->fw_priv = firmware->priv;
-        ret = _request_firmware_load(fw_priv, opt_flags, timeout);
+        ret = _request_firmware_load(fw_sysfs, opt_flags, timeout);
        if (!ret)
-                ret = assign_firmware_buf(firmware, device, opt_flags);
+                ret = assign_fw(firmware, device, opt_flags);
 out_unlock:
        usermodehelper_read_unlock();
@@ -1114,16 +1151,60 @@ out_unlock:
        return ret;
 }
+#ifdef CONFIG_FW_LOADER_USER_HELPER_FALLBACK
+static bool fw_force_sysfs_fallback(unsigned int opt_flags)
+{
+        return true;
+}
+#else
+static bool fw_force_sysfs_fallback(unsigned int opt_flags)
+{
+        if (!(opt_flags & FW_OPT_USERHELPER))
+                return false;
+        return true;
+}
+#endif
+static bool fw_run_sysfs_fallback(unsigned int opt_flags)
+{
+        if ((opt_flags & FW_OPT_NOFALLBACK))
+                return false;
+        return fw_force_sysfs_fallback(opt_flags);
+}
+static int fw_sysfs_fallback(struct firmware *fw, const char *name,
+                            struct device *device,
+                            unsigned int opt_flags,
+                            int ret)
+{
+        if (!fw_run_sysfs_fallback(opt_flags))
+                return ret;
+        dev_warn(device, "Falling back to user helper\n");
+        return fw_load_from_user_helper(fw, name, device, opt_flags);
+}
 #else /* CONFIG_FW_LOADER_USER_HELPER */
-static inline int
+static int fw_sysfs_fallback(struct firmware *fw, const char *name,
-fw_load_from_user_helper(struct firmware *firmware, const char *name,
+                             struct device *device,
-                         struct device *device, unsigned int opt_flags)
+                             unsigned int opt_flags,
+                             int ret)
 {
-        return -ENOENT;
+        /* Keep carrying over the same error */
+        return ret;
 }
 static inline void kill_pending_fw_fallback_reqs(bool only_kill_custom) { }
+static inline int register_sysfs_loader(void)
+{
+        return 0;
+}
+static inline void unregister_sysfs_loader(void)
+{
+}
 #endif /* CONFIG_FW_LOADER_USER_HELPER */
 /* prepare firmware and firmware_buf structs;
@@ -1135,7 +1216,7 @@ _request_firmware_prepare(struct firmware **firmware_p, const char *name,
                          struct device *device, void *dbuf, size_t size)
 {
        struct firmware *firmware;
-        struct firmware_buf *buf;
+        struct fw_priv *fw_priv;
        int ret;
        *firmware_p = firmware = kzalloc(sizeof(*firmware), GFP_KERNEL);
@@ -1150,18 +1231,18 @@ _request_firmware_prepare(struct firmware **firmware_p, const char *name,
                return 0; /* assigned */
        }
-        ret = fw_lookup_and_allocate_buf(name, &fw_cache, &buf, dbuf, size);
+        ret = alloc_lookup_fw_priv(name, &fw_cache, &fw_priv, dbuf, size);
        /*
-         * bind with 'buf' now to avoid warning in failure path
+         * bind with 'priv' now to avoid warning in failure path
         * of requesting firmware.
         */
-        firmware->priv = buf;
+        firmware->priv = fw_priv;
        if (ret > 0) {
-                ret = fw_state_wait(&buf->fw_st);
+                ret = fw_state_wait(fw_priv);
                if (!ret) {
-                        fw_set_page_data(buf, firmware);
+                        fw_set_page_data(fw_priv, firmware);
                        return 0; /* assigned */
                }
        }
@@ -1177,20 +1258,20 @@ _request_firmware_prepare(struct firmware **firmware_p, const char *name,
 * released until the last user calls release_firmware().
 *
 * Failed batched requests are possible as well, in such cases we just share
- * the struct firmware_buf and won't release it until all requests are woken
+ * the struct fw_priv and won't release it until all requests are woken
 * and have gone through this same path.
 */
 static void fw_abort_batch_reqs(struct firmware *fw)
 {
-        struct firmware_buf *buf;
+        struct fw_priv *fw_priv;
        /* Loaded directly? */
        if (!fw || !fw->priv)
                return;
-        buf = fw->priv;
+        fw_priv = fw->priv;
-        if (!fw_state_is_aborted(&buf->fw_st))
+        if (!fw_state_is_aborted(fw_priv))
-                fw_state_aborted(&buf->fw_st);
+                fw_state_aborted(fw_priv);
 }
 /* called from request_firmware() and request_firmware_work_func() */
@@ -1220,13 +1301,9 @@ _request_firmware(const struct firmware **firmware_p, const char *name,
                        dev_warn(device,
                                 "Direct firmware load for %s failed with error %d\n",
                                 name, ret);
-                if (opt_flags & FW_OPT_USERHELPER) {
+                ret = fw_sysfs_fallback(fw, name, device, opt_flags, ret);
-                        dev_warn(device, "Falling back to user helper\n");
-                        ret = fw_load_from_user_helper(fw, name, device,
-                                                       opt_flags);
-                }
        } else
-                ret = assign_firmware_buf(fw, device, opt_flags);
+                ret = assign_fw(fw, device, opt_flags);
 out:
        if (ret < 0) {
@@ -1268,7 +1345,7 @@ request_firmware(const struct firmware **firmware_p, const char *name,
        /* Need to pin this module until return */
        __module_get(THIS_MODULE);
        ret = _request_firmware(firmware_p, name, device, NULL, 0,
-                                FW_OPT_UEVENT | FW_OPT_FALLBACK);
+                                FW_OPT_UEVENT);
        module_put(THIS_MODULE);
        return ret;
 }
@@ -1292,7 +1369,8 @@ int request_firmware_direct(const struct firmware **firmware_p,
        __module_get(THIS_MODULE);
        ret = _request_firmware(firmware_p, name, device, NULL, 0,
-                                FW_OPT_UEVENT | FW_OPT_NO_WARN);
+                                FW_OPT_UEVENT | FW_OPT_NO_WARN |
+                                FW_OPT_NOFALLBACK);
        module_put(THIS_MODULE);
        return ret;
 }
@@ -1321,8 +1399,7 @@ request_firmware_into_buf(const struct firmware **firmware_p, const char *name,
        __module_get(THIS_MODULE);
        ret = _request_firmware(firmware_p, name, device, buf, size,
-                                FW_OPT_UEVENT | FW_OPT_FALLBACK |
+                                FW_OPT_UEVENT | FW_OPT_NOCACHE);
-                                FW_OPT_NOCACHE);
        module_put(THIS_MODULE);
        return ret;
 }
@@ -1414,7 +1491,7 @@ request_firmware_nowait(
        fw_work->device = device;
        fw_work->context = context;
        fw_work->cont = cont;
-        fw_work->opt_flags = FW_OPT_NOWAIT | FW_OPT_FALLBACK |
+        fw_work->opt_flags = FW_OPT_NOWAIT |
                (uevent ? FW_OPT_UEVENT : FW_OPT_USERHELPER);
        if (!try_module_get(module)) {
@@ -1463,13 +1540,13 @@ static int cache_firmware(const char *fw_name)
        return ret;
 }
-static struct firmware_buf *fw_lookup_buf(const char *fw_name)
+static struct fw_priv *lookup_fw_priv(const char *fw_name)
 {
-        struct firmware_buf *tmp;
+        struct fw_priv *tmp;
        struct firmware_cache *fwc = &fw_cache;
        spin_lock(&fwc->lock);
-        tmp = __fw_lookup_buf(fw_name);
+        tmp = __lookup_fw_priv(fw_name);
        spin_unlock(&fwc->lock);
        return tmp;
@@ -1488,7 +1565,7 @@ static struct firmware_buf *fw_lookup_buf(const char *fw_name)
 */
 static int uncache_firmware(const char *fw_name)
 {
-        struct firmware_buf *buf;
+        struct fw_priv *fw_priv;
        struct firmware fw;
        pr_debug("%s: %s\n", __func__, fw_name);
@@ -1496,9 +1573,9 @@ static int uncache_firmware(const char *fw_name)
        if (fw_get_builtin_firmware(&fw, fw_name, NULL, 0))
                return 0;
-        buf = fw_lookup_buf(fw_name);
+        fw_priv = lookup_fw_priv(fw_name);
-        if (buf) {
+        if (fw_priv) {
-                fw_free_buf(buf);
+                free_fw_priv(fw_priv);
                return 0;
        }
@@ -1767,20 +1844,11 @@ static int fw_suspend(void)
 static struct syscore_ops fw_syscore_ops = {
        .suspend = fw_suspend,
 };
-#else
-static int fw_cache_piggyback_on_request(const char *name)
-{
-        return 0;
-}
-#endif
-static void __init fw_cache_init(void)
+static int __init register_fw_pm_ops(void)
 {
-        spin_lock_init(&fw_cache.lock);
+        int ret;
-        INIT_LIST_HEAD(&fw_cache.head);
-        fw_cache.state = FW_LOADER_NO_CACHE;
-#ifdef CONFIG_PM_SLEEP
        spin_lock_init(&fw_cache.name_lock);
        INIT_LIST_HEAD(&fw_cache.fw_names);
@@ -1788,10 +1856,39 @@ static void __init fw_cache_init(void)
                          device_uncache_fw_images_work);
        fw_cache.pm_notify.notifier_call = fw_pm_notify;
-        register_pm_notifier(&fw_cache.pm_notify);
+        ret = register_pm_notifier(&fw_cache.pm_notify);
+        if (ret)
+                return ret;
        register_syscore_ops(&fw_syscore_ops);
+        return ret;
+}
+static inline void unregister_fw_pm_ops(void)
+{
+        unregister_syscore_ops(&fw_syscore_ops);
+        unregister_pm_notifier(&fw_cache.pm_notify);
+}
+#else
+static int fw_cache_piggyback_on_request(const char *name)
+{
+        return 0;
+}
+static inline int register_fw_pm_ops(void)
+{
+        return 0;
+}
+static inline void unregister_fw_pm_ops(void)
+{
+}
 #endif
+static void __init fw_cache_init(void)
+{
+        spin_lock_init(&fw_cache.lock);
+        INIT_LIST_HEAD(&fw_cache.head);
+        fw_cache.state = FW_LOADER_NO_CACHE;
 }
 static int fw_shutdown_notify(struct notifier_block *unused1,
@@ -1812,25 +1909,31 @@ static struct notifier_block fw_shutdown_nb = {
 static int __init firmware_class_init(void)
 {
+        int ret;
+        /* No need to unfold these on exit */
        fw_cache_init();
-        register_reboot_notifier(&fw_shutdown_nb);
-#ifdef CONFIG_FW_LOADER_USER_HELPER
+        ret = register_fw_pm_ops();
-        return class_register(&firmware_class);
+        if (ret)
-#else
+                return ret;
-        return 0;
-#endif
+        ret = register_reboot_notifier(&fw_shutdown_nb);
+        if (ret)
+                goto out;
+        return register_sysfs_loader();
+out:
+        unregister_fw_pm_ops();
+        return ret;
 }
 static void __exit firmware_class_exit(void)
 {
-#ifdef CONFIG_PM_SLEEP
+        unregister_fw_pm_ops();
-        unregister_syscore_ops(&fw_syscore_ops);
-        unregister_pm_notifier(&fw_cache.pm_notify);
-#endif
        unregister_reboot_notifier(&fw_shutdown_nb);
-#ifdef CONFIG_FW_LOADER_USER_HELPER
+        unregister_sysfs_loader();
-        class_unregister(&firmware_class);
-#endif
 }
 fs_initcall(firmware_class_init);
diff --git a/drivers/base/hypervisor.c b/drivers/base/hypervisor.c
index 4f8b741f4615..1ce59b4b53ce 100644
--- a/drivers/base/hypervisor.c
+++ b/drivers/base/hypervisor.c
@@ -1,11 +1,10 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
 * hypervisor.c - /sys/hypervisor subsystem.
 *
 * Copyright (C) IBM Corp. 2006
 * Copyright (C) 2007 Greg Kroah-Hartman <gregkh@suse.de>
 * Copyright (C) 2007 Novell Inc.
- *
- * This file is released under the GPLv2
 */
 #include <linux/kobject.h>
diff --git a/drivers/base/init.c b/drivers/base/init.c
index 48c0e220acc0..dd85b05a6a16 100644
--- a/drivers/base/init.c
+++ b/drivers/base/init.c
@@ -1,8 +1,7 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
 * Copyright (c) 2002-3 Patrick Mochel
 * Copyright (c) 2002-3 Open Source Development Labs
- *
- * This file is released under the GPLv2
 */
 #include <linux/device.h>
diff --git a/drivers/base/isa.c b/drivers/base/isa.c
index 372d10af2600..2772f5d1948a 100644
--- a/drivers/base/isa.c
+++ b/drivers/base/isa.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
 * ISA bus.
 */
diff --git a/drivers/base/map.c b/drivers/base/map.c
index c1d38234d725..5650ab2b247a 100644
--- a/drivers/base/map.c
+++ b/drivers/base/map.c
@@ -1,8 +1,8 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
 *  linux/drivers/base/map.c
 *
 * (C) Copyright Al Viro 2002,2003
- *      Released under GPL v2.
 *
 * NOTE: data structure needs to be changed.  It works, but for large dev_t
 * it will be too slow.  It is isolated, though, so these changes will be
diff --git a/drivers/base/module.c b/drivers/base/module.c
index 2a215780eda2..46ad4d636731 100644
--- a/drivers/base/module.c
+++ b/drivers/base/module.c
@@ -1,8 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
 * module.c - module sysfs fun for drivers
- *
- * This file is released under the GPLv2
- *
 */
 #include <linux/device.h>
 #include <linux/module.h>
diff --git a/drivers/base/pinctrl.c b/drivers/base/pinctrl.c
index eb929dd6ef1e..c22864458511 100644
--- a/drivers/base/pinctrl.c
+++ b/drivers/base/pinctrl.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
 * Driver core interface to the pinctrl subsystem.
 *
@@ -6,8 +7,6 @@
 * Based on bits of regulator core, gpio core and clk core
 *
 * Author: Linus Walleij <linus.walleij@linaro.org>
- *
- * License terms: GNU General Public License (GPL) version 2
 */
 #include <linux/device.h>
diff --git a/drivers/base/platform-msi.c b/drivers/base/platform-msi.c
index e5473525e7b2..8e22073aeeed 100644
--- a/drivers/base/platform-msi.c
+++ b/drivers/base/platform-msi.c
@@ -1,20 +1,9 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
 * MSI framework for platform devices
 *
 * Copyright (C) 2015 ARM Limited, All Rights Reserved.
 * Author: Marc Zyngier <marc.zyngier@arm.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include <linux/device.h>
diff --git a/drivers/base/platform.c b/drivers/base/platform.c
index c203fb90c1a0..f1bf7b38d91c 100644
--- a/drivers/base/platform.c
+++ b/drivers/base/platform.c
@@ -1,11 +1,10 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
 * platform.c - platform 'pseudo' bus for legacy devices
 *
 * Copyright (c) 2002-3 Patrick Mochel
 * Copyright (c) 2002-3 Open Source Development Labs
 *
- * This file is released under the GPLv2
- *
 * Please see Documentation/driver-model/platform.txt for more
 * information.
 */
diff --git a/drivers/base/property.c b/drivers/base/property.c
index 96aa71c93daf..302236281d83 100644
--- a/drivers/base/property.c
+++ b/drivers/base/property.c
@@ -1,13 +1,10 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
 * property.c - Unified device property interface.
 *
 * Copyright (C) 2014, Intel Corporation
 * Authors: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
 *          Mika Westerberg <mika.westerberg@linux.intel.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
 */
 #include <linux/acpi.h>
@@ -699,6 +696,23 @@ int fwnode_property_get_reference_args(const struct fwnode_handle *fwnode,
 }
 EXPORT_SYMBOL_GPL(fwnode_property_get_reference_args);
+static void property_entry_free_data(const struct property_entry *p)
+{
+        size_t i, nval;
+        if (p->is_array) {
+                if (p->is_string && p->pointer.str) {
+                        nval = p->length / sizeof(const char *);
+                        for (i = 0; i < nval; i++)
+                                kfree(p->pointer.str[i]);
+                }
+                kfree(p->pointer.raw_data);
+        } else if (p->is_string) {
+                kfree(p->value.str);
+        }
+        kfree(p->name);
+}
 static int property_copy_string_array(struct property_entry *dst,
                                      const struct property_entry *src)
 {
@@ -729,34 +743,24 @@ static int property_entry_copy_data(struct property_entry *dst,
 {
        int error;
-        dst->name = kstrdup(src->name, GFP_KERNEL);
-        if (!dst->name)
-                return -ENOMEM;
        if (src->is_array) {
-                if (!src->length) {
+                if (!src->length)
-                        error = -ENODATA;
+                        return -ENODATA;
-                        goto out_free_name;
-                }
                if (src->is_string) {
                        error = property_copy_string_array(dst, src);
                        if (error)
-                                goto out_free_name;
+                                return error;
                } else {
                        dst->pointer.raw_data = kmemdup(src->pointer.raw_data,
                                                        src->length, GFP_KERNEL);
-                        if (!dst->pointer.raw_data) {
+                        if (!dst->pointer.raw_data)
-                                error = -ENOMEM;
+                                return -ENOMEM;
-                                goto out_free_name;
-                        }
                }
        } else if (src->is_string) {
                dst->value.str = kstrdup(src->value.str, GFP_KERNEL);
-                if (!dst->value.str && src->value.str) {
+                if (!dst->value.str && src->value.str)
-                        error = -ENOMEM;
+                        return -ENOMEM;
-                        goto out_free_name;
-                }
        } else {
                dst->value.raw_data = src->value.raw_data;
        }
@@ -765,28 +769,15 @@ static int property_entry_copy_data(struct property_entry *dst,
        dst->is_array = src->is_array;
        dst->is_string = src->is_string;
-        return 0;
+        dst->name = kstrdup(src->name, GFP_KERNEL);
+        if (!dst->name)
-out_free_name:
+                goto out_free_data;
-        kfree(dst->name);
-        return error;
-}
-static void property_entry_free_data(const struct property_entry *p)
+        return 0;
-{
-        size_t i, nval;
-        if (p->is_array) {
+out_free_data:
-                if (p->is_string && p->pointer.str) {
+        property_entry_free_data(dst);
-                        nval = p->length / sizeof(const char *);
+        return -ENOMEM;
-                        for (i = 0; i < nval; i++)
-                                kfree(p->pointer.str[i]);
-                }
-                kfree(p->pointer.raw_data);
-        } else if (p->is_string) {
-                kfree(p->value.str);
-        }
-        kfree(p->name);
 }
 /**
diff --git a/drivers/base/soc.c b/drivers/base/soc.c
index 909dedae4c4e..4e80f48ad5d6 100644
--- a/drivers/base/soc.c
+++ b/drivers/base/soc.c
@@ -1,8 +1,8 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
 * Copyright (C) ST-Ericsson SA 2011
 *
 * Author: Lee Jones <lee.jones@linaro.org> for ST-Ericsson.
- * License terms:  GNU General Public License (GPL), version 2
 */
 #include <linux/sysfs.h>
diff --git a/drivers/base/syscore.c b/drivers/base/syscore.c
index 8d98a329f6ea..6e076f359dcc 100644
--- a/drivers/base/syscore.c
+++ b/drivers/base/syscore.c
@@ -1,9 +1,8 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
 *  syscore.c - Execution of system core operations.
 *
 *  Copyright (C) 2011 Rafael J. Wysocki <rjw@sisk.pl>, Novell Inc.
- *
- *  This file is released under the GPLv2.
 */
 #include <linux/syscore_ops.h>
diff --git a/drivers/base/test/test_async_driver_probe.c b/drivers/base/test/test_async_driver_probe.c
index a3355d66bc12..e7f145d662f0 100644
--- a/drivers/base/test/test_async_driver_probe.c
+++ b/drivers/base/test/test_async_driver_probe.c
@@ -1,14 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
 * Copyright (C) 2014 Google, Inc.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
 */
 #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
diff --git a/drivers/base/topology.c b/drivers/base/topology.c
index d936fcf9f1fb..5fd9f167ecc1 100644
--- a/drivers/base/topology.c
+++ b/drivers/base/topology.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
 * driver/base/topology.c - Populate sysfs with cpu topology information
 *
@@ -6,22 +7,6 @@
 * Copyright (C) 2006, Intel Corp.
 *
 * All rights reserved.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE, GOOD TITLE or
- * NON INFRINGEMENT.  See the GNU General Public License for more
- * details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- *
 */
 #include <linux/mm.h>
 #include <linux/cpu.h>
diff --git a/drivers/base/transport_class.c b/drivers/base/transport_class.c
index f6c453c3816e..5ed86ded6e6b 100644
--- a/drivers/base/transport_class.c
+++ b/drivers/base/transport_class.c
@@ -1,11 +1,10 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
 * transport_class.c - implementation of generic transport classes
 *                     using attribute_containers
 *
 * Copyright (c) 2005 - James Bottomley <James.Bottomley@steeleye.com>
 *
- * This file is licensed under GPLv2
- *
 * The basic idea here is to allow any "device controller" (which
 * would most often be a Host Bus Adapter to use the services of one
 * or more tranport classes for performing transport specific
diff --git a/drivers/char/ipmi/ipmi_msghandler.c b/drivers/char/ipmi/ipmi_msghandler.c
index 01fbffb3168e..e0b0d7e2d976 100644
--- a/drivers/char/ipmi/ipmi_msghandler.c
+++ b/drivers/char/ipmi/ipmi_msghandler.c
@@ -2588,7 +2588,7 @@ static ssize_t device_id_show(struct device *dev,
        return snprintf(buf, 10, "%u\n", id.device_id);
 }
-static DEVICE_ATTR(device_id, S_IRUGO, device_id_show, NULL);
+static DEVICE_ATTR_RO(device_id);
 static ssize_t provides_device_sdrs_show(struct device *dev,
                                         struct device_attribute *attr,
@@ -2604,8 +2604,7 @@ static ssize_t provides_device_sdrs_show(struct device *dev,
        return snprintf(buf, 10, "%u\n", (id.device_revision & 0x80) >> 7);
 }
-static DEVICE_ATTR(provides_device_sdrs, S_IRUGO, provides_device_sdrs_show,
+static DEVICE_ATTR_RO(provides_device_sdrs);
-                   NULL);
 static ssize_t revision_show(struct device *dev, struct device_attribute *attr,
                             char *buf)
@@ -2620,7 +2619,7 @@ static ssize_t revision_show(struct device *dev, struct device_attribute *attr,
        return snprintf(buf, 20, "%u\n", id.device_revision & 0x0F);
 }
-static DEVICE_ATTR(revision, S_IRUGO, revision_show, NULL);
+static DEVICE_ATTR_RO(revision);
 static ssize_t firmware_revision_show(struct device *dev,
                                      struct device_attribute *attr,
@@ -2637,7 +2636,7 @@ static ssize_t firmware_revision_show(struct device *dev,
        return snprintf(buf, 20, "%u.%x\n", id.firmware_revision_1,
                        id.firmware_revision_2);
 }
-static DEVICE_ATTR(firmware_revision, S_IRUGO, firmware_revision_show, NULL);
+static DEVICE_ATTR_RO(firmware_revision);
 static ssize_t ipmi_version_show(struct device *dev,
                                 struct device_attribute *attr,
@@ -2655,7 +2654,7 @@ static ssize_t ipmi_version_show(struct device *dev,
                        ipmi_version_major(&id),
                        ipmi_version_minor(&id));
 }
-static DEVICE_ATTR(ipmi_version, S_IRUGO, ipmi_version_show, NULL);
+static DEVICE_ATTR_RO(ipmi_version);
 static ssize_t add_dev_support_show(struct device *dev,
                                    struct device_attribute *attr,
@@ -2688,7 +2687,7 @@ static ssize_t manufacturer_id_show(struct device *dev,
        return snprintf(buf, 20, "0x%6.6x\n", id.manufacturer_id);
 }
-static DEVICE_ATTR(manufacturer_id, S_IRUGO, manufacturer_id_show, NULL);
+static DEVICE_ATTR_RO(manufacturer_id);
 static ssize_t product_id_show(struct device *dev,
                               struct device_attribute *attr,
@@ -2704,7 +2703,7 @@ static ssize_t product_id_show(struct device *dev,
        return snprintf(buf, 10, "0x%4.4x\n", id.product_id);
 }
-static DEVICE_ATTR(product_id, S_IRUGO, product_id_show, NULL);
+static DEVICE_ATTR_RO(product_id);
 static ssize_t aux_firmware_rev_show(struct device *dev,
                                     struct device_attribute *attr,
@@ -2742,7 +2741,7 @@ static ssize_t guid_show(struct device *dev, struct device_attribute *attr,
        return snprintf(buf, 38, "%pUl\n", guid.b);
 }
-static DEVICE_ATTR(guid, S_IRUGO, guid_show, NULL);
+static DEVICE_ATTR_RO(guid);
 static struct attribute *bmc_dev_attrs[] = {
        &dev_attr_device_id.attr,
diff --git a/drivers/gpu/drm/i915/i915_sysfs.c b/drivers/gpu/drm/i915/i915_sysfs.c
index 791759f632e1..fb46ce3bd5f2 100644
--- a/drivers/gpu/drm/i915/i915_sysfs.c
+++ b/drivers/gpu/drm/i915/i915_sysfs.c
@@ -434,13 +434,13 @@ static ssize_t gt_min_freq_mhz_store(struct device *kdev,
        return ret ?: count;
 }
-static DEVICE_ATTR(gt_act_freq_mhz, S_IRUGO, gt_act_freq_mhz_show, NULL);
+static DEVICE_ATTR_RO(gt_act_freq_mhz);
-static DEVICE_ATTR(gt_cur_freq_mhz, S_IRUGO, gt_cur_freq_mhz_show, NULL);
+static DEVICE_ATTR_RO(gt_cur_freq_mhz);
-static DEVICE_ATTR(gt_boost_freq_mhz, S_IRUGO | S_IWUSR, gt_boost_freq_mhz_show, gt_boost_freq_mhz_store);
+static DEVICE_ATTR_RW(gt_boost_freq_mhz);
-static DEVICE_ATTR(gt_max_freq_mhz, S_IRUGO | S_IWUSR, gt_max_freq_mhz_show, gt_max_freq_mhz_store);
+static DEVICE_ATTR_RW(gt_max_freq_mhz);
-static DEVICE_ATTR(gt_min_freq_mhz, S_IRUGO | S_IWUSR, gt_min_freq_mhz_show, gt_min_freq_mhz_store);
+static DEVICE_ATTR_RW(gt_min_freq_mhz);
-static DEVICE_ATTR(vlv_rpe_freq_mhz, S_IRUGO, vlv_rpe_freq_mhz_show, NULL);
+static DEVICE_ATTR_RO(vlv_rpe_freq_mhz);
 static ssize_t gt_rp_mhz_show(struct device *kdev, struct device_attribute *attr, char *buf);
 static DEVICE_ATTR(gt_RP0_freq_mhz, S_IRUGO, gt_rp_mhz_show, NULL);
diff --git a/drivers/input/touchscreen/elants_i2c.c b/drivers/input/touchscreen/elants_i2c.c
index a458e5ec9e41..819213e88f32 100644
--- a/drivers/input/touchscreen/elants_i2c.c
+++ b/drivers/input/touchscreen/elants_i2c.c
@@ -1000,7 +1000,7 @@ static ssize_t show_iap_mode(struct device *dev,
                                "Normal" : "Recovery");
 }
-static DEVICE_ATTR(calibrate, S_IWUSR, NULL, calibrate_store);
+static DEVICE_ATTR_WO(calibrate);
 static DEVICE_ATTR(iap_mode, S_IRUGO, show_iap_mode, NULL);
 static DEVICE_ATTR(update_fw, S_IWUSR, NULL, write_update_fw);
diff --git a/drivers/net/ethernet/ibm/ibmvnic.c b/drivers/net/ethernet/ibm/ibmvnic.c
index 8c3058d5d191..56d6f1a4205a 100644
--- a/drivers/net/ethernet/ibm/ibmvnic.c
+++ b/drivers/net/ethernet/ibm/ibmvnic.c
@@ -4479,7 +4479,7 @@ static ssize_t failover_store(struct device *dev, struct device_attribute *attr,
        return count;
 }
-static DEVICE_ATTR(failover, 0200, NULL, failover_store);
+static DEVICE_ATTR_WO(failover);
 static unsigned long ibmvnic_get_desired_dma(struct vio_dev *vdev)
 {
diff --git a/drivers/net/wimax/i2400m/sysfs.c b/drivers/net/wimax/i2400m/sysfs.c
index 1237109f251a..8c67df11105c 100644
--- a/drivers/net/wimax/i2400m/sysfs.c
+++ b/drivers/net/wimax/i2400m/sysfs.c
@@ -65,8 +65,7 @@ error_bad_value:
 }
 static
-DEVICE_ATTR(i2400m_idle_timeout, S_IWUSR,
+DEVICE_ATTR_WO(i2400m_idle_timeout);
-            NULL, i2400m_idle_timeout_store);
 static
 struct attribute *i2400m_dev_attrs[] = {
diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c
index e8104871cbbf..f431c32774f3 100644
--- a/drivers/nvme/host/core.c
+++ b/drivers/nvme/host/core.c
@@ -2554,14 +2554,14 @@ static ssize_t wwid_show(struct device *dev, struct device_attribute *attr,
                serial_len, subsys->serial, model_len, subsys->model,
                head->ns_id);
 }
-static DEVICE_ATTR(wwid, S_IRUGO, wwid_show, NULL);
+static DEVICE_ATTR_RO(wwid);
 static ssize_t nguid_show(struct device *dev, struct device_attribute *attr,
                char *buf)
 {
        return sprintf(buf, "%pU\n", dev_to_ns_head(dev)->ids.nguid);
 }
-static DEVICE_ATTR(nguid, S_IRUGO, nguid_show, NULL);
+static DEVICE_ATTR_RO(nguid);
 static ssize_t uuid_show(struct device *dev, struct device_attribute *attr,
                char *buf)
@@ -2578,21 +2578,21 @@ static ssize_t uuid_show(struct device *dev, struct device_attribute *attr,
        }
        return sprintf(buf, "%pU\n", &ids->uuid);
 }
-static DEVICE_ATTR(uuid, S_IRUGO, uuid_show, NULL);
+static DEVICE_ATTR_RO(uuid);
 static ssize_t eui_show(struct device *dev, struct device_attribute *attr,
                char *buf)
 {
        return sprintf(buf, "%8ph\n", dev_to_ns_head(dev)->ids.eui64);
 }
-static DEVICE_ATTR(eui, S_IRUGO, eui_show, NULL);
+static DEVICE_ATTR_RO(eui);
 static ssize_t nsid_show(struct device *dev, struct device_attribute *attr,
                char *buf)
 {
        return sprintf(buf, "%d\n", dev_to_ns_head(dev)->ns_id);
 }
-static DEVICE_ATTR(nsid, S_IRUGO, nsid_show, NULL);
+static DEVICE_ATTR_RO(nsid);
 static struct attribute *nvme_ns_id_attrs[] = {
        &dev_attr_wwid.attr,
diff --git a/drivers/platform/x86/compal-laptop.c b/drivers/platform/x86/compal-laptop.c
index 6bcb750e1865..4f9bc72f0584 100644
--- a/drivers/platform/x86/compal-laptop.c
+++ b/drivers/platform/x86/compal-laptop.c
@@ -679,18 +679,12 @@ static int bat_writeable_property(struct power_supply *psy,
 /* ============== */
 /* Driver Globals */
 /* ============== */
-static DEVICE_ATTR(wake_up_pme,
+static DEVICE_ATTR_RW(wake_up_pme);
-                0644, wake_up_pme_show,         wake_up_pme_store);
+static DEVICE_ATTR_RW(wake_up_modem);
-static DEVICE_ATTR(wake_up_modem,
+static DEVICE_ATTR_RW(wake_up_lan);
-                0644, wake_up_modem_show,       wake_up_modem_store);
+static DEVICE_ATTR_RW(wake_up_wlan);
-static DEVICE_ATTR(wake_up_lan,
+static DEVICE_ATTR_RW(wake_up_key);
-                0644, wake_up_lan_show, wake_up_lan_store);
+static DEVICE_ATTR_RW(wake_up_mouse);
-static DEVICE_ATTR(wake_up_wlan,
-                0644, wake_up_wlan_show,        wake_up_wlan_store);
-static DEVICE_ATTR(wake_up_key,
-                0644, wake_up_key_show, wake_up_key_store);
-static DEVICE_ATTR(wake_up_mouse,
-                0644, wake_up_mouse_show,       wake_up_mouse_store);
 static DEVICE_ATTR(fan1_input,  S_IRUGO, fan_show,          NULL);
 static DEVICE_ATTR(temp1_input, S_IRUGO, temp_cpu,          NULL);
diff --git a/drivers/s390/cio/css.c b/drivers/s390/cio/css.c
index 0f11dce6e224..9263a0fb3858 100644
--- a/drivers/s390/cio/css.c
+++ b/drivers/s390/cio/css.c
@@ -268,7 +268,7 @@ static ssize_t type_show(struct device *dev, struct device_attribute *attr,
        return sprintf(buf, "%01x\n", sch->st);
 }
-static DEVICE_ATTR(type, 0444, type_show, NULL);
+static DEVICE_ATTR_RO(type);
 static ssize_t modalias_show(struct device *dev, struct device_attribute *attr,
                             char *buf)
@@ -278,7 +278,7 @@ static ssize_t modalias_show(struct device *dev, struct device_attribute *attr,
        return sprintf(buf, "css:t%01X\n", sch->st);
 }
-static DEVICE_ATTR(modalias, 0444, modalias_show, NULL);
+static DEVICE_ATTR_RO(modalias);
 static struct attribute *subch_attrs[] = {
        &dev_attr_type.attr,
@@ -315,7 +315,7 @@ static ssize_t chpids_show(struct device *dev,
        ret += sprintf(buf + ret, "\n");
        return ret;
 }
-static DEVICE_ATTR(chpids, 0444, chpids_show, NULL);
+static DEVICE_ATTR_RO(chpids);
 static ssize_t pimpampom_show(struct device *dev,
                              struct device_attribute *attr,
@@ -327,7 +327,7 @@ static ssize_t pimpampom_show(struct device *dev,
        return sprintf(buf, "%02x %02x %02x\n",
                       pmcw->pim, pmcw->pam, pmcw->pom);
 }
-static DEVICE_ATTR(pimpampom, 0444, pimpampom_show, NULL);
+static DEVICE_ATTR_RO(pimpampom);
 static struct attribute *io_subchannel_type_attrs[] = {
        &dev_attr_chpids.attr,
diff --git a/drivers/s390/cio/device.c b/drivers/s390/cio/device.c
index 75a245f38e2e..f50ea035aa9b 100644
--- a/drivers/s390/cio/device.c
+++ b/drivers/s390/cio/device.c
@@ -597,13 +597,13 @@ static ssize_t vpm_show(struct device *dev, struct device_attribute *attr,
        return sprintf(buf, "%02x\n", sch->vpm);
 }
-static DEVICE_ATTR(devtype, 0444, devtype_show, NULL);
+static DEVICE_ATTR_RO(devtype);
-static DEVICE_ATTR(cutype, 0444, cutype_show, NULL);
+static DEVICE_ATTR_RO(cutype);
-static DEVICE_ATTR(modalias, 0444, modalias_show, NULL);
+static DEVICE_ATTR_RO(modalias);
-static DEVICE_ATTR(online, 0644, online_show, online_store);
+static DEVICE_ATTR_RW(online);
 static DEVICE_ATTR(availability, 0444, available_show, NULL);
 static DEVICE_ATTR(logging, 0200, NULL, initiate_logging);
-static DEVICE_ATTR(vpm, 0444, vpm_show, NULL);
+static DEVICE_ATTR_RO(vpm);
 static struct attribute *io_subchannel_attrs[] = {
        &dev_attr_logging.attr,
diff --git a/drivers/s390/crypto/ap_card.c b/drivers/s390/crypto/ap_card.c
index 97a8cf578116..2c726df210f6 100644
--- a/drivers/s390/crypto/ap_card.c
+++ b/drivers/s390/crypto/ap_card.c
@@ -57,7 +57,7 @@ static ssize_t ap_functions_show(struct device *dev,
        return snprintf(buf, PAGE_SIZE, "0x%08X\n", ac->functions);
 }
-static DEVICE_ATTR(ap_functions, 0444, ap_functions_show, NULL);
+static DEVICE_ATTR_RO(ap_functions);
 static ssize_t ap_req_count_show(struct device *dev,
                                 struct device_attribute *attr,
diff --git a/drivers/scsi/hpsa.c b/drivers/scsi/hpsa.c
index 87b260e403ec..5293e6827ce5 100644
--- a/drivers/scsi/hpsa.c
+++ b/drivers/scsi/hpsa.c
@@ -901,14 +901,14 @@ static ssize_t host_show_legacy_board(struct device *dev,
        return snprintf(buf, 20, "%d\n", h->legacy_board ? 1 : 0);
 }
-static DEVICE_ATTR(raid_level, S_IRUGO, raid_level_show, NULL);
+static DEVICE_ATTR_RO(raid_level);
-static DEVICE_ATTR(lunid, S_IRUGO, lunid_show, NULL);
+static DEVICE_ATTR_RO(lunid);
-static DEVICE_ATTR(unique_id, S_IRUGO, unique_id_show, NULL);
+static DEVICE_ATTR_RO(unique_id);
 static DEVICE_ATTR(rescan, S_IWUSR, NULL, host_store_rescan);
-static DEVICE_ATTR(sas_address, S_IRUGO, sas_address_show, NULL);
+static DEVICE_ATTR_RO(sas_address);
 static DEVICE_ATTR(hp_ssd_smart_path_enabled, S_IRUGO,
                        host_show_hp_ssd_smart_path_enabled, NULL);
-static DEVICE_ATTR(path_info, S_IRUGO, path_info_show, NULL);
+static DEVICE_ATTR_RO(path_info);
 static DEVICE_ATTR(hp_ssd_smart_path_status, S_IWUSR|S_IRUGO|S_IROTH,
                host_show_hp_ssd_smart_path_status,
                host_store_hp_ssd_smart_path_status);
diff --git a/drivers/scsi/lpfc/lpfc_attr.c b/drivers/scsi/lpfc/lpfc_attr.c
index d188fb565a32..ac77081e6e9e 100644
--- a/drivers/scsi/lpfc/lpfc_attr.c
+++ b/drivers/scsi/lpfc/lpfc_attr.c
@@ -2294,8 +2294,8 @@ static DEVICE_ATTR(num_discovered_ports, S_IRUGO,
                   lpfc_num_discovered_ports_show, NULL);
 static DEVICE_ATTR(menlo_mgmt_mode, S_IRUGO, lpfc_mlomgmt_show, NULL);
 static DEVICE_ATTR(nport_evt_cnt, S_IRUGO, lpfc_nport_evt_cnt_show, NULL);
-static DEVICE_ATTR(lpfc_drvr_version, S_IRUGO, lpfc_drvr_version_show, NULL);
+static DEVICE_ATTR_RO(lpfc_drvr_version);
-static DEVICE_ATTR(lpfc_enable_fip, S_IRUGO, lpfc_enable_fip_show, NULL);
+static DEVICE_ATTR_RO(lpfc_enable_fip);
 static DEVICE_ATTR(board_mode, S_IRUGO | S_IWUSR,
                   lpfc_board_mode_show, lpfc_board_mode_store);
 static DEVICE_ATTR(issue_reset, S_IWUSR, NULL, lpfc_issue_reset);
@@ -2306,12 +2306,11 @@ static DEVICE_ATTR(used_rpi, S_IRUGO, lpfc_used_rpi_show, NULL);
 static DEVICE_ATTR(max_xri, S_IRUGO, lpfc_max_xri_show, NULL);
 static DEVICE_ATTR(used_xri, S_IRUGO, lpfc_used_xri_show, NULL);
 static DEVICE_ATTR(npiv_info, S_IRUGO, lpfc_npiv_info_show, NULL);
-static DEVICE_ATTR(lpfc_temp_sensor, S_IRUGO, lpfc_temp_sensor_show, NULL);
+static DEVICE_ATTR_RO(lpfc_temp_sensor);
-static DEVICE_ATTR(lpfc_fips_level, S_IRUGO, lpfc_fips_level_show, NULL);
+static DEVICE_ATTR_RO(lpfc_fips_level);
-static DEVICE_ATTR(lpfc_fips_rev, S_IRUGO, lpfc_fips_rev_show, NULL);
+static DEVICE_ATTR_RO(lpfc_fips_rev);
-static DEVICE_ATTR(lpfc_dss, S_IRUGO, lpfc_dss_show, NULL);
+static DEVICE_ATTR_RO(lpfc_dss);
-static DEVICE_ATTR(lpfc_sriov_hw_max_virtfn, S_IRUGO,
+static DEVICE_ATTR_RO(lpfc_sriov_hw_max_virtfn);
-                   lpfc_sriov_hw_max_virtfn_show, NULL);
 static DEVICE_ATTR(protocol, S_IRUGO, lpfc_sli4_protocol_show, NULL);
 static DEVICE_ATTR(lpfc_xlane_supported, S_IRUGO, lpfc_oas_supported_show,
                   NULL);
@@ -2419,8 +2418,7 @@ lpfc_soft_wwn_enable_store(struct device *dev, struct device_attribute *attr,
        return count;
 }
-static DEVICE_ATTR(lpfc_soft_wwn_enable, S_IWUSR, NULL,
+static DEVICE_ATTR_WO(lpfc_soft_wwn_enable);
-                   lpfc_soft_wwn_enable_store);
 /**
 * lpfc_soft_wwpn_show - Return the cfg soft ww port name of the adapter
@@ -2519,8 +2517,7 @@ lpfc_soft_wwpn_store(struct device *dev, struct device_attribute *attr,
                                "reinit adapter - %d\n", stat2);
        return (stat1 || stat2) ? -EIO : count;
 }
-static DEVICE_ATTR(lpfc_soft_wwpn, S_IRUGO | S_IWUSR,
+static DEVICE_ATTR_RW(lpfc_soft_wwpn);
-                   lpfc_soft_wwpn_show, lpfc_soft_wwpn_store);
 /**
 * lpfc_soft_wwnn_show - Return the cfg soft ww node name for the adapter
@@ -2583,8 +2580,7 @@ lpfc_soft_wwnn_store(struct device *dev, struct device_attribute *attr,
        return count;
 }
-static DEVICE_ATTR(lpfc_soft_wwnn, S_IRUGO | S_IWUSR,
+static DEVICE_ATTR_RW(lpfc_soft_wwnn);
-                   lpfc_soft_wwnn_show, lpfc_soft_wwnn_store);
 /**
 * lpfc_oas_tgt_show - Return wwpn of target whose luns maybe enabled for
@@ -3102,8 +3098,7 @@ MODULE_PARM_DESC(lpfc_poll, "FCP ring polling mode control:"
                 " 1 - poll with interrupts enabled"
                 " 3 - poll and disable FCP ring interrupts");
-static DEVICE_ATTR(lpfc_poll, S_IRUGO | S_IWUSR,
+static DEVICE_ATTR_RW(lpfc_poll);
-                   lpfc_poll_show, lpfc_poll_store);
 int lpfc_no_hba_reset_cnt;
 unsigned long lpfc_no_hba_reset[MAX_HBAS_NO_RESET] = {
@@ -3336,8 +3331,7 @@ lpfc_nodev_tmo_set(struct lpfc_vport *vport, int val)
 lpfc_vport_param_store(nodev_tmo)
-static DEVICE_ATTR(lpfc_nodev_tmo, S_IRUGO | S_IWUSR,
+static DEVICE_ATTR_RW(lpfc_nodev_tmo);
-                   lpfc_nodev_tmo_show, lpfc_nodev_tmo_store);
 /*
 # lpfc_devloss_tmo: If set, it will hold all I/O errors on devices that
@@ -3386,8 +3380,7 @@ lpfc_devloss_tmo_set(struct lpfc_vport *vport, int val)
 }
 lpfc_vport_param_store(devloss_tmo)
-static DEVICE_ATTR(lpfc_devloss_tmo, S_IRUGO | S_IWUSR,
+static DEVICE_ATTR_RW(lpfc_devloss_tmo);
-                   lpfc_devloss_tmo_show, lpfc_devloss_tmo_store);
 /*
 * lpfc_suppress_rsp: Enable suppress rsp feature is firmware supports it
@@ -3580,8 +3573,7 @@ lpfc_restrict_login_set(struct lpfc_vport *vport, int val)
        return 0;
 }
 lpfc_vport_param_store(restrict_login);
-static DEVICE_ATTR(lpfc_restrict_login, S_IRUGO | S_IWUSR,
+static DEVICE_ATTR_RW(lpfc_restrict_login);
-                   lpfc_restrict_login_show, lpfc_restrict_login_store);
 /*
 # Some disk devices have a "select ID" or "select Target" capability.
@@ -3695,8 +3687,7 @@ lpfc_topology_store(struct device *dev, struct device_attribute *attr,
 }
 lpfc_param_show(topology)
-static DEVICE_ATTR(lpfc_topology, S_IRUGO | S_IWUSR,
+static DEVICE_ATTR_RW(lpfc_topology);
-                lpfc_topology_show, lpfc_topology_store);
 /**
 * lpfc_static_vport_show: Read callback function for
@@ -3726,8 +3717,7 @@ lpfc_static_vport_show(struct device *dev, struct device_attribute *attr,
 /*
 * Sysfs attribute to control the statistical data collection.
 */
-static DEVICE_ATTR(lpfc_static_vport, S_IRUGO,
+static DEVICE_ATTR_RO(lpfc_static_vport);
-                   lpfc_static_vport_show, NULL);
 /**
 * lpfc_stat_data_ctrl_store - write call back for lpfc_stat_data_ctrl sysfs file
@@ -3954,8 +3944,7 @@ lpfc_stat_data_ctrl_show(struct device *dev, struct device_attribute *attr,
 /*
 * Sysfs attribute to control the statistical data collection.
 */
-static DEVICE_ATTR(lpfc_stat_data_ctrl, S_IRUGO | S_IWUSR,
+static DEVICE_ATTR_RW(lpfc_stat_data_ctrl);
-                   lpfc_stat_data_ctrl_show, lpfc_stat_data_ctrl_store);
 /*
 * lpfc_drvr_stat_data: sysfs attr to get driver statistical data.
@@ -4194,8 +4183,7 @@ lpfc_link_speed_init(struct lpfc_hba *phba, int val)
        return -EINVAL;
 }
-static DEVICE_ATTR(lpfc_link_speed, S_IRUGO | S_IWUSR,
+static DEVICE_ATTR_RW(lpfc_link_speed);
-                   lpfc_link_speed_show, lpfc_link_speed_store);
 /*
 # lpfc_aer_support: Support PCIe device Advanced Error Reporting (AER)
@@ -4288,8 +4276,7 @@ lpfc_aer_support_store(struct device *dev, struct device_attribute *attr,
        return rc;
 }
-static DEVICE_ATTR(lpfc_aer_support, S_IRUGO | S_IWUSR,
+static DEVICE_ATTR_RW(lpfc_aer_support);
-                   lpfc_aer_support_show, lpfc_aer_support_store);
 /**
 * lpfc_aer_cleanup_state - Clean up aer state to the aer enabled device
@@ -4436,8 +4423,7 @@ LPFC_ATTR(sriov_nr_virtfn, LPFC_DEF_VFN_PER_PFN, 0, LPFC_MAX_VFN_PER_PFN,
        "Enable PCIe device SR-IOV virtual fn");
 lpfc_param_show(sriov_nr_virtfn)
-static DEVICE_ATTR(lpfc_sriov_nr_virtfn, S_IRUGO | S_IWUSR,
+static DEVICE_ATTR_RW(lpfc_sriov_nr_virtfn);
-                   lpfc_sriov_nr_virtfn_show, lpfc_sriov_nr_virtfn_store);
 /**
 * lpfc_request_firmware_store - Request for Linux generic firmware upgrade
@@ -4611,8 +4597,7 @@ lpfc_fcp_imax_init(struct lpfc_hba *phba, int val)
        return 0;
 }
-static DEVICE_ATTR(lpfc_fcp_imax, S_IRUGO | S_IWUSR,
+static DEVICE_ATTR_RW(lpfc_fcp_imax);
-                   lpfc_fcp_imax_show, lpfc_fcp_imax_store);
 /*
 * lpfc_auto_imax: Controls Auto-interrupt coalescing values support.
@@ -4772,8 +4757,7 @@ lpfc_fcp_cpu_map_init(struct lpfc_hba *phba, int val)
        return 0;
 }
-static DEVICE_ATTR(lpfc_fcp_cpu_map, S_IRUGO | S_IWUSR,
+static DEVICE_ATTR_RW(lpfc_fcp_cpu_map);
-                   lpfc_fcp_cpu_map_show, lpfc_fcp_cpu_map_store);
 /*
 # lpfc_fcp_class:  Determines FC class to use for the FCP protocol.
@@ -4859,9 +4843,7 @@ lpfc_max_scsicmpl_time_set(struct lpfc_vport *vport, int val)
        return 0;
 }
 lpfc_vport_param_store(max_scsicmpl_time);
-static DEVICE_ATTR(lpfc_max_scsicmpl_time, S_IRUGO | S_IWUSR,
+static DEVICE_ATTR_RW(lpfc_max_scsicmpl_time);
-                   lpfc_max_scsicmpl_time_show,
-                   lpfc_max_scsicmpl_time_store);
 /*
 # lpfc_ack0: Use ACK0, instead of ACK1 for class 2 acknowledgement. Value
diff --git a/drivers/thermal/thermal_sysfs.c b/drivers/thermal/thermal_sysfs.c
index fb80c96d8f73..ba81c9080f6e 100644
--- a/drivers/thermal/thermal_sysfs.c
+++ b/drivers/thermal/thermal_sysfs.c
@@ -317,7 +317,7 @@ emul_temp_store(struct device *dev, struct device_attribute *attr,
        return ret ? ret : count;
 }
-static DEVICE_ATTR(emul_temp, S_IWUSR, NULL, emul_temp_store);
+static DEVICE_ATTR_WO(emul_temp);
 #endif
 static ssize_t
@@ -396,16 +396,15 @@ create_s32_tzp_attr(offset);
 * All the attributes created for tzp (create_s32_tzp_attr) also are always
 * present on the sysfs interface.
 */
-static DEVICE_ATTR(type, 0444, type_show, NULL);
+static DEVICE_ATTR_RO(type);
-static DEVICE_ATTR(temp, 0444, temp_show, NULL);
+static DEVICE_ATTR_RO(temp);
-static DEVICE_ATTR(policy, S_IRUGO | S_IWUSR, policy_show, policy_store);
+static DEVICE_ATTR_RW(policy);
-static DEVICE_ATTR(available_policies, S_IRUGO, available_policies_show, NULL);
+static DEVICE_ATTR_RO(available_policies);
-static DEVICE_ATTR(sustainable_power, S_IWUSR | S_IRUGO, sustainable_power_show,
+static DEVICE_ATTR_RW(sustainable_power);
-                   sustainable_power_store);
 /* These thermal zone device attributes are created based on conditions */
-static DEVICE_ATTR(mode, 0644, mode_show, mode_store);
+static DEVICE_ATTR_RW(mode);
-static DEVICE_ATTR(passive, S_IRUGO | S_IWUSR, passive_show, passive_store);
+static DEVICE_ATTR_RW(passive);
 /* These attributes are unconditionally added to a thermal zone */
 static struct attribute *thermal_zone_dev_attrs[] = {
diff --git a/drivers/tty/serial/sh-sci.c b/drivers/tty/serial/sh-sci.c
index d9f399c4e90c..7257c078e155 100644
--- a/drivers/tty/serial/sh-sci.c
+++ b/drivers/tty/serial/sh-sci.c
@@ -1144,7 +1144,7 @@ static ssize_t rx_fifo_timeout_store(struct device *dev,
        return count;
 }
-static DEVICE_ATTR(rx_fifo_timeout, 0644, rx_fifo_timeout_show, rx_fifo_timeout_store);
+static DEVICE_ATTR_RW(rx_fifo_timeout);
 #ifdef CONFIG_SERIAL_SH_SCI_DMA
diff --git a/drivers/usb/serial/Kconfig b/drivers/usb/serial/Kconfig
index c66b93664d54..a646820f5a78 100644
--- a/drivers/usb/serial/Kconfig
+++ b/drivers/usb/serial/Kconfig
@@ -323,84 +323,6 @@ config USB_SERIAL_KEYSPAN
          To compile this driver as a module, choose M here: the
          module will be called keyspan.
-config USB_SERIAL_KEYSPAN_MPR
-        bool "USB Keyspan MPR Firmware"
-        depends on USB_SERIAL_KEYSPAN && FIRMWARE_IN_KERNEL
-        help
-          Say Y here to include firmware for the Keyspan MPR converter.
-config USB_SERIAL_KEYSPAN_USA28
-        bool "USB Keyspan USA-28 Firmware"
-        depends on USB_SERIAL_KEYSPAN && FIRMWARE_IN_KERNEL
-        help
-          Say Y here to include firmware for the USA-28 converter.
-config USB_SERIAL_KEYSPAN_USA28X
-        bool "USB Keyspan USA-28X Firmware"
-        depends on USB_SERIAL_KEYSPAN && FIRMWARE_IN_KERNEL
-        help
-          Say Y here to include firmware for the USA-28X converter.
-          Be sure you have a USA-28X, there are also 28XA and 28XB
-          models, the label underneath has the actual part number.
-config USB_SERIAL_KEYSPAN_USA28XA
-        bool "USB Keyspan USA-28XA Firmware"
-        depends on USB_SERIAL_KEYSPAN && FIRMWARE_IN_KERNEL
-        help
-          Say Y here to include firmware for the USA-28XA converter.
-          Be sure you have a USA-28XA, there are also 28X and 28XB
-          models, the label underneath has the actual part number.
-config USB_SERIAL_KEYSPAN_USA28XB
-        bool "USB Keyspan USA-28XB Firmware"
-        depends on USB_SERIAL_KEYSPAN && FIRMWARE_IN_KERNEL
-        help
-          Say Y here to include firmware for the USA-28XB converter.
-          Be sure you have a USA-28XB, there are also 28X and 28XA
-          models, the label underneath has the actual part number.
-config USB_SERIAL_KEYSPAN_USA19
-        bool "USB Keyspan USA-19 Firmware"
-        depends on USB_SERIAL_KEYSPAN && FIRMWARE_IN_KERNEL
-        help
-          Say Y here to include firmware for the USA-19 converter.
-config USB_SERIAL_KEYSPAN_USA18X
-        bool "USB Keyspan USA-18X Firmware"
-        depends on USB_SERIAL_KEYSPAN && FIRMWARE_IN_KERNEL
-        help
-          Say Y here to include firmware for the USA-18X converter.
-config USB_SERIAL_KEYSPAN_USA19W
-        bool "USB Keyspan USA-19W Firmware"
-        depends on USB_SERIAL_KEYSPAN && FIRMWARE_IN_KERNEL
-        help
-          Say Y here to include firmware for the USA-19W converter.
-config USB_SERIAL_KEYSPAN_USA19QW
-        bool "USB Keyspan USA-19QW Firmware"
-        depends on USB_SERIAL_KEYSPAN && FIRMWARE_IN_KERNEL
-        help
-          Say Y here to include firmware for the USA-19QW converter.
-config USB_SERIAL_KEYSPAN_USA19QI
-        bool "USB Keyspan USA-19QI Firmware"
-        depends on USB_SERIAL_KEYSPAN && FIRMWARE_IN_KERNEL
-        help
-          Say Y here to include firmware for the USA-19QI converter.
-config USB_SERIAL_KEYSPAN_USA49W
-        bool "USB Keyspan USA-49W Firmware"
-        depends on USB_SERIAL_KEYSPAN && FIRMWARE_IN_KERNEL
-        help
-          Say Y here to include firmware for the USA-49W converter.
-config USB_SERIAL_KEYSPAN_USA49WLC
-        bool "USB Keyspan USA-49WLC Firmware"
-        depends on USB_SERIAL_KEYSPAN && FIRMWARE_IN_KERNEL
-        help
-          Say Y here to include firmware for the USA-49WLC converter.
 config USB_SERIAL_KLSI
        tristate "USB KL5KUSB105 (Palmconnect) Driver"
        ---help---
diff --git a/drivers/video/fbdev/auo_k190x.c b/drivers/video/fbdev/auo_k190x.c
index 0d06038324e0..1e383c547633 100644
--- a/drivers/video/fbdev/auo_k190x.c
+++ b/drivers/video/fbdev/auo_k190x.c
@@ -708,8 +708,8 @@ static ssize_t temp_show(struct device *dev, struct device_attribute *attr,
        return sprintf(buf, "%d\n", temp);
 }
-static DEVICE_ATTR(update_mode, 0644, update_mode_show, update_mode_store);
+static DEVICE_ATTR_RW(update_mode);
-static DEVICE_ATTR(flash, 0644, flash_show, flash_store);
+static DEVICE_ATTR_RW(flash);
 static DEVICE_ATTR(temp, 0644, temp_show, NULL);
 static struct attribute *auok190x_attributes[] = {
diff --git a/drivers/video/fbdev/w100fb.c b/drivers/video/fbdev/w100fb.c
index d570e19a2864..035ff6e02894 100644
--- a/drivers/video/fbdev/w100fb.c
+++ b/drivers/video/fbdev/w100fb.c
@@ -110,7 +110,7 @@ static ssize_t flip_store(struct device *dev, struct device_attribute *attr, con
        return count;
 }
-static DEVICE_ATTR(flip, 0644, flip_show, flip_store);
+static DEVICE_ATTR_RW(flip);
 static ssize_t w100fb_reg_read(struct device *dev, struct device_attribute *attr, const char *buf, size_t count)
 {
@@ -166,7 +166,7 @@ static ssize_t fastpllclk_store(struct device *dev, struct device_attribute *att
        return count;
 }
-static DEVICE_ATTR(fastpllclk, 0644, fastpllclk_show, fastpllclk_store);
+static DEVICE_ATTR_RW(fastpllclk);
 /*
 * Some touchscreens need hsync information from the video driver to
diff --git a/fs/sysfs/dir.c b/fs/sysfs/dir.c
index 2b67bda2021b..58eba92a0e41 100644
--- a/fs/sysfs/dir.c
+++ b/fs/sysfs/dir.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
 * fs/sysfs/dir.c - sysfs core and dir operation implementation
 *
@@ -5,12 +6,10 @@
 * Copyright (c) 2007 SUSE Linux Products GmbH
 * Copyright (c) 2007 Tejun Heo <teheo@suse.de>
 *
- * This file is released under the GPLv2.
- *
 * Please see Documentation/filesystems/sysfs.txt for more information.
 */
-#undef DEBUG
+#define pr_fmt(fmt)     "sysfs: " fmt
 #include <linux/fs.h>
 #include <linux/kobject.h>
@@ -27,8 +26,8 @@ void sysfs_warn_dup(struct kernfs_node *parent, const char *name)
        if (buf)
                kernfs_path(parent, buf, PATH_MAX);
-        WARN(1, KERN_WARNING "sysfs: cannot create duplicate filename '%s/%s'\n",
+        pr_warn("cannot create duplicate filename '%s/%s'\n", buf, name);
-             buf, name);
+        dump_stack();
        kfree(buf);
 }
diff --git a/fs/sysfs/file.c b/fs/sysfs/file.c
index 39c75a86c67f..39da8e86f10a 100644
--- a/fs/sysfs/file.c
+++ b/fs/sysfs/file.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
 * fs/sysfs/file.c - sysfs regular (text) file implementation
 *
@@ -5,8 +6,6 @@
 * Copyright (c) 2007 SUSE Linux Products GmbH
 * Copyright (c) 2007 Tejun Heo <teheo@suse.de>
 *
- * This file is released under the GPLv2.
- *
 * Please see Documentation/filesystems/sysfs.txt for more information.
 */
diff --git a/fs/sysfs/group.c b/fs/sysfs/group.c
index ac2de0ed69ad..4802ec0e1e3a 100644
--- a/fs/sysfs/group.c
+++ b/fs/sysfs/group.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
 * fs/sysfs/group.c - Operations for adding/removing multiple files at once.
 *
@@ -5,9 +6,6 @@
 * Copyright (c) 2003 Open Source Development Lab
 * Copyright (c) 2013 Greg Kroah-Hartman
 * Copyright (c) 2013 The Linux Foundation
- *
- * This file is released undert the GPL v2.
- *
 */
 #include <linux/kobject.h>
@@ -406,6 +404,6 @@ int __compat_only_sysfs_link_entry_to_kobj(struct kobject *kobj,
        kernfs_put(entry);
        kernfs_put(target);
-        return IS_ERR(link) ? PTR_ERR(link) : 0;
+        return PTR_ERR_OR_ZERO(link);
 }
 EXPORT_SYMBOL_GPL(__compat_only_sysfs_link_entry_to_kobj);
diff --git a/fs/sysfs/mount.c b/fs/sysfs/mount.c
index fb49510c5dcf..b428d317ae92 100644
--- a/fs/sysfs/mount.c
+++ b/fs/sysfs/mount.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
 * fs/sysfs/symlink.c - operations for initializing and mounting sysfs
 *
@@ -5,13 +6,9 @@
 * Copyright (c) 2007 SUSE Linux Products GmbH
 * Copyright (c) 2007 Tejun Heo <teheo@suse.de>
 *
- * This file is released under the GPLv2.
- *
 * Please see Documentation/filesystems/sysfs.txt for more information.
 */
-#define DEBUG
 #include <linux/fs.h>
 #include <linux/magic.h>
 #include <linux/mount.h>
diff --git a/fs/sysfs/symlink.c b/fs/sysfs/symlink.c
index aecb15f84557..8664db25a9a6 100644
--- a/fs/sysfs/symlink.c
+++ b/fs/sysfs/symlink.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
 * fs/sysfs/symlink.c - sysfs symlink implementation
 *
@@ -5,8 +6,6 @@
 * Copyright (c) 2007 SUSE Linux Products GmbH
 * Copyright (c) 2007 Tejun Heo <teheo@suse.de>
 *
- * This file is released under the GPLv2.
- *
 * Please see Documentation/filesystems/sysfs.txt for more information.
 */
diff --git a/fs/sysfs/sysfs.h b/fs/sysfs/sysfs.h
index 0e2f1cccb812..d098e015fcc9 100644
--- a/fs/sysfs/sysfs.h
+++ b/fs/sysfs/sysfs.h
@@ -1,11 +1,10 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
 * fs/sysfs/sysfs.h - sysfs internal header file
 *
 * Copyright (c) 2001-3 Patrick Mochel
 * Copyright (c) 2007 SUSE Linux Products GmbH
 * Copyright (c) 2007 Tejun Heo <teheo@suse.de>
- *
- * This file is released under the GPLv2.
 */
 #ifndef __SYSFS_INTERNAL_H
diff --git a/include/linux/device.h b/include/linux/device.h
index 46ac622e5c6f..f649fc0c2571 100644
--- a/include/linux/device.h
+++ b/include/linux/device.h
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
 * device.h - generic, centralized driver model
 *
@@ -5,8 +6,6 @@
 * Copyright (c) 2004-2009 Greg Kroah-Hartman <gregkh@suse.de>
 * Copyright (c) 2008-2009 Novell Inc.
 *
- * This file is released under the GPLv2
- *
 * See Documentation/driver-model/ for more information.
 */
@@ -288,6 +287,7 @@ struct device_driver {
        const struct attribute_group **groups;
        const struct dev_pm_ops *pm;
+        int (*coredump) (struct device *dev);
        struct driver_private *p;
 };
@@ -301,7 +301,6 @@ extern struct device_driver *driver_find(const char *name,
 extern int driver_probe_done(void);
 extern void wait_for_device_probe(void);
 /* sysfs interface for exporting driver attributes */
 struct driver_attribute {
diff --git a/include/linux/kobject.h b/include/linux/kobject.h
index e0a6205caa71..7f6f93c3df9c 100644
--- a/include/linux/kobject.h
+++ b/include/linux/kobject.h
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
 * kobject.h - generic kernel object infrastructure.
 *
@@ -6,8 +7,6 @@
 * Copyright (c) 2006-2008 Greg Kroah-Hartman <greg@kroah.com>
 * Copyright (c) 2006-2008 Novell Inc.
 *
- * This file is released under the GPLv2.
- *
 * Please read Documentation/kobject.txt before using the kobject
 * interface, ESPECIALLY the parts about reference counts and object
 * destructors.
diff --git a/include/linux/kobject_ns.h b/include/linux/kobject_ns.h
index df32d2508290..069aa2ebef90 100644
--- a/include/linux/kobject_ns.h
+++ b/include/linux/kobject_ns.h
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /* Kernel object name space definitions
 *
 * Copyright (c) 2002-2003 Patrick Mochel
@@ -7,8 +8,6 @@
 *
 * Split from kobject.h by David Howells (dhowells@redhat.com)
 *
- * This file is released under the GPLv2.
- *
 * Please read Documentation/kobject.txt before using the kobject
 * interface, ESPECIALLY the parts about reference counts and object
 * destructors.
diff --git a/include/linux/property.h b/include/linux/property.h
index 1106bc62dd8c..769d372c1edf 100644
--- a/include/linux/property.h
+++ b/include/linux/property.h
@@ -214,7 +214,7 @@ struct property_entry {
 */
 #define PROPERTY_ENTRY_INTEGER_ARRAY(_name_, _type_, _val_)     \
-{                                                               \
+(struct property_entry) {                                       \
        .name = _name_,                                         \
        .length = ARRAY_SIZE(_val_) * sizeof(_type_),           \
        .is_array = true,                                       \
@@ -232,7 +232,7 @@ struct property_entry {
        PROPERTY_ENTRY_INTEGER_ARRAY(_name_, u64, _val_)
 #define PROPERTY_ENTRY_STRING_ARRAY(_name_, _val_)              \
-{                                                               \
+(struct property_entry) {                                       \
        .name = _name_,                                         \
        .length = ARRAY_SIZE(_val_) * sizeof(const char *),     \
        .is_array = true,                                       \
@@ -241,7 +241,7 @@ struct property_entry {
 }
 #define PROPERTY_ENTRY_INTEGER(_name_, _type_, _val_)   \
-{                                                       \
+(struct property_entry) {                               \
        .name = _name_,                                 \
        .length = sizeof(_type_),                       \
        .is_string = false,                             \
@@ -258,7 +258,7 @@ struct property_entry {
        PROPERTY_ENTRY_INTEGER(_name_, u64, _val_)
 #define PROPERTY_ENTRY_STRING(_name_, _val_)            \
-{                                                       \
+(struct property_entry) {                               \
        .name = _name_,                                 \
        .length = sizeof(_val_),                        \
        .is_string = true,                              \
@@ -266,7 +266,7 @@ struct property_entry {
 }
 #define PROPERTY_ENTRY_BOOL(_name_)             \
-{                                               \
+(struct property_entry) {                       \
        .name = _name_,                         \
 }
diff --git a/include/linux/sysfs.h b/include/linux/sysfs.h
index 40839c02d28c..b8bfdc173ec0 100644
--- a/include/linux/sysfs.h
+++ b/include/linux/sysfs.h
@@ -113,7 +113,7 @@ struct attribute_group {
 }
 #define __ATTR_RO(_name) {                                              \
-        .attr   = { .name = __stringify(_name), .mode = S_IRUGO },      \
+        .attr   = { .name = __stringify(_name), .mode = 0444 },         \
        .show   = _name##_show,                                         \
 }
@@ -124,12 +124,11 @@ struct attribute_group {
 }
 #define __ATTR_WO(_name) {                                              \
-        .attr   = { .name = __stringify(_name), .mode = S_IWUSR },      \
+        .attr   = { .name = __stringify(_name), .mode = 0200 },         \
        .store  = _name##_store,                                        \
 }
-#define __ATTR_RW(_name) __ATTR(_name, (S_IWUSR | S_IRUGO),             \
+#define __ATTR_RW(_name) __ATTR(_name, 0644, _name##_show, _name##_store)
-                         _name##_show, _name##_store)
 #define __ATTR_NULL { .attr = { .name = NULL } }
@@ -192,14 +191,13 @@ struct bin_attribute {
 }
 #define __BIN_ATTR_RO(_name, _size) {                                   \
-        .attr   = { .name = __stringify(_name), .mode = S_IRUGO },      \
+        .attr   = { .name = __stringify(_name), .mode = 0444 },         \
        .read   = _name##_read,                                         \
        .size   = _size,                                                \
 }
-#define __BIN_ATTR_RW(_name, _size) __BIN_ATTR(_name,                   \
+#define __BIN_ATTR_RW(_name, _size)                                     \
-                                   (S_IWUSR | S_IRUGO), _name##_read,   \
+        __BIN_ATTR(_name, 0644, _name##_read, _name##_write, _size)
-                                   _name##_write, _size)
 #define __BIN_ATTR_NULL __ATTR_NULL
diff --git a/lib/kobject.c b/lib/kobject.c
index 06b849eee0ca..afd5a3fc6123 100644
--- a/lib/kobject.c
+++ b/lib/kobject.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
 * kobject.c - library routines for handling generic kernel objects
 *
@@ -5,9 +6,6 @@
 * Copyright (c) 2006-2007 Greg Kroah-Hartman <greg@kroah.com>
 * Copyright (c) 2006-2007 Novell Inc.
 *
- * This file is released under the GPLv2.
- *
- *
 * Please see the file Documentation/kobject.txt for critical information
 * about using the kobject interface.
 */
diff --git a/lib/kobject_uevent.c b/lib/kobject_uevent.c
index 2615074d3de5..9fe6ec8fda28 100644
--- a/lib/kobject_uevent.c
+++ b/lib/kobject_uevent.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
 * kernel userspace event delivery
 *
@@ -5,8 +6,6 @@
 * Copyright (C) 2004 Novell, Inc.  All rights reserved.
 * Copyright (C) 2004 IBM, Inc. All rights reserved.
 *
- * Licensed under the GNU GPL v2.
- *
 * Authors:
 *      Robert Love             <rml@novell.com>
 *      Kay Sievers             <kay.sievers@vrfy.org>
diff --git a/lib/test_firmware.c b/lib/test_firmware.c
index 64a4c76cba2b..078a61480573 100644
--- a/lib/test_firmware.c
+++ b/lib/test_firmware.c
@@ -96,7 +96,7 @@ struct test_config {
                            struct device *device);
 };
-struct test_config *test_fw_config;
+static struct test_config *test_fw_config;
 static ssize_t test_fw_misc_read(struct file *f, char __user *buf,
                                 size_t size, loff_t *offset)
@@ -359,7 +359,7 @@ static ssize_t config_name_show(struct device *dev,
 {
        return config_test_show_str(buf, test_fw_config->name);
 }
-static DEVICE_ATTR(config_name, 0644, config_name_show, config_name_store);
+static DEVICE_ATTR_RW(config_name);
 static ssize_t config_num_requests_store(struct device *dev,
                                         struct device_attribute *attr,
@@ -371,6 +371,7 @@ static ssize_t config_num_requests_store(struct device *dev,
        if (test_fw_config->reqs) {
                pr_err("Must call release_all_firmware prior to changing config\n");
                rc = -EINVAL;
+                mutex_unlock(&test_fw_mutex);
                goto out;
        }
        mutex_unlock(&test_fw_mutex);
@@ -388,8 +389,7 @@ static ssize_t config_num_requests_show(struct device *dev,
 {
        return test_dev_config_show_u8(buf, test_fw_config->num_requests);
 }
-static DEVICE_ATTR(config_num_requests, 0644, config_num_requests_show,
+static DEVICE_ATTR_RW(config_num_requests);
-                   config_num_requests_store);
 static ssize_t config_sync_direct_store(struct device *dev,
                                        struct device_attribute *attr,
@@ -411,8 +411,7 @@ static ssize_t config_sync_direct_show(struct device *dev,
 {
        return test_dev_config_show_bool(buf, test_fw_config->sync_direct);
 }
-static DEVICE_ATTR(config_sync_direct, 0644, config_sync_direct_show,
+static DEVICE_ATTR_RW(config_sync_direct);
-                   config_sync_direct_store);
 static ssize_t config_send_uevent_store(struct device *dev,
                                        struct device_attribute *attr,
@@ -428,8 +427,7 @@ static ssize_t config_send_uevent_show(struct device *dev,
 {
        return test_dev_config_show_bool(buf, test_fw_config->send_uevent);
 }
-static DEVICE_ATTR(config_send_uevent, 0644, config_send_uevent_show,
+static DEVICE_ATTR_RW(config_send_uevent);
-                   config_send_uevent_store);
 static ssize_t config_read_fw_idx_store(struct device *dev,
                                        struct device_attribute *attr,
@@ -445,8 +443,7 @@ static ssize_t config_read_fw_idx_show(struct device *dev,
 {
        return test_dev_config_show_u8(buf, test_fw_config->read_fw_idx);
 }
-static DEVICE_ATTR(config_read_fw_idx, 0644, config_read_fw_idx_show,
+static DEVICE_ATTR_RW(config_read_fw_idx);
-                   config_read_fw_idx_store);
 static ssize_t trigger_request_store(struct device *dev,
diff --git a/lib/test_kmod.c b/lib/test_kmod.c
index 337f408b4de6..e372b97eee13 100644
--- a/lib/test_kmod.c
+++ b/lib/test_kmod.c
@@ -694,8 +694,7 @@ static ssize_t config_test_driver_show(struct device *dev,
        return config_test_show_str(&test_dev->config_mutex, buf,
                                    config->test_driver);
 }
-static DEVICE_ATTR(config_test_driver, 0644, config_test_driver_show,
+static DEVICE_ATTR_RW(config_test_driver);
-                   config_test_driver_store);
 static ssize_t config_test_fs_store(struct device *dev,
                                    struct device_attribute *attr,
@@ -726,8 +725,7 @@ static ssize_t config_test_fs_show(struct device *dev,
        return config_test_show_str(&test_dev->config_mutex, buf,
                                    config->test_fs);
 }
-static DEVICE_ATTR(config_test_fs, 0644, config_test_fs_show,
+static DEVICE_ATTR_RW(config_test_fs);
-                   config_test_fs_store);
 static int trigger_config_run_type(struct kmod_test_device *test_dev,
                                   enum kmod_test_case test_case,
@@ -1012,8 +1010,7 @@ static ssize_t config_num_threads_show(struct device *dev,
        return test_dev_config_show_int(test_dev, buf, config->num_threads);
 }
-static DEVICE_ATTR(config_num_threads, 0644, config_num_threads_show,
+static DEVICE_ATTR_RW(config_num_threads);
-                   config_num_threads_store);
 static ssize_t config_test_case_store(struct device *dev,
                                      struct device_attribute *attr,
@@ -1037,8 +1034,7 @@ static ssize_t config_test_case_show(struct device *dev,
        return test_dev_config_show_uint(test_dev, buf, config->test_case);
 }
-static DEVICE_ATTR(config_test_case, 0644, config_test_case_show,
+static DEVICE_ATTR_RW(config_test_case);
-                   config_test_case_store);
 static ssize_t test_result_show(struct device *dev,
                                struct device_attribute *attr,
@@ -1049,7 +1045,7 @@ static ssize_t test_result_show(struct device *dev,
        return test_dev_config_show_int(test_dev, buf, config->test_result);
 }
-static DEVICE_ATTR(test_result, 0644, test_result_show, test_result_store);
+static DEVICE_ATTR_RW(test_result);
 #define TEST_KMOD_DEV_ATTR(name)                &dev_attr_##name.attr
diff --git a/samples/kobject/kobject-example.c b/samples/kobject/kobject-example.c
index 2e0740f06cd7..9e383fdbaa00 100644
--- a/samples/kobject/kobject-example.c
+++ b/samples/kobject/kobject-example.c
@@ -1,11 +1,9 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
 * Sample kobject implementation
 *
 * Copyright (C) 2004-2007 Greg Kroah-Hartman <greg@kroah.com>
 * Copyright (C) 2007 Novell Inc.
- *
- * Released under the GPL version 2 only.
- *
 */
 #include <linux/kobject.h>
 #include <linux/string.h>
diff --git a/samples/kobject/kset-example.c b/samples/kobject/kset-example.c
index a55bff52bde3..401328fd687d 100644
--- a/samples/kobject/kset-example.c
+++ b/samples/kobject/kset-example.c
@@ -1,11 +1,9 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
 * Sample kset and ktype implementation
 *
 * Copyright (C) 2004-2007 Greg Kroah-Hartman <greg@kroah.com>
 * Copyright (C) 2007 Novell Inc.
- *
- * Released under the GPL version 2 only.
- *
 */
 #include <linux/kobject.h>
 #include <linux/string.h>
diff --git a/sound/soc/omap/mcbsp.c b/sound/soc/omap/mcbsp.c
index 7a54e3083203..79d4dc785e5c 100644
--- a/sound/soc/omap/mcbsp.c
+++ b/sound/soc/omap/mcbsp.c
@@ -854,7 +854,7 @@ unlock:
        return size;
 }
-static DEVICE_ATTR(dma_op_mode, 0644, dma_op_mode_show, dma_op_mode_store);
+static DEVICE_ATTR_RW(dma_op_mode);
 static const struct attribute *additional_attrs[] = {
        &dev_attr_max_tx_thres.attr,
@@ -923,7 +923,7 @@ out:
        return size;
 }
-static DEVICE_ATTR(st_taps, 0644, st_taps_show, st_taps_store);
+static DEVICE_ATTR_RW(st_taps);
 static const struct attribute *sidetone_attrs[] = {
        &dev_attr_st_taps.attr,
diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c
index e91879569a0f..88efc84f3e7b 100644
--- a/sound/soc/soc-core.c
+++ b/sound/soc/soc-core.c
@@ -173,7 +173,7 @@ static ssize_t codec_reg_show(struct device *dev,
        return soc_codec_reg_show(rtd->codec, buf, PAGE_SIZE, 0);
 }
-static DEVICE_ATTR(codec_reg, 0444, codec_reg_show, NULL);
+static DEVICE_ATTR_RO(codec_reg);
 static ssize_t pmdown_time_show(struct device *dev,
                                struct device_attribute *attr, char *buf)
diff --git a/sound/soc/soc-dapm.c b/sound/soc/soc-dapm.c
index a10b21cfc31e..d1977ced895f 100644
--- a/sound/soc/soc-dapm.c
+++ b/sound/soc/soc-dapm.c
@@ -2364,7 +2364,7 @@ static ssize_t dapm_widget_show(struct device *dev,
        return count;
 }
-static DEVICE_ATTR(dapm_widget, 0444, dapm_widget_show, NULL);
+static DEVICE_ATTR_RO(dapm_widget);
 struct attribute *soc_dapm_dev_attrs[] = {
        &dev_attr_dapm_widget.attr,
diff --git a/tools/testing/selftests/firmware/fw_fallback.sh b/tools/testing/selftests/firmware/fw_fallback.sh
index 34a42c68ebfb..722cad91df74 100755
--- a/tools/testing/selftests/firmware/fw_fallback.sh
+++ b/tools/testing/selftests/firmware/fw_fallback.sh
@@ -175,96 +175,118 @@ trap "test_finish" EXIT
 echo "ABCD0123" >"$FW"
 NAME=$(basename "$FW")
-DEVPATH="$DIR"/"nope-$NAME"/loading
+test_syfs_timeout()
+{
-# Test failure when doing nothing (timeout works).
+        DEVPATH="$DIR"/"nope-$NAME"/loading
-echo -n 2 >/sys/class/firmware/timeout
-echo -n "nope-$NAME" >"$DIR"/trigger_request 2>/dev/null &
+        # Test failure when doing nothing (timeout works).
+        echo -n 2 >/sys/class/firmware/timeout
-# Give the kernel some time to load the loading file, must be less
+        echo -n "nope-$NAME" >"$DIR"/trigger_request 2>/dev/null &
-# than the timeout above.
-sleep 1
+        # Give the kernel some time to load the loading file, must be less
-if [ ! -f $DEVPATH ]; then
+        # than the timeout above.
-        echo "$0: fallback mechanism immediately cancelled"
+        sleep 1
-        echo ""
+        if [ ! -f $DEVPATH ]; then
-        echo "The file never appeared: $DEVPATH"
+                echo "$0: fallback mechanism immediately cancelled"
-        echo ""
+                echo ""
-        echo "This might be a distribution udev rule setup by your distribution"
+                echo "The file never appeared: $DEVPATH"
-        echo "to immediately cancel all fallback requests, this must be"
+                echo ""
-        echo "removed before running these tests. To confirm look for"
+                echo "This might be a distribution udev rule setup by your distribution"
-        echo "a firmware rule like /lib/udev/rules.d/50-firmware.rules"
+                echo "to immediately cancel all fallback requests, this must be"
-        echo "and see if you have something like this:"
+                echo "removed before running these tests. To confirm look for"
-        echo ""
+                echo "a firmware rule like /lib/udev/rules.d/50-firmware.rules"
-        echo "SUBSYSTEM==\"firmware\", ACTION==\"add\", ATTR{loading}=\"-1\""
+                echo "and see if you have something like this:"
-        echo ""
+                echo ""
-        echo "If you do remove this file or comment out this line before"
+                echo "SUBSYSTEM==\"firmware\", ACTION==\"add\", ATTR{loading}=\"-1\""
-        echo "proceeding with these tests."
+                echo ""
-        exit 1
+                echo "If you do remove this file or comment out this line before"
-fi
+                echo "proceeding with these tests."
+                exit 1
-if diff -q "$FW" /dev/test_firmware >/dev/null ; then
+        fi
-        echo "$0: firmware was not expected to match" >&2
-        exit 1
-else
-        echo "$0: timeout works"
-fi
-# Put timeout high enough for us to do work but not so long that failures
-# slow down this test too much.
-echo 4 >/sys/class/firmware/timeout
-# Load this script instead of the desired firmware.
+        if diff -q "$FW" /dev/test_firmware >/dev/null ; then
-load_fw "$NAME" "$0"
+                echo "$0: firmware was not expected to match" >&2
-if diff -q "$FW" /dev/test_firmware >/dev/null ; then
+                exit 1
-        echo "$0: firmware was not expected to match" >&2
+        else
-        exit 1
+                echo "$0: timeout works"
-else
+        fi
-        echo "$0: firmware comparison works"
+}
-fi
-# Do a proper load, which should work correctly.
+run_sysfs_main_tests()
-load_fw "$NAME" "$FW"
+{
-if ! diff -q "$FW" /dev/test_firmware >/dev/null ; then
+        test_syfs_timeout
-        echo "$0: firmware was not loaded" >&2
+        # Put timeout high enough for us to do work but not so long that failures
-        exit 1
+        # slow down this test too much.
-else
+        echo 4 >/sys/class/firmware/timeout
-        echo "$0: fallback mechanism works"
-fi
-load_fw_cancel "nope-$NAME" "$FW"
+        # Load this script instead of the desired firmware.
-if diff -q "$FW" /dev/test_firmware >/dev/null ; then
+        load_fw "$NAME" "$0"
-        echo "$0: firmware was expected to be cancelled" >&2
+        if diff -q "$FW" /dev/test_firmware >/dev/null ; then
-        exit 1
+                echo "$0: firmware was not expected to match" >&2
-else
+                exit 1
-        echo "$0: cancelling fallback mechanism works"
+        else
-fi
+                echo "$0: firmware comparison works"
+        fi
-if load_fw_custom "$NAME" "$FW" ; then
+        # Do a proper load, which should work correctly.
+        load_fw "$NAME" "$FW"
        if ! diff -q "$FW" /dev/test_firmware >/dev/null ; then
                echo "$0: firmware was not loaded" >&2
                exit 1
        else
-                echo "$0: custom fallback loading mechanism works"
+                echo "$0: fallback mechanism works"
        fi
-fi
-if load_fw_custom_cancel "nope-$NAME" "$FW" ; then
+        load_fw_cancel "nope-$NAME" "$FW"
        if diff -q "$FW" /dev/test_firmware >/dev/null ; then
                echo "$0: firmware was expected to be cancelled" >&2
                exit 1
        else
-                echo "$0: cancelling custom fallback mechanism works"
+                echo "$0: cancelling fallback mechanism works"
        fi
-fi
-set +e
+        set +e
-load_fw_fallback_with_child "nope-signal-$NAME" "$FW"
+        load_fw_fallback_with_child "nope-signal-$NAME" "$FW"
-if [ "$?" -eq 0 ]; then
+        if [ "$?" -eq 0 ]; then
-        echo "$0: SIGCHLD on sync ignored as expected" >&2
+                echo "$0: SIGCHLD on sync ignored as expected" >&2
-else
+        else
-        echo "$0: error - sync firmware request cancelled due to SIGCHLD" >&2
+                echo "$0: error - sync firmware request cancelled due to SIGCHLD" >&2
-        exit 1
+                exit 1
-fi
+        fi
-set -e
+        set -e
+}
+run_sysfs_custom_load_tests()
+{
+        if load_fw_custom "$NAME" "$FW" ; then
+                if ! diff -q "$FW" /dev/test_firmware >/dev/null ; then
+                        echo "$0: firmware was not loaded" >&2
+                        exit 1
+                else
+                        echo "$0: custom fallback loading mechanism works"
+                fi
+        fi
+        if load_fw_custom "$NAME" "$FW" ; then
+                if ! diff -q "$FW" /dev/test_firmware >/dev/null ; then
+                        echo "$0: firmware was not loaded" >&2
+                        exit 1
+                else
+                        echo "$0: custom fallback loading mechanism works"
+                fi
+        fi
+        if load_fw_custom_cancel "nope-$NAME" "$FW" ; then
+                if diff -q "$FW" /dev/test_firmware >/dev/null ; then
+                        echo "$0: firmware was expected to be cancelled" >&2
+                        exit 1
+                else
+                        echo "$0: cancelling custom fallback mechanism works"
+                fi
+        fi
+}
+run_sysfs_main_tests
+run_sysfs_custom_load_tests
 exit 0
diff --git a/tools/testing/selftests/firmware/fw_filesystem.sh b/tools/testing/selftests/firmware/fw_filesystem.sh
index b1f20fef36c7..f9508e1a4058 100755
--- a/tools/testing/selftests/firmware/fw_filesystem.sh
+++ b/tools/testing/selftests/firmware/fw_filesystem.sh
@@ -45,7 +45,10 @@ test_finish()
        if [ "$HAS_FW_LOADER_USER_HELPER" = "yes" ]; then
                echo "$OLD_TIMEOUT" >/sys/class/firmware/timeout
        fi
-        echo -n "$OLD_PATH" >/sys/module/firmware_class/parameters/path
+        if [ "$OLD_FWPATH" = "" ]; then
+                OLD_FWPATH=" "
+        fi
+        echo -n "$OLD_FWPATH" >/sys/module/firmware_class/parameters/path
        rm -f "$FW"
        rmdir "$FWPATH"
 }