Commit d4a4b99a authored by Jan Harkes's avatar Jan Harkes Committed by Linus Torvalds

[PATCH] coda: rename coda_psdev to coda

Remove '_psdev' from the Coda sysfs device class name.
Signed-off-by: default avatarJan Harkes <jaharkes@cs.cmu.edu>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent ffd45504
...@@ -358,13 +358,12 @@ static struct file_operations coda_psdev_fops = { ...@@ -358,13 +358,12 @@ static struct file_operations coda_psdev_fops = {
static int init_coda_psdev(void) static int init_coda_psdev(void)
{ {
int i, err = 0; int i, err = 0;
if (register_chrdev(CODA_PSDEV_MAJOR,"coda_psdev", if (register_chrdev(CODA_PSDEV_MAJOR, "coda", &coda_psdev_fops)) {
&coda_psdev_fops)) {
printk(KERN_ERR "coda_psdev: unable to get major %d\n", printk(KERN_ERR "coda_psdev: unable to get major %d\n",
CODA_PSDEV_MAJOR); CODA_PSDEV_MAJOR);
return -EIO; return -EIO;
} }
coda_psdev_class = class_simple_create(THIS_MODULE, "coda_psdev"); coda_psdev_class = class_simple_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;
...@@ -386,7 +385,7 @@ static int init_coda_psdev(void) ...@@ -386,7 +385,7 @@ static int init_coda_psdev(void)
class_simple_device_remove(MKDEV(CODA_PSDEV_MAJOR, i)); class_simple_device_remove(MKDEV(CODA_PSDEV_MAJOR, i));
class_simple_destroy(coda_psdev_class); class_simple_destroy(coda_psdev_class);
out_chrdev: out_chrdev:
unregister_chrdev(CODA_PSDEV_MAJOR, "coda_psdev"); unregister_chrdev(CODA_PSDEV_MAJOR, "coda");
out: out:
return err; return err;
} }
...@@ -431,7 +430,7 @@ static int __init init_coda(void) ...@@ -431,7 +430,7 @@ static int __init init_coda(void)
} }
class_simple_destroy(coda_psdev_class); class_simple_destroy(coda_psdev_class);
devfs_remove("coda"); devfs_remove("coda");
unregister_chrdev(CODA_PSDEV_MAJOR,"coda_psdev"); unregister_chrdev(CODA_PSDEV_MAJOR, "coda");
coda_sysctl_clean(); coda_sysctl_clean();
out1: out1:
coda_destroy_inodecache(); coda_destroy_inodecache();
...@@ -453,7 +452,7 @@ static void __exit exit_coda(void) ...@@ -453,7 +452,7 @@ static void __exit exit_coda(void)
} }
class_simple_destroy(coda_psdev_class); class_simple_destroy(coda_psdev_class);
devfs_remove("coda"); devfs_remove("coda");
unregister_chrdev(CODA_PSDEV_MAJOR, "coda_psdev"); unregister_chrdev(CODA_PSDEV_MAJOR, "coda");
coda_sysctl_clean(); coda_sysctl_clean();
coda_destroy_inodecache(); coda_destroy_inodecache();
} }
......
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