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

The currently used "struct class_device" will be removed from the
kernel. Here is a trivial patch that converts DVB to use struct device.

Signed-off-by: Kay Sievers <kay.sievers@vrfy.org>
Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>

1 files changed, 6 insertions, 7 deletions

diff --git a/drivers/media/dvb/dvb-core/dvbdev.c b/drivers/media/dvb/dvb-core/dvbdev.c
index 9ef0c00605ee..0f18ce8a9397 100644
--- a/drivers/media/dvb/dvb-core/dvbdev.c
+++ b/drivers/media/dvb/dvb-core/dvbdev.c
@@ -200,7 +200,7 @@ int dvb_register_device(struct dvb_adapter *adap, struct dvb_device **pdvbdev,
 {
         struct dvb_device *dvbdev;
         struct file_operations *dvbdevfops;
-        struct class_device *clsdev;
+        struct device *clsdev;
         int id;
 
         mutex_lock(&dvbdev_register_lock);
@@ -242,10 +242,9 @@ int dvb_register_device(struct dvb_adapter *adap, struct dvb_device **pdvbdev,
 
         mutex_unlock(&dvbdev_register_lock);
 
-        clsdev = class_device_create(dvb_class, NULL, MKDEV(DVB_MAJOR,
-                                     nums2minor(adap->num, type, id)),
-                                     adap->device, "dvb%d.%s%d", adap->num,
-                                     dnames[type], id);
+        clsdev = device_create(dvb_class, adap->device,
+                               MKDEV(DVB_MAJOR, nums2minor(adap->num, type, id)),
+                               "dvb%d.%s%d", adap->num, dnames[type], id);
         if (IS_ERR(clsdev)) {
                 printk(KERN_ERR "%s: failed to create device dvb%d.%s%d (%ld)\n",
                        __FUNCTION__, adap->num, dnames[type], id, PTR_ERR(clsdev));
@@ -266,8 +265,8 @@ void dvb_unregister_device(struct dvb_device *dvbdev)
         if (!dvbdev)
                 return;
 
-        class_device_destroy(dvb_class, MKDEV(DVB_MAJOR, nums2minor(dvbdev->adapter->num,
-                                        dvbdev->type, dvbdev->id)));
+        device_destroy(dvb_class, MKDEV(DVB_MAJOR, nums2minor(dvbdev->adapter->num,
+                       dvbdev->type, dvbdev->id)));
 
         list_del (&dvbdev->list_head);
         kfree (dvbdev->fops);