driver core: Convert some drivers to CLASS_ATTR_STRING

Convert some drivers who export a single string as class attribute
to the new class_attr_string functions. This removes redundant
code all over.

Signed-off-by: Andi Kleen <ak@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

3 files changed, 11 insertions, 26 deletions

diff --git a/drivers/infiniband/core/ucm.c b/drivers/infiniband/core/ucm.c
index 02e209ff33fd..017d6e24448f 100644
--- a/drivers/infiniband/core/ucm.c
+++ b/drivers/infiniband/core/ucm.c
@@ -1336,13 +1336,8 @@ static void ib_ucm_remove_one(struct ib_device *device)
         device_unregister(&ucm_dev->dev);
 }
 
-static ssize_t show_abi_version(struct class *class,
-                                struct class_attribute *attr,
-                                char *buf)
-{
-        return sprintf(buf, "%d\n", IB_USER_CM_ABI_VERSION);
-}
-static CLASS_ATTR(abi_version, S_IRUGO, show_abi_version, NULL);
+static CLASS_ATTR_STRING(abi_version, S_IRUGO,
+                         __stringify(IB_USER_CM_ABI_VERSION));
 
 static int __init ib_ucm_init(void)
 {
@@ -1355,7 +1350,7 @@ static int __init ib_ucm_init(void)
                 goto error1;
         }
 
-        ret = class_create_file(&cm_class, &class_attr_abi_version);
+        ret = class_create_file(&cm_class, &class_attr_abi_version.attr);
         if (ret) {
                 printk(KERN_ERR "ucm: couldn't create abi_version attribute\n");
                 goto error2;
@@ -1369,7 +1364,7 @@ static int __init ib_ucm_init(void)
         return 0;
 
 error3:
-        class_remove_file(&cm_class, &class_attr_abi_version);
+        class_remove_file(&cm_class, &class_attr_abi_version.attr);
 error2:
         unregister_chrdev_region(IB_UCM_BASE_DEV, IB_UCM_MAX_DEVICES);
 error1:
@@ -1379,7 +1374,7 @@ error1:
 static void __exit ib_ucm_cleanup(void)
 {
         ib_unregister_client(&ucm_client);
-        class_remove_file(&cm_class, &class_attr_abi_version);
+        class_remove_file(&cm_class, &class_attr_abi_version.attr);
         unregister_chrdev_region(IB_UCM_BASE_DEV, IB_UCM_MAX_DEVICES);
         if (overflow_maj)
                 unregister_chrdev_region(overflow_maj, IB_UCM_MAX_DEVICES);
diff --git a/drivers/infiniband/core/user_mad.c b/drivers/infiniband/core/user_mad.c
index d0de8f265f45..04b585e86cb2 100644
--- a/drivers/infiniband/core/user_mad.c
+++ b/drivers/infiniband/core/user_mad.c
@@ -965,13 +965,8 @@ static ssize_t show_port(struct device *dev, struct device_attribute *attr,
 }
 static DEVICE_ATTR(port, S_IRUGO, show_port, NULL);
 
-static ssize_t show_abi_version(struct class *class,
-                                struct class_attribute *attr,
-                                char *buf)
-{
-        return sprintf(buf, "%d\n", IB_USER_MAD_ABI_VERSION);
-}
-static CLASS_ATTR(abi_version, S_IRUGO, show_abi_version, NULL);
+static CLASS_ATTR_STRING(abi_version, S_IRUGO,
+                         __stringify(IB_USER_MAD_ABI_VERSION));
 
 static dev_t overflow_maj;
 static DECLARE_BITMAP(overflow_map, IB_UMAD_MAX_PORTS);
@@ -1196,7 +1191,7 @@ static int __init ib_umad_init(void)
                 goto out_chrdev;
         }
 
-        ret = class_create_file(umad_class, &class_attr_abi_version);
+        ret = class_create_file(umad_class, &class_attr_abi_version.attr);
         if (ret) {
                 printk(KERN_ERR "user_mad: couldn't create abi_version attribute\n");
                 goto out_class;
diff --git a/drivers/infiniband/core/uverbs_main.c b/drivers/infiniband/core/uverbs_main.c
index 60879399207a..d805cf365c8d 100644
--- a/drivers/infiniband/core/uverbs_main.c
+++ b/drivers/infiniband/core/uverbs_main.c
@@ -691,13 +691,8 @@ static ssize_t show_dev_abi_version(struct device *device,
 }
 static DEVICE_ATTR(abi_version, S_IRUGO, show_dev_abi_version, NULL);
 
-static ssize_t show_abi_version(struct class *class,
-                                struct class_attribute *attr,
-                                char *buf)
-{
-        return sprintf(buf, "%d\n", IB_USER_VERBS_ABI_VERSION);
-}
-static CLASS_ATTR(abi_version, S_IRUGO, show_abi_version, NULL);
+static CLASS_ATTR_STRING(abi_version, S_IRUGO,
+                         __stringify(IB_USER_VERBS_ABI_VERSION));
 
 static dev_t overflow_maj;
 static DECLARE_BITMAP(overflow_map, IB_UVERBS_MAX_DEVICES);
@@ -843,7 +838,7 @@ static int __init ib_uverbs_init(void)
                 goto out_chrdev;
         }
 
-        ret = class_create_file(uverbs_class, &class_attr_abi_version);
+        ret = class_create_file(uverbs_class, &class_attr_abi_version.attr);
         if (ret) {
                 printk(KERN_ERR "user_verbs: couldn't create abi_version attribute\n");
                 goto out_class;