aoechr: Convert from class_device to device
authorTony Jones <tonyj@suse.de>
Tue, 25 Sep 2007 00:03:03 +0000 (02:03 +0200)
committerGreg Kroah-Hartman <gregkh@suse.de>
Fri, 25 Jan 2008 04:40:05 +0000 (20:40 -0800)
Signed-off-by: Tony Jones <tonyj@suse.de>
Cc: Jens Axboe <axboe@kernel.dk>
Cc: Sam Hopkins <sah@coraid.com>
Cc: Kay Sievers <kay.sievers@vrfy.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
drivers/block/aoe/aoechr.c

index 39e563ea08782cf242972b42d3b8c4795e5a83a4..d5480e34cb22fbc27b88275a3cfec71ca3714484 100644 (file)
@@ -259,9 +259,8 @@ aoechr_init(void)
                return PTR_ERR(aoe_class);
        }
        for (i = 0; i < ARRAY_SIZE(chardevs); ++i)
-               class_device_create(aoe_class, NULL,
-                                       MKDEV(AOE_MAJOR, chardevs[i].minor),
-                                       NULL, chardevs[i].name);
+               device_create(aoe_class, NULL,
+                             MKDEV(AOE_MAJOR, chardevs[i].minor), chardevs[i].name);
 
        return 0;
 }
@@ -272,7 +271,7 @@ aoechr_exit(void)
        int i;
 
        for (i = 0; i < ARRAY_SIZE(chardevs); ++i)
-               class_device_destroy(aoe_class, MKDEV(AOE_MAJOR, chardevs[i].minor));
+               device_destroy(aoe_class, MKDEV(AOE_MAJOR, chardevs[i].minor));
        class_destroy(aoe_class);
        unregister_chrdev(AOE_MAJOR, "aoechr");
 }