Merge tag 'driver-core-3.12-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core

Pull driver core patches from Greg KH:
 "Here's the big driver core pull request for 3.12-rc1.

  Lots of tiny changes here fixing up the way sysfs attributes are
  created, to try to make drivers simpler, and fix a whole class race
  conditions with creations of device attributes after the device was
  announced to userspace.

  All the various pieces are acked by the different subsystem
  maintainers"

* tag 'driver-core-3.12-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core: (119 commits)
  firmware loader: fix pending_fw_head list corruption
  drivers/base/memory.c: introduce help macro to_memory_block
  dynamic debug: line queries failing due to uninitialized local variable
  sysfs: sysfs_create_groups returns a value.
  debugfs: provide debugfs_create_x64() when disabled
  rbd: convert bus code to use bus_groups
  firmware: dcdbas: use binary attribute groups
  sysfs: add sysfs_create/remove_groups for when SYSFS is not enabled
  driver core: add #include <linux/sysfs.h> to core files.
  HID: convert bus code to use dev_groups
  Input: serio: convert bus code to use drv_groups
  Input: gameport: convert bus code to use drv_groups
  driver core: firmware: use __ATTR_RW()
  driver core: core: use DEVICE_ATTR_RO
  driver core: bus: use DRIVER_ATTR_WO()
  driver core: create write-only attribute macros for devices and drivers
  sysfs: create __ATTR_WO()
  driver-core: platform: convert bus code to use dev_groups
  workqueue: convert bus code to use dev_groups
  MEI: convert bus code to use dev_groups
  ...

1 files changed, 2 insertions, 17 deletions

diff --git a/drivers/firmware/dcdbas.c b/drivers/firmware/dcdbas.c
index 8e77c02edb24..ff080ee20197 100644
--- a/drivers/firmware/dcdbas.c
+++ b/drivers/firmware/dcdbas.c
@@ -535,11 +535,12 @@ static struct attribute *dcdbas_dev_attrs[] = {
 
 static struct attribute_group dcdbas_attr_group = {
         .attrs = dcdbas_dev_attrs,
+        .bin_attrs = dcdbas_bin_attrs,
 };
 
 static int dcdbas_probe(struct platform_device *dev)
 {
-        int i, error;
+        int error;
 
         host_control_action = HC_ACTION_NONE;
         host_control_smi_type = HC_SMITYPE_NONE;
@@ -555,18 +556,6 @@ static int dcdbas_probe(struct platform_device *dev)
         if (error)
                 return error;
 
-        for (i = 0; dcdbas_bin_attrs[i]; i++) {
-                error = sysfs_create_bin_file(&dev->dev.kobj,
-                                              dcdbas_bin_attrs[i]);
-                if (error) {
-                        while (--i >= 0)
-                                sysfs_remove_bin_file(&dev->dev.kobj,
-                                                      dcdbas_bin_attrs[i]);
-                        sysfs_remove_group(&dev->dev.kobj, &dcdbas_attr_group);
-                        return error;
-                }
-        }
-
         register_reboot_notifier(&dcdbas_reboot_nb);
 
         dev_info(&dev->dev, "%s (version %s)\n",
@@ -577,11 +566,7 @@ static int dcdbas_probe(struct platform_device *dev)
 
 static int dcdbas_remove(struct platform_device *dev)
 {
-        int i;
-
         unregister_reboot_notifier(&dcdbas_reboot_nb);
-        for (i = 0; dcdbas_bin_attrs[i]; i++)
-                sysfs_remove_bin_file(&dev->dev.kobj, dcdbas_bin_attrs[i]);
         sysfs_remove_group(&dev->dev.kobj, &dcdbas_attr_group);
 
         return 0;