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, 15 insertions, 12 deletions

diff --git a/kernel/workqueue.c b/kernel/workqueue.c
index e93f7b9067d8..5f8ee91abdff 100644
--- a/kernel/workqueue.c
+++ b/kernel/workqueue.c
@@ -3095,25 +3095,26 @@ static struct workqueue_struct *dev_to_wq(struct device *dev)
         return wq_dev->wq;
 }
 
-static ssize_t wq_per_cpu_show(struct device *dev,
-                               struct device_attribute *attr, char *buf)
+static ssize_t per_cpu_show(struct device *dev, struct device_attribute *attr,
+                            char *buf)
 {
         struct workqueue_struct *wq = dev_to_wq(dev);
 
         return scnprintf(buf, PAGE_SIZE, "%d\n", (bool)!(wq->flags & WQ_UNBOUND));
 }
+static DEVICE_ATTR_RO(per_cpu);
 
-static ssize_t wq_max_active_show(struct device *dev,
-                                  struct device_attribute *attr, char *buf)
+static ssize_t max_active_show(struct device *dev,
+                               struct device_attribute *attr, char *buf)
 {
         struct workqueue_struct *wq = dev_to_wq(dev);
 
         return scnprintf(buf, PAGE_SIZE, "%d\n", wq->saved_max_active);
 }
 
-static ssize_t wq_max_active_store(struct device *dev,
-                                   struct device_attribute *attr,
-                                   const char *buf, size_t count)
+static ssize_t max_active_store(struct device *dev,
+                                struct device_attribute *attr, const char *buf,
+                                size_t count)
 {
         struct workqueue_struct *wq = dev_to_wq(dev);
         int val;
@@ -3124,12 +3125,14 @@ static ssize_t wq_max_active_store(struct device *dev,
         workqueue_set_max_active(wq, val);
         return count;
 }
+static DEVICE_ATTR_RW(max_active);
 
-static struct device_attribute wq_sysfs_attrs[] = {
-        __ATTR(per_cpu, 0444, wq_per_cpu_show, NULL),
-        __ATTR(max_active, 0644, wq_max_active_show, wq_max_active_store),
-        __ATTR_NULL,
+static struct attribute *wq_sysfs_attrs[] = {
+        &dev_attr_per_cpu.attr,
+        &dev_attr_max_active.attr,
+        NULL,
 };
+ATTRIBUTE_GROUPS(wq_sysfs);
 
 static ssize_t wq_pool_ids_show(struct device *dev,
                                 struct device_attribute *attr, char *buf)
@@ -3279,7 +3282,7 @@ static struct device_attribute wq_sysfs_unbound_attrs[] = {
 
 static struct bus_type wq_subsys = {
         .name                           = "workqueue",
-        .dev_attrs                      = wq_sysfs_attrs,
+        .dev_groups                     = wq_sysfs_groups,
 };
 
 static int __init wq_sysfs_init(void)