Commit 1328cf26 authored by Hanna V. Linder's avatar Hanna V. Linder Committed by Greg Kroah-Hartman

[PATCH] Add sysfs class support to fs/coda/psdev.c

Here is a patch to add class support to psdev.c.

I have verified it compiles and works.
parent 31436269
...@@ -37,6 +37,7 @@ ...@@ -37,6 +37,7 @@
#include <linux/init.h> #include <linux/init.h>
#include <linux/list.h> #include <linux/list.h>
#include <linux/smp_lock.h> #include <linux/smp_lock.h>
#include <linux/device.h>
#include <asm/io.h> #include <asm/io.h>
#include <asm/system.h> #include <asm/system.h>
#include <asm/poll.h> #include <asm/poll.h>
...@@ -61,6 +62,7 @@ unsigned long coda_timeout = 30; /* .. secs, then signals will dequeue */ ...@@ -61,6 +62,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;
/* /*
* Device operations * Device operations
...@@ -358,20 +360,38 @@ static struct file_operations coda_psdev_fops = { ...@@ -358,20 +360,38 @@ static struct file_operations coda_psdev_fops = {
static int init_coda_psdev(void) static int init_coda_psdev(void)
{ {
int i; int i, err = 0;
if (register_chrdev(CODA_PSDEV_MAJOR,"coda_psdev", if (register_chrdev(CODA_PSDEV_MAJOR,"coda_psdev",
&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");
if (IS_ERR(coda_psdev_class)) {
err = PTR_ERR(coda_psdev_class);
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++) {
devfs_mk_cdev(MKDEV(CODA_PSDEV_MAJOR, i), class_simple_device_add(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); S_IFCHR|S_IRUSR|S_IWUSR, "coda/%d", i);
if (err)
goto out_class;
} }
coda_sysctl_init(); coda_sysctl_init();
return 0; goto out;
out_class:
for (i = 0; i < MAX_CODADEVS; i++)
class_simple_device_remove(MKDEV(CODA_PSDEV_MAJOR, i));
class_simple_destroy(coda_psdev_class);
out_chrdev:
unregister_chrdev(CODA_PSDEV_MAJOR, "coda_psdev");
out:
return err;
} }
...@@ -408,8 +428,11 @@ static int __init init_coda(void) ...@@ -408,8 +428,11 @@ 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));
devfs_remove("coda/%d", i); devfs_remove("coda/%d", i);
}
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_psdev");
coda_sysctl_clean(); coda_sysctl_clean();
...@@ -427,8 +450,11 @@ static void __exit exit_coda(void) ...@@ -427,8 +450,11 @@ static void __exit exit_coda(void)
if ( err != 0 ) { if ( err != 0 ) {
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));
devfs_remove("coda/%d", i); devfs_remove("coda/%d", i);
}
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_psdev");
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