Commit:     5f553388b06532b495681f5d6c8e8fbff64ea86a
Parent:     acb09af4e333dc92cdd32ae75ee7e5f3d7aaf60b
Author:     Kay Sievers <[EMAIL PROTECTED]>
AuthorDate: Wed Aug 15 14:00:09 2007 -0300
Committer:  Mauro Carvalho Chehab <[EMAIL PROTECTED]>
CommitDate: Tue Oct 9 22:05:11 2007 -0300

    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 <[EMAIL PROTECTED]>
    Signed-off-by: Michael Krufky <[EMAIL PROTECTED]>
    Signed-off-by: Mauro Carvalho Chehab <[EMAIL PROTECTED]>
 drivers/media/dvb/dvb-core/dvbdev.c |   13 ++++++-------
 1 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/drivers/media/dvb/dvb-core/dvbdev.c 
index 9ef0c00..0f18ce8 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;
@@ -242,10 +242,9 @@ int dvb_register_device(struct dvb_adapter *adap, struct 
dvb_device **pdvbdev,
-       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, 
+                              "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 
                       __FUNCTION__, adap->num, dnames[type], id, 
@@ -266,8 +265,8 @@ void dvb_unregister_device(struct dvb_device *dvbdev)
        if (!dvbdev)
-       class_device_destroy(dvb_class, MKDEV(DVB_MAJOR, 
-                                       dvbdev->type, dvbdev->id)));
+       device_destroy(dvb_class, MKDEV(DVB_MAJOR, 
+                      dvbdev->type, dvbdev->id)));
        list_del (&dvbdev->list_head);
        kfree (dvbdev->fops);
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at

Reply via email to