[PATCH] class: convert drivers/* 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/s390/char/tape_class.c b/drivers/s390/char/tape_class.c
index 0f8ffd4167ca..ed0cb1f15b4c 100644
--- a/drivers/s390/char/tape_class.c
+++ b/drivers/s390/char/tape_class.c
@@ -16,7 +16,7 @@ MODULE_DESCRIPTION(
 );
 MODULE_LICENSE("GPL");
 
-struct class_simple *tape_class;
+static struct class *tape_class;
 
 /*
  * Register a tape device and return a pointer to the cdev structure.
@@ -70,7 +70,7 @@ struct tape_class_device *register_tape_dev(
         if (rc)
                 goto fail_with_cdev;
 
-        tcd->class_device = class_simple_device_add(
+        tcd->class_device = class_device_create(
                                 tape_class,
                                 tcd->char_device->dev,
                                 device,
@@ -101,7 +101,7 @@ void unregister_tape_dev(struct tape_class_device *tcd)
                         &tcd->class_device->dev->kobj,
                         tcd->mode_name
                 );
-                class_simple_device_remove(tcd->char_device->dev);
+                class_device_destroy(tape_class, tcd->char_device->dev);
                 cdev_del(tcd->char_device);
                 kfree(tcd);
         }
@@ -111,14 +111,14 @@ EXPORT_SYMBOL(unregister_tape_dev);
 
 static int __init tape_init(void)
 {
-        tape_class = class_simple_create(THIS_MODULE, "tape390");
+        tape_class = class_create(THIS_MODULE, "tape390");
 
         return 0;
 }
 
 static void __exit tape_exit(void)
 {
-        class_simple_destroy(tape_class);
+        class_destroy(tape_class);
         tape_class = NULL;
 }