Commit 1db560af authored by gregkh@suse.de's avatar gregkh@suse.de Committed by Greg Kroah-Hartman
Browse files

[PATCH] class: convert the remaining class_simple users in the kernel to usee the new class api


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 5cebfb75
...@@ -61,7 +61,7 @@ unsigned long coda_timeout = 30; /* .. secs, then signals will dequeue */ ...@@ -61,7 +61,7 @@ unsigned long coda_timeout = 30; /* .. secs, then signals will dequeue */
struct venus_comm coda_comms[MAX_CODADEVS]; struct venus_comm coda_comms[MAX_CODADEVS];
static struct class_simple *coda_psdev_class; static struct class *coda_psdev_class;
/* /*
* Device operations * Device operations
...@@ -363,14 +363,14 @@ static int init_coda_psdev(void) ...@@ -363,14 +363,14 @@ static int init_coda_psdev(void)
CODA_PSDEV_MAJOR); CODA_PSDEV_MAJOR);
return -EIO; 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)) { if (IS_ERR(coda_psdev_class)) {
err = PTR_ERR(coda_psdev_class); err = PTR_ERR(coda_psdev_class);
goto out_chrdev; goto out_chrdev;
} }
devfs_mk_dir ("coda"); devfs_mk_dir ("coda");
for (i = 0; i < MAX_CODADEVS; i++) { 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); NULL, "cfs%d", i);
err = devfs_mk_cdev(MKDEV(CODA_PSDEV_MAJOR, i), err = devfs_mk_cdev(MKDEV(CODA_PSDEV_MAJOR, i),
S_IFCHR|S_IRUSR|S_IWUSR, "coda/%d", i); S_IFCHR|S_IRUSR|S_IWUSR, "coda/%d", i);
...@@ -382,8 +382,8 @@ static int init_coda_psdev(void) ...@@ -382,8 +382,8 @@ static int init_coda_psdev(void)
out_class: out_class:
for (i = 0; i < MAX_CODADEVS; i++) 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));
class_simple_destroy(coda_psdev_class); class_destroy(coda_psdev_class);
out_chrdev: out_chrdev:
unregister_chrdev(CODA_PSDEV_MAJOR, "coda"); unregister_chrdev(CODA_PSDEV_MAJOR, "coda");
out: out:
...@@ -425,10 +425,10 @@ static int __init init_coda(void) ...@@ -425,10 +425,10 @@ static int __init init_coda(void)
return 0; return 0;
out: out:
for (i = 0; i < MAX_CODADEVS; i++) { 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); devfs_remove("coda/%d", i);
} }
class_simple_destroy(coda_psdev_class); class_destroy(coda_psdev_class);
devfs_remove("coda"); devfs_remove("coda");
unregister_chrdev(CODA_PSDEV_MAJOR, "coda"); unregister_chrdev(CODA_PSDEV_MAJOR, "coda");
coda_sysctl_clean(); coda_sysctl_clean();
...@@ -447,10 +447,10 @@ static void __exit exit_coda(void) ...@@ -447,10 +447,10 @@ static void __exit exit_coda(void)
printk("coda: failed to unregister filesystem\n"); printk("coda: failed to unregister filesystem\n");
} }
for (i = 0; i < MAX_CODADEVS; i++) { 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); devfs_remove("coda/%d", i);
} }
class_simple_destroy(coda_psdev_class); class_destroy(coda_psdev_class);
devfs_remove("coda"); devfs_remove("coda");
unregister_chrdev(CODA_PSDEV_MAJOR, "coda"); unregister_chrdev(CODA_PSDEV_MAJOR, "coda");
coda_sysctl_clean(); coda_sysctl_clean();
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment