[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, 15 insertions, 15 deletions

diff --git a/drivers/char/ftape/zftape/zftape-init.c b/drivers/char/ftape/zftape/zftape-init.c
index dbac7e54e8e0..5745b74044ec 100644
--- a/drivers/char/ftape/zftape/zftape-init.c
+++ b/drivers/char/ftape/zftape/zftape-init.c
@@ -99,7 +99,7 @@ static struct file_operations zft_cdev =
         .release        = zft_close,
 };
 
-static struct class_simple *zft_class;
+static struct class *zft_class;
 
 /*      Open floppy tape device
  */
@@ -329,29 +329,29 @@ KERN_INFO
               "installing zftape VFS interface for ftape driver ...");
         TRACE_CATCH(register_chrdev(QIC117_TAPE_MAJOR, "zft", &zft_cdev),);
 
-        zft_class = class_simple_create(THIS_MODULE, "zft");
+        zft_class = class_create(THIS_MODULE, "zft");
         for (i = 0; i < 4; i++) {
-                class_simple_device_add(zft_class, MKDEV(QIC117_TAPE_MAJOR, i), NULL, "qft%i", i);
+                class_device_create(zft_class, MKDEV(QIC117_TAPE_MAJOR, i), NULL, "qft%i", i);
                 devfs_mk_cdev(MKDEV(QIC117_TAPE_MAJOR, i),
                                 S_IFCHR | S_IRUSR | S_IWUSR,
                                 "qft%i", i);
-                class_simple_device_add(zft_class, MKDEV(QIC117_TAPE_MAJOR, i + 4), NULL, "nqft%i", i);
+                class_device_create(zft_class, MKDEV(QIC117_TAPE_MAJOR, i + 4), NULL, "nqft%i", i);
                 devfs_mk_cdev(MKDEV(QIC117_TAPE_MAJOR, i + 4),
                                 S_IFCHR | S_IRUSR | S_IWUSR,
                                 "nqft%i", i);
-                class_simple_device_add(zft_class, MKDEV(QIC117_TAPE_MAJOR, i + 16), NULL, "zqft%i", i);
+                class_device_create(zft_class, MKDEV(QIC117_TAPE_MAJOR, i + 16), NULL, "zqft%i", i);
                 devfs_mk_cdev(MKDEV(QIC117_TAPE_MAJOR, i + 16),
                                 S_IFCHR | S_IRUSR | S_IWUSR,
                                 "zqft%i", i);
-                class_simple_device_add(zft_class, MKDEV(QIC117_TAPE_MAJOR, i + 20), NULL, "nzqft%i", i);
+                class_device_create(zft_class, MKDEV(QIC117_TAPE_MAJOR, i + 20), NULL, "nzqft%i", i);
                 devfs_mk_cdev(MKDEV(QIC117_TAPE_MAJOR, i + 20),
                                 S_IFCHR | S_IRUSR | S_IWUSR,
                                 "nzqft%i", i);
-                class_simple_device_add(zft_class, MKDEV(QIC117_TAPE_MAJOR, i + 32), NULL, "rawqft%i", i);
+                class_device_create(zft_class, MKDEV(QIC117_TAPE_MAJOR, i + 32), NULL, "rawqft%i", i);
                 devfs_mk_cdev(MKDEV(QIC117_TAPE_MAJOR, i + 32),
                                 S_IFCHR | S_IRUSR | S_IWUSR,
                                 "rawqft%i", i);
-                class_simple_device_add(zft_class, MKDEV(QIC117_TAPE_MAJOR, i + 36), NULL, "nrawrawqft%i", i);
+                class_device_create(zft_class, MKDEV(QIC117_TAPE_MAJOR, i + 36), NULL, "nrawrawqft%i", i);
                 devfs_mk_cdev(MKDEV(QIC117_TAPE_MAJOR, i + 36),
                                 S_IFCHR | S_IRUSR | S_IWUSR,
                                 "nrawqft%i", i);
@@ -381,19 +381,19 @@ static void zft_exit(void)
         }
         for (i = 0; i < 4; i++) {
                 devfs_remove("qft%i", i);
-                class_simple_device_remove(MKDEV(QIC117_TAPE_MAJOR, i));
+                class_device_destroy(zft_class, MKDEV(QIC117_TAPE_MAJOR, i));
                 devfs_remove("nqft%i", i);
-                class_simple_device_remove(MKDEV(QIC117_TAPE_MAJOR, i + 4));
+                class_device_destroy(zft_class, MKDEV(QIC117_TAPE_MAJOR, i + 4));
                 devfs_remove("zqft%i", i);
-                class_simple_device_remove(MKDEV(QIC117_TAPE_MAJOR, i + 16));
+                class_device_destroy(zft_class, MKDEV(QIC117_TAPE_MAJOR, i + 16));
                 devfs_remove("nzqft%i", i);
-                class_simple_device_remove(MKDEV(QIC117_TAPE_MAJOR, i + 20));
+                class_device_destroy(zft_class, MKDEV(QIC117_TAPE_MAJOR, i + 20));
                 devfs_remove("rawqft%i", i);
-                class_simple_device_remove(MKDEV(QIC117_TAPE_MAJOR, i + 32));
+                class_device_destroy(zft_class, MKDEV(QIC117_TAPE_MAJOR, i + 32));
                 devfs_remove("nrawqft%i", i);
-                class_simple_device_remove(MKDEV(QIC117_TAPE_MAJOR, i + 36));
+                class_device_destroy(zft_class, MKDEV(QIC117_TAPE_MAJOR, i + 36));
         }
-        class_simple_destroy(zft_class);
+        class_destroy(zft_class);
         zft_uninit_mem(); /* release remaining memory, if any */
         printk(KERN_INFO "zftape successfully unloaded.\n");
         TRACE_EXIT;