V4L/DVB (6293): V4L: convert struct class_device to struct device

The currently used "struct class_device" will be removed from the
kernel. Here is a patch that converts all users in drivers/media/video/
to struct device.

Reviewed-by: Thierry Merle <thierry.merle@free.fr>
Reviewed-by: Mike Isely <isely@pobox.com>
Reviewed-by: Luca Risolia <luca.risolia@studio.unibo.it>
Signed-off-by: Kay Sievers <kay.sievers@vrfy.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>

1 files changed, 18 insertions, 22 deletions

diff --git a/drivers/media/video/videodev.c b/drivers/media/video/videodev.c
index 0334b9aaf12..0fbe8a1a91b 100644
--- a/drivers/media/video/videodev.c
+++ b/drivers/media/video/videodev.c
@@ -54,15 +54,14 @@
  *      sysfs stuff
  */
 
-static ssize_t show_name(struct class_device *cd, char *buf)
+static ssize_t show_name(struct device *cd,
+                         struct device_attribute *attr, char *buf)
 {
         struct video_device *vfd = container_of(cd, struct video_device,
-                                                                class_dev);
-        return sprintf(buf,"%.*s\n",(int)sizeof(vfd->name),vfd->name);
+                                                class_dev);
+        return sprintf(buf, "%.*s\n", (int)sizeof(vfd->name), vfd->name);
 }
 
-static CLASS_DEVICE_ATTR(name, S_IRUGO, show_name, NULL);
-
 struct video_device *video_device_alloc(void)
 {
         struct video_device *vfd;
@@ -76,10 +75,9 @@ void video_device_release(struct video_device *vfd)
         kfree(vfd);
 }
 
-static void video_release(struct class_device *cd)
+static void video_release(struct device *cd)
 {
-        struct video_device *vfd = container_of(cd, struct video_device,
-                                                                class_dev);
+        struct video_device *vfd = container_of(cd, struct video_device, class_dev);
 
 #if 1
         /* needed until all drivers are fixed */
@@ -89,9 +87,15 @@ static void video_release(struct class_device *cd)
         vfd->release(vfd);
 }
 
+static struct device_attribute video_device_attrs[] = {
+        __ATTR(name, S_IRUGO, show_name, NULL),
+        __ATTR_NULL
+};
+
 static struct class video_class = {
         .name    = VIDEO_NAME,
-        .release = video_release,
+        .dev_attrs = video_device_attrs,
+        .dev_release = video_release,
 };
 
 /*
@@ -1753,22 +1757,16 @@ int video_register_device(struct video_device *vfd, int type, int nr)
         /* sysfs class */
         memset(&vfd->class_dev, 0x00, sizeof(vfd->class_dev));
         if (vfd->dev)
-                vfd->class_dev.dev = vfd->dev;
+                vfd->class_dev.parent = vfd->dev;
         vfd->class_dev.class       = &video_class;
         vfd->class_dev.devt        = MKDEV(VIDEO_MAJOR, vfd->minor);
-        sprintf(vfd->class_dev.class_id, "%s%d", name_base, i - base);
-        ret = class_device_register(&vfd->class_dev);
+        sprintf(vfd->class_dev.bus_id, "%s%d", name_base, i - base);
+        ret = device_register(&vfd->class_dev);
         if (ret < 0) {
-                printk(KERN_ERR "%s: class_device_register failed\n",
+                printk(KERN_ERR "%s: device_register failed\n",
                        __FUNCTION__);
                 goto fail_minor;
         }
-        ret = class_device_create_file(&vfd->class_dev, &class_device_attr_name);
-        if (ret < 0) {
-                printk(KERN_ERR "%s: class_device_create_file 'name' failed\n",
-                       __FUNCTION__);
-                goto fail_classdev;
-        }
 
 #if 1
         /* needed until all drivers are fixed */
@@ -1779,8 +1777,6 @@ int video_register_device(struct video_device *vfd, int type, int nr)
 #endif
         return 0;
 
-fail_classdev:
-        class_device_unregister(&vfd->class_dev);
 fail_minor:
         mutex_lock(&videodev_lock);
         video_device[vfd->minor] = NULL;
@@ -1804,7 +1800,7 @@ void video_unregister_device(struct video_device *vfd)
                 panic("videodev: bad unregister");
 
         video_device[vfd->minor]=NULL;
-        class_device_unregister(&vfd->class_dev);
+        device_unregister(&vfd->class_dev);
         mutex_unlock(&videodev_lock);
 }