diff options
| author | Johannes Stezenbach <devnull@localhost> | 2005-07-01 23:19:48 +0000 |
|---|---|---|
| committer | Johannes Stezenbach <devnull@localhost> | 2005-07-01 23:19:48 +0000 |
| commit | 0a295872d208d8c18b7d7b3942078cce470569e0 (patch) | |
| tree | 844f81234ebe2b9c059db07ca69baafebdfcb10f | |
| parent | 838a5357110d7cf23543d0a3cf8134396d29a67a (diff) | |
| download | mediapointer-dvb-s2-0a295872d208d8c18b7d7b3942078cce470569e0.tar.gz mediapointer-dvb-s2-0a295872d208d8c18b7d7b3942078cce470569e0.tar.bz2 | |
from 2.6.13-rc1: class_simple is no more
| -rw-r--r-- | linux/drivers/media/dvb/dvb-core/dvbdev.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/linux/drivers/media/dvb/dvb-core/dvbdev.c b/linux/drivers/media/dvb/dvb-core/dvbdev.c index ff5844388..4b7adca3e 100644 --- a/linux/drivers/media/dvb/dvb-core/dvbdev.c +++ b/linux/drivers/media/dvb/dvb-core/dvbdev.c @@ -56,7 +56,7 @@ static const char * const dnames[] = { #define nums2minor(num,type,id) ((num << 6) | (id << 4) | type) #define MAX_DVB_MINORS (DVB_MAX_ADAPTERS*64) -static struct class_simple *dvb_class; +static struct class *dvb_class; static struct dvb_device* dvbdev_find_device (int minor) { @@ -235,8 +235,8 @@ int dvb_register_device(struct dvb_adapter *adap, struct dvb_device **pdvbdev, S_IFCHR | S_IRUSR | S_IWUSR, "dvb/adapter%d/%s%d", adap->num, dnames[type], id); - class_simple_device_add(dvb_class, MKDEV(DVB_MAJOR, nums2minor(adap->num, type, id)), - NULL, "dvb%d.%s%d", adap->num, dnames[type], id); + class_device_create(dvb_class, MKDEV(DVB_MAJOR, nums2minor(adap->num, type, id)), + NULL, "dvb%d.%s%d", adap->num, dnames[type], id); dprintk("DVB: register adapter%d/%s%d @ minor: %i (0x%02x)\n", adap->num, dnames[type], id, nums2minor(adap->num, type, id), @@ -255,7 +255,7 @@ void dvb_unregister_device(struct dvb_device *dvbdev) devfs_remove("dvb/adapter%d/%s%d", dvbdev->adapter->num, dnames[dvbdev->type], dvbdev->id); - class_simple_device_remove(MKDEV(DVB_MAJOR, nums2minor(dvbdev->adapter->num, + class_device_destroy(dvb_class, MKDEV(DVB_MAJOR, nums2minor(dvbdev->adapter->num, dvbdev->type, dvbdev->id))); list_del (&dvbdev->list_head); @@ -411,7 +411,7 @@ static int __init init_dvbdev(void) devfs_mk_dir("dvb"); - dvb_class = class_simple_create(THIS_MODULE, "dvb"); + dvb_class = class_create(THIS_MODULE, "dvb"); if (IS_ERR(dvb_class)) { retval = PTR_ERR(dvb_class); goto error; @@ -428,7 +428,7 @@ error: static void __exit exit_dvbdev(void) { devfs_remove("dvb"); - class_simple_destroy(dvb_class); + class_destroy(dvb_class); cdev_del(&dvb_device_cdev); unregister_chrdev_region(MKDEV(DVB_MAJOR, 0), MAX_DVB_MINORS); } |