driver core: Convert some drivers to CLASS_ATTR_STRING

[safe/jmp/linux-2.6] / drivers / staging / asus_oled / asus_oled.c

diff --git a/drivers/staging/asus_oled/asus_oled.c b/drivers/staging/asus_oled/asus_oled.c
index 7d93f50..7ebecc9 100644 (file)
--- a/drivers/staging/asus_oled/asus_oled.c
+++ b/drivers/staging/asus_oled/asus_oled.c
@@ -770,15 +770,8 @@ static struct usb_driver oled_driver = {
        .id_table =     id_table,
 };
 
-static ssize_t version_show(struct class *dev,
-                           struct class_attribute *attr,
-                           char *buf)
-{
-       return sprintf(buf, ASUS_OLED_UNDERSCORE_NAME " %s\n",
-                      ASUS_OLED_VERSION);
-}
-
-static CLASS_ATTR(version, S_IRUGO, version_show, NULL);
+static CLASS_ATTR_STRING(version, S_IRUGO,
+                       ASUS_OLED_UNDERSCORE_NAME " " ASUS_OLED_VERSION);
 
 static int __init asus_oled_init(void)
 {
@@ -790,7 +783,7 @@ static int __init asus_oled_init(void)
                return PTR_ERR(oled_class);
        }
 
-       retval = class_create_file(oled_class, &class_attr_version);
+       retval = class_create_file(oled_class, &class_attr_version.attr);
        if (retval) {
                err("Error creating class version file");
                goto error;
@@ -812,7 +805,7 @@ error:
 
 static void __exit asus_oled_exit(void)
 {
-       class_remove_file(oled_class, &class_attr_version);
+       class_remove_file(oled_class, &class_attr_version.attr);
        class_destroy(oled_class);
 
        usb_deregister(&oled_driver);