diff options
| author | Steve French <sfrench@us.ibm.com> | 2005-06-23 01:26:47 (GMT) |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2005-06-23 01:26:47 (GMT) |
| commit | ea0daab4ae4a2f853f06c76961c0ed324fd0804c (patch) | |
| tree | f6fbe2db5772695181b7a7257b05e43343bd8d75 /drivers/char/stallion.c | |
| parent | 58aab753de605c14b9878a897e7349c3063afeff (diff) | |
| parent | 1bdf7a78c2b21fb94dfe7994dbe89310b18479d2 (diff) | |
| download | linux-ea0daab4ae4a2f853f06c76961c0ed324fd0804c.tar.xz | |
Merge with rsync://rsync.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6.git
Diffstat (limited to 'drivers/char/stallion.c')
| -rw-r--r-- | drivers/char/stallion.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/char/stallion.c b/drivers/char/stallion.c index b8899f5..951545a 100644 --- a/drivers/char/stallion.c +++ b/drivers/char/stallion.c @@ -719,7 +719,7 @@ static struct file_operations stl_fsiomem = { /*****************************************************************************/ -static struct class_simple *stallion_class; +static struct class *stallion_class; /* * Loadable module initialization stuff. @@ -777,13 +777,13 @@ static void __exit stallion_module_exit(void) } for (i = 0; i < 4; i++) { devfs_remove("staliomem/%d", i); - class_simple_device_remove(MKDEV(STL_SIOMEMMAJOR, i)); + class_device_destroy(stallion_class, MKDEV(STL_SIOMEMMAJOR, i)); } devfs_remove("staliomem"); if ((i = unregister_chrdev(STL_SIOMEMMAJOR, "staliomem"))) printk("STALLION: failed to un-register serial memory device, " "errno=%d\n", -i); - class_simple_destroy(stallion_class); + class_destroy(stallion_class); if (stl_tmpwritebuf != (char *) NULL) kfree(stl_tmpwritebuf); @@ -3090,12 +3090,12 @@ static int __init stl_init(void) printk("STALLION: failed to register serial board device\n"); devfs_mk_dir("staliomem"); - stallion_class = class_simple_create(THIS_MODULE, "staliomem"); + stallion_class = class_create(THIS_MODULE, "staliomem"); for (i = 0; i < 4; i++) { devfs_mk_cdev(MKDEV(STL_SIOMEMMAJOR, i), S_IFCHR|S_IRUSR|S_IWUSR, "staliomem/%d", i); - class_simple_device_add(stallion_class, MKDEV(STL_SIOMEMMAJOR, i), NULL, "staliomem%d", i); + class_device_create(stallion_class, MKDEV(STL_SIOMEMMAJOR, i), NULL, "staliomem%d", i); } stl_serial->owner = THIS_MODULE; |