[PATCH] class: convert drivers/char/* to use the new class api instead of class_simple

Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

1 files changed, 5 insertions, 5 deletions

diff --git a/drivers/char/stallion.c b/drivers/char/stallion.c
index b8899f560b5e..951545a6ef2d 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;