[PATCH] i4l gigaset: move sysfs entry to tty class device

Using the class device pointer returned by tty_register_device() with
part 1 of the patch, attach the Gigaset drivers' "cidmode" sysfs entry
to its tty class device, where it can be found more easily by users
who do not know nor care which USB port the device is attached to.

Signed-off-by: Hansjoerg Lipp <hjlipp@web.de>
Signed-off-by: Tilman Schmidt <tilman@imap.cc>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

1 files changed, 13 insertions, 8 deletions

diff --git a/drivers/isdn/gigaset/proc.c b/drivers/isdn/gigaset/proc.c
index d267a636b53c..9ae3a7f3e7b3 100644
--- a/drivers/isdn/gigaset/proc.c
+++ b/drivers/isdn/gigaset/proc.c
@@ -16,12 +16,11 @@
 #include "gigaset.h"
 #include <linux/ctype.h>
 
-static ssize_t show_cidmode(struct device *dev, struct device_attribute *attr,
-                            char *buf)
+static ssize_t show_cidmode(struct class_device *class, char *buf)
 {
         int ret;
         unsigned long flags;
-        struct cardstate *cs = dev_get_drvdata(dev);
+        struct cardstate *cs = class_get_devdata(class);
 
         spin_lock_irqsave(&cs->lock, flags);
         ret = sprintf(buf, "%u\n", cs->cidmode);
@@ -30,10 +29,10 @@ static ssize_t show_cidmode(struct device *dev, struct device_attribute *attr,
         return ret;
 }
 
-static ssize_t set_cidmode(struct device *dev, struct device_attribute *attr,
+static ssize_t set_cidmode(struct class_device *class,
                            const char *buf, size_t count)
 {
-        struct cardstate *cs = dev_get_drvdata(dev);
+        struct cardstate *cs = class_get_devdata(class);
         long int value;
         char *end;
 
@@ -65,18 +64,24 @@ static ssize_t set_cidmode(struct device *dev, struct device_attribute *attr,
         return count;
 }
 
-static DEVICE_ATTR(cidmode, S_IRUGO|S_IWUSR, show_cidmode, set_cidmode);
+static CLASS_DEVICE_ATTR(cidmode, S_IRUGO|S_IWUSR, show_cidmode, set_cidmode);
 
 /* free sysfs for device */
 void gigaset_free_dev_sysfs(struct cardstate *cs)
 {
+        if (!cs->class)
+                return;
+
         gig_dbg(DEBUG_INIT, "removing sysfs entries");
-        device_remove_file(cs->dev, &dev_attr_cidmode);
+        class_device_remove_file(cs->class, &class_device_attr_cidmode);
 }
 
 /* initialize sysfs for device */
 void gigaset_init_dev_sysfs(struct cardstate *cs)
 {
+        if (!cs->class)
+                return;
+
         gig_dbg(DEBUG_INIT, "setting up sysfs");
-        device_create_file(cs->dev, &dev_attr_cidmode);
+        class_device_create_file(cs->class, &class_device_attr_cidmode);
 }