diff options
Diffstat (limited to 'drivers/char/istallion.c')
-rw-r--r-- | drivers/char/istallion.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/char/istallion.c b/drivers/char/istallion.c index 21aed0e8779d..c02a21dbad5d 100644 --- a/drivers/char/istallion.c +++ b/drivers/char/istallion.c | |||
@@ -792,7 +792,7 @@ static int stli_timeron; | |||
792 | 792 | ||
793 | /*****************************************************************************/ | 793 | /*****************************************************************************/ |
794 | 794 | ||
795 | static struct class_simple *istallion_class; | 795 | static struct class *istallion_class; |
796 | 796 | ||
797 | #ifdef MODULE | 797 | #ifdef MODULE |
798 | 798 | ||
@@ -854,10 +854,10 @@ static void __exit istallion_module_exit(void) | |||
854 | put_tty_driver(stli_serial); | 854 | put_tty_driver(stli_serial); |
855 | for (i = 0; i < 4; i++) { | 855 | for (i = 0; i < 4; i++) { |
856 | devfs_remove("staliomem/%d", i); | 856 | devfs_remove("staliomem/%d", i); |
857 | class_simple_device_remove(MKDEV(STL_SIOMEMMAJOR, i)); | 857 | class_device_destroy(istallion_class, MKDEV(STL_SIOMEMMAJOR, i)); |
858 | } | 858 | } |
859 | devfs_remove("staliomem"); | 859 | devfs_remove("staliomem"); |
860 | class_simple_destroy(istallion_class); | 860 | class_destroy(istallion_class); |
861 | if ((i = unregister_chrdev(STL_SIOMEMMAJOR, "staliomem"))) | 861 | if ((i = unregister_chrdev(STL_SIOMEMMAJOR, "staliomem"))) |
862 | printk("STALLION: failed to un-register serial memory device, " | 862 | printk("STALLION: failed to un-register serial memory device, " |
863 | "errno=%d\n", -i); | 863 | "errno=%d\n", -i); |
@@ -5242,12 +5242,12 @@ int __init stli_init(void) | |||
5242 | "device\n"); | 5242 | "device\n"); |
5243 | 5243 | ||
5244 | devfs_mk_dir("staliomem"); | 5244 | devfs_mk_dir("staliomem"); |
5245 | istallion_class = class_simple_create(THIS_MODULE, "staliomem"); | 5245 | istallion_class = class_create(THIS_MODULE, "staliomem"); |
5246 | for (i = 0; i < 4; i++) { | 5246 | for (i = 0; i < 4; i++) { |
5247 | devfs_mk_cdev(MKDEV(STL_SIOMEMMAJOR, i), | 5247 | devfs_mk_cdev(MKDEV(STL_SIOMEMMAJOR, i), |
5248 | S_IFCHR | S_IRUSR | S_IWUSR, | 5248 | S_IFCHR | S_IRUSR | S_IWUSR, |
5249 | "staliomem/%d", i); | 5249 | "staliomem/%d", i); |
5250 | class_simple_device_add(istallion_class, MKDEV(STL_SIOMEMMAJOR, i), | 5250 | class_device_create(istallion_class, MKDEV(STL_SIOMEMMAJOR, i), |
5251 | NULL, "staliomem%d", i); | 5251 | NULL, "staliomem%d", i); |
5252 | } | 5252 | } |
5253 | 5253 | ||