[PATCH] class: convert the remaining class_simple users in the kernel to usee the new class api
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
parent
5cebfb759c
commit
1db560afe6
|
@ -61,7 +61,7 @@ unsigned long coda_timeout = 30; /* .. secs, then signals will dequeue */
|
|||
|
||||
|
||||
struct venus_comm coda_comms[MAX_CODADEVS];
|
||||
static struct class_simple *coda_psdev_class;
|
||||
static struct class *coda_psdev_class;
|
||||
|
||||
/*
|
||||
* Device operations
|
||||
|
@ -363,14 +363,14 @@ static int init_coda_psdev(void)
|
|||
CODA_PSDEV_MAJOR);
|
||||
return -EIO;
|
||||
}
|
||||
coda_psdev_class = class_simple_create(THIS_MODULE, "coda");
|
||||
coda_psdev_class = class_create(THIS_MODULE, "coda");
|
||||
if (IS_ERR(coda_psdev_class)) {
|
||||
err = PTR_ERR(coda_psdev_class);
|
||||
goto out_chrdev;
|
||||
}
|
||||
devfs_mk_dir ("coda");
|
||||
for (i = 0; i < MAX_CODADEVS; i++) {
|
||||
class_simple_device_add(coda_psdev_class, MKDEV(CODA_PSDEV_MAJOR,i),
|
||||
class_device_create(coda_psdev_class, MKDEV(CODA_PSDEV_MAJOR,i),
|
||||
NULL, "cfs%d", i);
|
||||
err = devfs_mk_cdev(MKDEV(CODA_PSDEV_MAJOR, i),
|
||||
S_IFCHR|S_IRUSR|S_IWUSR, "coda/%d", i);
|
||||
|
@ -382,8 +382,8 @@ static int init_coda_psdev(void)
|
|||
|
||||
out_class:
|
||||
for (i = 0; i < MAX_CODADEVS; i++)
|
||||
class_simple_device_remove(MKDEV(CODA_PSDEV_MAJOR, i));
|
||||
class_simple_destroy(coda_psdev_class);
|
||||
class_device_destroy(coda_psdev_class, MKDEV(CODA_PSDEV_MAJOR, i));
|
||||
class_destroy(coda_psdev_class);
|
||||
out_chrdev:
|
||||
unregister_chrdev(CODA_PSDEV_MAJOR, "coda");
|
||||
out:
|
||||
|
@ -425,10 +425,10 @@ static int __init init_coda(void)
|
|||
return 0;
|
||||
out:
|
||||
for (i = 0; i < MAX_CODADEVS; i++) {
|
||||
class_simple_device_remove(MKDEV(CODA_PSDEV_MAJOR, i));
|
||||
class_device_destroy(coda_psdev_class, MKDEV(CODA_PSDEV_MAJOR, i));
|
||||
devfs_remove("coda/%d", i);
|
||||
}
|
||||
class_simple_destroy(coda_psdev_class);
|
||||
class_destroy(coda_psdev_class);
|
||||
devfs_remove("coda");
|
||||
unregister_chrdev(CODA_PSDEV_MAJOR, "coda");
|
||||
coda_sysctl_clean();
|
||||
|
@ -447,10 +447,10 @@ static void __exit exit_coda(void)
|
|||
printk("coda: failed to unregister filesystem\n");
|
||||
}
|
||||
for (i = 0; i < MAX_CODADEVS; i++) {
|
||||
class_simple_device_remove(MKDEV(CODA_PSDEV_MAJOR, i));
|
||||
class_device_destroy(coda_psdev_class, MKDEV(CODA_PSDEV_MAJOR, i));
|
||||
devfs_remove("coda/%d", i);
|
||||
}
|
||||
class_simple_destroy(coda_psdev_class);
|
||||
class_destroy(coda_psdev_class);
|
||||
devfs_remove("coda");
|
||||
unregister_chrdev(CODA_PSDEV_MAJOR, "coda");
|
||||
coda_sysctl_clean();
|
||||
|
|
Loading…
Reference in New Issue