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

Pull driver core / sysfs patches from Greg KH:
 "Here's the big driver core / sysfs update for 3.13-rc1.

  There's lots of dev_groups updates for different subsystems, as they
  all get slowly migrated over to the safe versions of the attribute
  groups (removing userspace races with the creation of the sysfs
  files.) Also in here are some kobject updates, devres expansions, and
  the first round of Tejun's sysfs reworking to enable it to be used by
  other subsystems as a backend for an in-kernel filesystem.

  All of these have been in linux-next for a while with no reported
  issues"

* tag 'driver-core-3.13-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core: (83 commits)
  sysfs: rename sysfs_assoc_lock and explain what it's about
  sysfs: use generic_file_llseek() for sysfs_file_operations
  sysfs: return correct error code on unimplemented mmap()
  mdio_bus: convert bus code to use dev_groups
  device: Make dev_WARN/dev_WARN_ONCE print device as well as driver name
  sysfs: separate out dup filename warning into a separate function
  sysfs: move sysfs_hash_and_remove() to fs/sysfs/dir.c
  sysfs: remove unused sysfs_get_dentry() prototype
  sysfs: honor bin_attr.attr.ignore_lockdep
  sysfs: merge sysfs_elem_bin_attr into sysfs_elem_attr
  devres: restore zeroing behavior of devres_alloc()
  sysfs: fix sysfs_write_file for bin file
  input: gameport: convert bus code to use dev_groups
  input: serio: remove bus usage of dev_attrs
  input: serio: use DEVICE_ATTR_RO()
  i2o: convert bus code to use dev_groups
  memstick: convert bus code to use dev_groups
  tifm: convert bus code to use dev_groups
  virtio: convert bus code to use dev_groups
  ipack: convert bus code to use dev_groups
  ...

2 files changed, 44 insertions, 32 deletions

diff --git a/drivers/pcmcia/at91_cf.c b/drivers/pcmcia/at91_cf.c
index b8f5acf02261..de24232c5191 100644
--- a/drivers/pcmcia/at91_cf.c
+++ b/drivers/pcmcia/at91_cf.c
@@ -245,7 +245,7 @@ static int at91_cf_dt_init(struct platform_device *pdev)
 }
 #endif
 
-static int __init at91_cf_probe(struct platform_device *pdev)
+static int at91_cf_probe(struct platform_device *pdev)
 {
         struct at91_cf_socket   *cf;
         struct at91_cf_data     *board = pdev->dev.platform_data;
@@ -354,7 +354,7 @@ fail0a:
         return status;
 }
 
-static int __exit at91_cf_remove(struct platform_device *pdev)
+static int at91_cf_remove(struct platform_device *pdev)
 {
         struct at91_cf_socket   *cf = platform_get_drvdata(pdev);
 
@@ -404,14 +404,13 @@ static struct platform_driver at91_cf_driver = {
                 .owner          = THIS_MODULE,
                 .of_match_table = of_match_ptr(at91_cf_dt_ids),
         },
-        .remove         = __exit_p(at91_cf_remove),
+        .probe          = at91_cf_probe,
+        .remove         = at91_cf_remove,
         .suspend        = at91_cf_suspend,
         .resume         = at91_cf_resume,
 };
 
-/*--------------------------------------------------------------------------*/
-
-module_platform_driver_probe(at91_cf_driver, at91_cf_probe);
+module_platform_driver(at91_cf_driver);
 
 MODULE_DESCRIPTION("AT91 Compact Flash Driver");
 MODULE_AUTHOR("David Brownell");
diff --git a/drivers/pcmcia/ds.c b/drivers/pcmcia/ds.c
index 2deacbb2ffdc..757119b87146 100644
--- a/drivers/pcmcia/ds.c
+++ b/drivers/pcmcia/ds.c
@@ -992,16 +992,17 @@ static ssize_t field##_show (struct device *dev, struct device_attribute *attr,
 {                                                                       \
         struct pcmcia_device *p_dev = to_pcmcia_dev(dev);               \
         return p_dev->test ? sprintf(buf, format, p_dev->field) : -ENODEV; \
-}
+}                                                                       \
+static DEVICE_ATTR_RO(field);
 
 #define pcmcia_device_stringattr(name, field)                                   \
 static ssize_t name##_show (struct device *dev, struct device_attribute *attr, char *buf)               \
 {                                                                       \
         struct pcmcia_device *p_dev = to_pcmcia_dev(dev);               \
         return p_dev->field ? sprintf(buf, "%s\n", p_dev->field) : -ENODEV; \
-}
+}                                                                       \
+static DEVICE_ATTR_RO(name);
 
-pcmcia_device_attr(func, socket, "0x%02x\n");
 pcmcia_device_attr(func_id, has_func_id, "0x%02x\n");
 pcmcia_device_attr(manf_id, has_manf_id, "0x%04x\n");
 pcmcia_device_attr(card_id, has_card_id, "0x%04x\n");
@@ -1010,8 +1011,16 @@ pcmcia_device_stringattr(prod_id2, prod_id[1]);
 pcmcia_device_stringattr(prod_id3, prod_id[2]);
 pcmcia_device_stringattr(prod_id4, prod_id[3]);
 
-static ssize_t pcmcia_show_resources(struct device *dev,
-                                     struct device_attribute *attr, char *buf)
+static ssize_t function_show(struct device *dev, struct device_attribute *attr,
+                             char *buf)
+{
+        struct pcmcia_device *p_dev = to_pcmcia_dev(dev);
+        return p_dev->socket ? sprintf(buf, "0x%02x\n", p_dev->func) : -ENODEV;
+}
+static DEVICE_ATTR_RO(function);
+
+static ssize_t resources_show(struct device *dev,
+                              struct device_attribute *attr, char *buf)
 {
         struct pcmcia_device *p_dev = to_pcmcia_dev(dev);
         char *str = buf;
@@ -1022,8 +1031,9 @@ static ssize_t pcmcia_show_resources(struct device *dev,
 
         return str - buf;
 }
+static DEVICE_ATTR_RO(resources);
 
-static ssize_t pcmcia_show_pm_state(struct device *dev, struct device_attribute *attr, char *buf)
+static ssize_t pm_state_show(struct device *dev, struct device_attribute *attr, char *buf)
 {
         struct pcmcia_device *p_dev = to_pcmcia_dev(dev);
 
@@ -1033,8 +1043,8 @@ static ssize_t pcmcia_show_pm_state(struct device *dev, struct device_attribute
                 return sprintf(buf, "on\n");
 }
 
-static ssize_t pcmcia_store_pm_state(struct device *dev, struct device_attribute *attr,
-                                     const char *buf, size_t count)
+static ssize_t pm_state_store(struct device *dev, struct device_attribute *attr,
+                              const char *buf, size_t count)
 {
         struct pcmcia_device *p_dev = to_pcmcia_dev(dev);
         int ret = 0;
@@ -1049,7 +1059,7 @@ static ssize_t pcmcia_store_pm_state(struct device *dev, struct device_attribute
 
         return ret ? ret : count;
 }
-
+static DEVICE_ATTR_RW(pm_state);
 
 static ssize_t modalias_show(struct device *dev, struct device_attribute *attr, char *buf)
 {
@@ -1072,8 +1082,9 @@ static ssize_t modalias_show(struct device *dev, struct device_attribute *attr,
                                 p_dev->func, p_dev->device_no,
                                 hash[0], hash[1], hash[2], hash[3]);
 }
+static DEVICE_ATTR_RO(modalias);
 
-static ssize_t pcmcia_store_allow_func_id_match(struct device *dev,
+static ssize_t allow_func_id_match_store(struct device *dev,
                 struct device_attribute *attr, const char *buf, size_t count)
 {
         struct pcmcia_device *p_dev = to_pcmcia_dev(dev);
@@ -1088,22 +1099,24 @@ static ssize_t pcmcia_store_allow_func_id_match(struct device *dev,
 
         return count;
 }
-
-static struct device_attribute pcmcia_dev_attrs[] = {
-        __ATTR(function, 0444, func_show, NULL),
-        __ATTR(pm_state, 0644, pcmcia_show_pm_state, pcmcia_store_pm_state),
-        __ATTR(resources, 0444, pcmcia_show_resources, NULL),
-        __ATTR_RO(func_id),
-        __ATTR_RO(manf_id),
-        __ATTR_RO(card_id),
-        __ATTR_RO(prod_id1),
-        __ATTR_RO(prod_id2),
-        __ATTR_RO(prod_id3),
-        __ATTR_RO(prod_id4),
-        __ATTR_RO(modalias),
-        __ATTR(allow_func_id_match, 0200, NULL, pcmcia_store_allow_func_id_match),
-        __ATTR_NULL,
+static DEVICE_ATTR_WO(allow_func_id_match);
+
+static struct attribute *pcmcia_dev_attrs[] = {
+        &dev_attr_resources.attr,
+        &dev_attr_pm_state.attr,
+        &dev_attr_function.attr,
+        &dev_attr_func_id.attr,
+        &dev_attr_manf_id.attr,
+        &dev_attr_card_id.attr,
+        &dev_attr_prod_id1.attr,
+        &dev_attr_prod_id2.attr,
+        &dev_attr_prod_id3.attr,
+        &dev_attr_prod_id4.attr,
+        &dev_attr_modalias.attr,
+        &dev_attr_allow_func_id_match.attr,
+        NULL,
 };
+ATTRIBUTE_GROUPS(pcmcia_dev);
 
 /* PM support, also needed for reset */
 
@@ -1389,7 +1402,7 @@ struct bus_type pcmcia_bus_type = {
         .name = "pcmcia",
         .uevent = pcmcia_bus_uevent,
         .match = pcmcia_bus_match,
-        .dev_attrs = pcmcia_dev_attrs,
+        .dev_groups = pcmcia_dev_groups,
         .probe = pcmcia_device_probe,
         .remove = pcmcia_device_remove,
         .suspend = pcmcia_dev_suspend,