diff options
| author | gregkh@suse.de <gregkh@suse.de> | 2005-03-23 10:01:41 -0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2005-06-20 15:15:09 -0700 |
| commit | 56b2293595b2eb52cc2aa2baf92c6cfa8265f9d5 (patch) | |
| tree | 5cbada5b35b1b87dfd75852c9397a2b14dfbb9d9 /drivers/net/wan/cosa.c | |
| parent | 8874b414ffe037c39e73bb262ddf69653a13c0a4 (diff) | |
| download | kernel-common-56b2293595b2eb52cc2aa2baf92c6cfa8265f9d5.tar.gz kernel-common-56b2293595b2eb52cc2aa2baf92c6cfa8265f9d5.tar.bz2 kernel-common-56b2293595b2eb52cc2aa2baf92c6cfa8265f9d5.zip | |
[PATCH] class: convert drivers/* to use the new class api instead of class_simple
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/net/wan/cosa.c')
| -rw-r--r-- | drivers/net/wan/cosa.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/net/wan/cosa.c b/drivers/net/wan/cosa.c index 921a573372e9..7ff814fd65d0 100644 --- a/drivers/net/wan/cosa.c +++ b/drivers/net/wan/cosa.c @@ -235,7 +235,7 @@ static int dma[MAX_CARDS+1]; static int irq[MAX_CARDS+1] = { -1, -1, -1, -1, -1, -1, 0, }; /* for class stuff*/ -static struct class_simple *cosa_class; +static struct class *cosa_class; #ifdef MODULE module_param_array(io, int, NULL, 0); @@ -394,19 +394,19 @@ static int __init cosa_init(void) goto out; } devfs_mk_dir("cosa"); - cosa_class = class_simple_create(THIS_MODULE, "cosa"); + cosa_class = class_create(THIS_MODULE, "cosa"); if (IS_ERR(cosa_class)) { err = PTR_ERR(cosa_class); goto out_chrdev; } for (i=0; i<nr_cards; i++) { - class_simple_device_add(cosa_class, MKDEV(cosa_major, i), + class_device_create(cosa_class, MKDEV(cosa_major, i), NULL, "cosa%d", i); err = devfs_mk_cdev(MKDEV(cosa_major, i), S_IFCHR|S_IRUSR|S_IWUSR, "cosa/%d", i); if (err) { - class_simple_device_remove(MKDEV(cosa_major, i)); + class_device_destroy(cosa_class, MKDEV(cosa_major, i)); goto out_chrdev; } } @@ -427,10 +427,10 @@ static void __exit cosa_exit(void) printk(KERN_INFO "Unloading the cosa module\n"); for (i=0; i<nr_cards; i++) { - class_simple_device_remove(MKDEV(cosa_major, i)); + class_device_destroy(cosa_class, MKDEV(cosa_major, i)); devfs_remove("cosa/%d", i); } - class_simple_destroy(cosa_class); + class_destroy(cosa_class); devfs_remove("cosa"); for (cosa=cosa_cards; nr_cards--; cosa++) { /* Clean up the per-channel data */ |