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
  ...

3 files changed, 62 insertions, 60 deletions

diff --git a/drivers/misc/c2port/core.c b/drivers/misc/c2port/core.c
index f32550a74bdd..464419b36440 100644
--- a/drivers/misc/c2port/core.c
+++ b/drivers/misc/c2port/core.c
@@ -311,6 +311,7 @@ static ssize_t c2port_show_name(struct device *dev,
 
         return sprintf(buf, "%s\n", c2dev->name);
 }
+static DEVICE_ATTR(name, 0444, c2port_show_name, NULL);
 
 static ssize_t c2port_show_flash_blocks_num(struct device *dev,
                                 struct device_attribute *attr, char *buf)
@@ -320,6 +321,7 @@ static ssize_t c2port_show_flash_blocks_num(struct device *dev,
 
         return sprintf(buf, "%d\n", ops->blocks_num);
 }
+static DEVICE_ATTR(flash_blocks_num, 0444, c2port_show_flash_blocks_num, NULL);
 
 static ssize_t c2port_show_flash_block_size(struct device *dev,
                                 struct device_attribute *attr, char *buf)
@@ -329,6 +331,7 @@ static ssize_t c2port_show_flash_block_size(struct device *dev,
 
         return sprintf(buf, "%d\n", ops->block_size);
 }
+static DEVICE_ATTR(flash_block_size, 0444, c2port_show_flash_block_size, NULL);
 
 static ssize_t c2port_show_flash_size(struct device *dev,
                                 struct device_attribute *attr, char *buf)
@@ -338,18 +341,18 @@ static ssize_t c2port_show_flash_size(struct device *dev,
 
         return sprintf(buf, "%d\n", ops->blocks_num * ops->block_size);
 }
+static DEVICE_ATTR(flash_size, 0444, c2port_show_flash_size, NULL);
 
-static ssize_t c2port_show_access(struct device *dev,
-                                struct device_attribute *attr, char *buf)
+static ssize_t access_show(struct device *dev, struct device_attribute *attr,
+                           char *buf)
 {
         struct c2port_device *c2dev = dev_get_drvdata(dev);
 
         return sprintf(buf, "%d\n", c2dev->access);
 }
 
-static ssize_t c2port_store_access(struct device *dev,
-                                struct device_attribute *attr,
-                                const char *buf, size_t count)
+static ssize_t access_store(struct device *dev, struct device_attribute *attr,
+                            const char *buf, size_t count)
 {
         struct c2port_device *c2dev = dev_get_drvdata(dev);
         struct c2port_ops *ops = c2dev->ops;
@@ -375,6 +378,7 @@ static ssize_t c2port_store_access(struct device *dev,
 
         return count;
 }
+static DEVICE_ATTR_RW(access);
 
 static ssize_t c2port_store_reset(struct device *dev,
                                 struct device_attribute *attr,
@@ -395,6 +399,7 @@ static ssize_t c2port_store_reset(struct device *dev,
 
         return count;
 }
+static DEVICE_ATTR(reset, 0200, NULL, c2port_store_reset);
 
 static ssize_t __c2port_show_dev_id(struct c2port_device *dev, char *buf)
 {
@@ -431,6 +436,7 @@ static ssize_t c2port_show_dev_id(struct device *dev,
 
         return ret;
 }
+static DEVICE_ATTR(dev_id, 0444, c2port_show_dev_id, NULL);
 
 static ssize_t __c2port_show_rev_id(struct c2port_device *dev, char *buf)
 {
@@ -467,6 +473,7 @@ static ssize_t c2port_show_rev_id(struct device *dev,
 
         return ret;
 }
+static DEVICE_ATTR(rev_id, 0444, c2port_show_rev_id, NULL);
 
 static ssize_t c2port_show_flash_access(struct device *dev,
                                 struct device_attribute *attr, char *buf)
@@ -536,6 +543,8 @@ static ssize_t c2port_store_flash_access(struct device *dev,
 
         return count;
 }
+static DEVICE_ATTR(flash_access, 0644, c2port_show_flash_access,
+                   c2port_store_flash_access);
 
 static ssize_t __c2port_write_flash_erase(struct c2port_device *dev)
 {
@@ -616,6 +625,7 @@ static ssize_t c2port_store_flash_erase(struct device *dev,
 
         return count;
 }
+static DEVICE_ATTR(flash_erase, 0200, NULL, c2port_store_flash_erase);
 
 static ssize_t __c2port_read_flash_data(struct c2port_device *dev,
                                 char *buffer, loff_t offset, size_t count)
@@ -846,35 +856,40 @@ static ssize_t c2port_write_flash_data(struct file *filp, struct kobject *kobj,
 
         return ret;
 }
+/* size is computed at run-time */
+static BIN_ATTR(flash_data, 0644, c2port_read_flash_data,
+                c2port_write_flash_data, 0);
 
 /*
  * Class attributes
  */
+static struct attribute *c2port_attrs[] = {
+        &dev_attr_name.attr,
+        &dev_attr_flash_blocks_num.attr,
+        &dev_attr_flash_block_size.attr,
+        &dev_attr_flash_size.attr,
+        &dev_attr_access.attr,
+        &dev_attr_reset.attr,
+        &dev_attr_dev_id.attr,
+        &dev_attr_rev_id.attr,
+        &dev_attr_flash_access.attr,
+        &dev_attr_flash_erase.attr,
+        NULL,
+};
 
-static struct device_attribute c2port_attrs[] = {
-        __ATTR(name, 0444, c2port_show_name, NULL),
-        __ATTR(flash_blocks_num, 0444, c2port_show_flash_blocks_num, NULL),
-        __ATTR(flash_block_size, 0444, c2port_show_flash_block_size, NULL),
-        __ATTR(flash_size, 0444, c2port_show_flash_size, NULL),
-        __ATTR(access, 0644, c2port_show_access, c2port_store_access),
-        __ATTR(reset, 0200, NULL, c2port_store_reset),
-        __ATTR(dev_id, 0444, c2port_show_dev_id, NULL),
-        __ATTR(rev_id, 0444, c2port_show_rev_id, NULL),
-
-        __ATTR(flash_access, 0644, c2port_show_flash_access,
-                                        c2port_store_flash_access),
-        __ATTR(flash_erase, 0200, NULL, c2port_store_flash_erase),
-        __ATTR_NULL,
+static struct bin_attribute *c2port_bin_attrs[] = {
+        &bin_attr_flash_data,
+        NULL,
 };
 
-static struct bin_attribute c2port_bin_attrs = {
-        .attr   = {
-                .name   = "flash_data",
-                .mode   = 0644
-        },
-        .read   = c2port_read_flash_data,
-        .write  = c2port_write_flash_data,
-        /* .size is computed at run-time */
+static const struct attribute_group c2port_group = {
+        .attrs = c2port_attrs,
+        .bin_attrs = c2port_bin_attrs,
+};
+
+static const struct attribute_group *c2port_groups[] = {
+        &c2port_group,
+        NULL,
 };
 
 /*
@@ -907,6 +922,8 @@ struct c2port_device *c2port_device_register(char *name,
                 goto error_idr_alloc;
         c2dev->id = ret;
 
+        bin_attr_flash_data.size = ops->blocks_num * ops->block_size;
+
         c2dev->dev = device_create(c2port_class, NULL, 0, c2dev,
                                    "c2port%d", c2dev->id);
         if (unlikely(IS_ERR(c2dev->dev))) {
@@ -919,12 +936,6 @@ struct c2port_device *c2port_device_register(char *name,
         c2dev->ops = ops;
         mutex_init(&c2dev->mutex);
 
-        /* Create binary file */
-        c2port_bin_attrs.size = ops->blocks_num * ops->block_size;
-        ret = device_create_bin_file(c2dev->dev, &c2port_bin_attrs);
-        if (unlikely(ret))
-                goto error_device_create_bin_file;
-
         /* By default C2 port access is off */
         c2dev->access = c2dev->flash_access = 0;
         ops->access(c2dev, 0);
@@ -937,9 +948,6 @@ struct c2port_device *c2port_device_register(char *name,
 
         return c2dev;
 
-error_device_create_bin_file:
-        device_destroy(c2port_class, 0);
-
 error_device_create:
         spin_lock_irq(&c2port_idr_lock);
         idr_remove(&c2port_idr, c2dev->id);
@@ -959,7 +967,6 @@ void c2port_device_unregister(struct c2port_device *c2dev)
 
         dev_info(c2dev->dev, "C2 port %s removed\n", c2dev->name);
 
-        device_remove_bin_file(c2dev->dev, &c2port_bin_attrs);
         spin_lock_irq(&c2port_idr_lock);
         idr_remove(&c2port_idr, c2dev->id);
         spin_unlock_irq(&c2port_idr_lock);
@@ -984,7 +991,7 @@ static int __init c2port_init(void)
                 printk(KERN_ERR "c2port: failed to allocate class\n");
                 return PTR_ERR(c2port_class);
         }
-        c2port_class->dev_attrs = c2port_attrs;
+        c2port_class->dev_groups = c2port_groups;
 
         return 0;
 }
diff --git a/drivers/misc/enclosure.c b/drivers/misc/enclosure.c
index 00e5fcac8fdf..0e8df41aaf14 100644
--- a/drivers/misc/enclosure.c
+++ b/drivers/misc/enclosure.c
@@ -239,7 +239,7 @@ static void enclosure_component_release(struct device *dev)
         put_device(dev->parent);
 }
 
-static const struct attribute_group *enclosure_groups[];
+static const struct attribute_group *enclosure_component_groups[];
 
 /**
  * enclosure_component_register - add a particular component to an enclosure
@@ -282,7 +282,7 @@ enclosure_component_register(struct enclosure_device *edev,
                 dev_set_name(cdev, "%u", number);
 
         cdev->release = enclosure_component_release;
-        cdev->groups = enclosure_groups;
+        cdev->groups = enclosure_component_groups;
 
         err = device_register(cdev);
         if (err) {
@@ -365,25 +365,26 @@ EXPORT_SYMBOL_GPL(enclosure_remove_device);
  * sysfs pieces below
  */
 
-static ssize_t enclosure_show_components(struct device *cdev,
-                                         struct device_attribute *attr,
-                                         char *buf)
+static ssize_t components_show(struct device *cdev,
+                               struct device_attribute *attr, char *buf)
 {
         struct enclosure_device *edev = to_enclosure_device(cdev);
 
         return snprintf(buf, 40, "%d\n", edev->components);
 }
+static DEVICE_ATTR_RO(components);
 
-static struct device_attribute enclosure_attrs[] = {
-        __ATTR(components, S_IRUGO, enclosure_show_components, NULL),
-        __ATTR_NULL
+static struct attribute *enclosure_class_attrs[] = {
+        &dev_attr_components.attr,
+        NULL,
 };
+ATTRIBUTE_GROUPS(enclosure_class);
 
 static struct class enclosure_class = {
         .name                   = "enclosure",
         .owner                  = THIS_MODULE,
         .dev_release            = enclosure_release,
-        .dev_attrs              = enclosure_attrs,
+        .dev_groups             = enclosure_class_groups,
 };
 
 static const char *const enclosure_status [] = {
@@ -536,15 +537,7 @@ static struct attribute *enclosure_component_attrs[] = {
         &dev_attr_type.attr,
         NULL
 };
-
-static struct attribute_group enclosure_group = {
-        .attrs = enclosure_component_attrs,
-};
-
-static const struct attribute_group *enclosure_groups[] = {
-        &enclosure_group,
-        NULL
-};
+ATTRIBUTE_GROUPS(enclosure_component);
 
 static int __init enclosure_init(void)
 {
diff --git a/drivers/misc/mei/bus.c b/drivers/misc/mei/bus.c
index a150a42ed4af..6d0282c08a06 100644
--- a/drivers/misc/mei/bus.c
+++ b/drivers/misc/mei/bus.c
@@ -108,11 +108,13 @@ static ssize_t modalias_show(struct device *dev, struct device_attribute *a,
 
         return (len >= PAGE_SIZE) ? (PAGE_SIZE - 1) : len;
 }
+static DEVICE_ATTR_RO(modalias);
 
-static struct device_attribute mei_cl_dev_attrs[] = {
-        __ATTR_RO(modalias),
-        __ATTR_NULL,
+static struct attribute *mei_cl_dev_attrs[] = {
+        &dev_attr_modalias.attr,
+        NULL,
 };
+ATTRIBUTE_GROUPS(mei_cl_dev);
 
 static int mei_cl_uevent(struct device *dev, struct kobj_uevent_env *env)
 {
@@ -124,7 +126,7 @@ static int mei_cl_uevent(struct device *dev, struct kobj_uevent_env *env)
 
 static struct bus_type mei_cl_bus_type = {
         .name           = "mei",
-        .dev_attrs      = mei_cl_dev_attrs,
+        .dev_groups     = mei_cl_dev_groups,
         .match          = mei_cl_device_match,
         .probe          = mei_cl_device_probe,
         .remove         = mei_cl_device_remove,