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

diff --git a/drivers/isdn/capi/capi.c b/drivers/isdn/capi/capi.c
index 12dee8e9fbbe..04fb606b5ddd 100644
--- a/drivers/isdn/capi/capi.c
+++ b/drivers/isdn/capi/capi.c
@@ -58,7 +58,7 @@ MODULE_LICENSE("GPL");
 
 /* -------- driver information -------------------------------------- */
 
-static struct class_simple *capi_class;
+static struct class *capi_class;
 
 static int capi_major = 68;             /* allocated */
 #ifdef CONFIG_ISDN_CAPI_MIDDLEWARE
@@ -1499,20 +1499,20 @@ static int __init capi_init(void)
                 return -EIO;
         }
 
-        capi_class = class_simple_create(THIS_MODULE, "capi");
+        capi_class = class_create(THIS_MODULE, "capi");
         if (IS_ERR(capi_class)) {
                 unregister_chrdev(capi_major, "capi20");
                 return PTR_ERR(capi_class);
         }
 
-        class_simple_device_add(capi_class, MKDEV(capi_major, 0), NULL, "capi");
+        class_device_create(capi_class, MKDEV(capi_major, 0), NULL, "capi");
         devfs_mk_cdev(MKDEV(capi_major, 0), S_IFCHR | S_IRUSR | S_IWUSR,
                         "isdn/capi20");
 
 #ifdef CONFIG_ISDN_CAPI_MIDDLEWARE
         if (capinc_tty_init() < 0) {
-                class_simple_device_remove(MKDEV(capi_major, 0));
-                class_simple_destroy(capi_class);
+                class_device_destroy(capi_class, MKDEV(capi_major, 0));
+                class_destroy(capi_class);
                 unregister_chrdev(capi_major, "capi20");
                 return -ENOMEM;
         }
@@ -1539,8 +1539,8 @@ static void __exit capi_exit(void)
 {
         proc_exit();
 
-        class_simple_device_remove(MKDEV(capi_major, 0));
-        class_simple_destroy(capi_class);
+        class_device_destroy(capi_class, MKDEV(capi_major, 0));
+        class_destroy(capi_class);
         unregister_chrdev(capi_major, "capi20");
         devfs_remove("isdn/capi20");