diff options
author | Tony Jones <tonyj@suse.de> | 2007-09-24 20:03:03 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2008-01-24 23:40:05 -0500 |
commit | 7ea7ed01ff741918532978b30f6f226ed6f78476 (patch) | |
tree | 13b477ade37318c005983b40d80622ea2187bdc9 | |
parent | 41ca28ab2abd76dc203e2c3a7cd609607cb927c3 (diff) |
aoechr: Convert from class_device to device
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>
-rw-r--r-- | drivers/block/aoe/aoechr.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/block/aoe/aoechr.c b/drivers/block/aoe/aoechr.c index 39e563ea0878..d5480e34cb22 100644 --- a/drivers/block/aoe/aoechr.c +++ b/drivers/block/aoe/aoechr.c | |||
@@ -259,9 +259,8 @@ aoechr_init(void) | |||
259 | return PTR_ERR(aoe_class); | 259 | return PTR_ERR(aoe_class); |
260 | } | 260 | } |
261 | for (i = 0; i < ARRAY_SIZE(chardevs); ++i) | 261 | for (i = 0; i < ARRAY_SIZE(chardevs); ++i) |
262 | class_device_create(aoe_class, NULL, | 262 | device_create(aoe_class, NULL, |
263 | MKDEV(AOE_MAJOR, chardevs[i].minor), | 263 | MKDEV(AOE_MAJOR, chardevs[i].minor), chardevs[i].name); |
264 | NULL, chardevs[i].name); | ||
265 | 264 | ||
266 | return 0; | 265 | return 0; |
267 | } | 266 | } |
@@ -272,7 +271,7 @@ aoechr_exit(void) | |||
272 | int i; | 271 | int i; |
273 | 272 | ||
274 | for (i = 0; i < ARRAY_SIZE(chardevs); ++i) | 273 | for (i = 0; i < ARRAY_SIZE(chardevs); ++i) |
275 | class_device_destroy(aoe_class, MKDEV(AOE_MAJOR, chardevs[i].minor)); | 274 | device_destroy(aoe_class, MKDEV(AOE_MAJOR, chardevs[i].minor)); |
276 | class_destroy(aoe_class); | 275 | class_destroy(aoe_class); |
277 | unregister_chrdev(AOE_MAJOR, "aoechr"); | 276 | unregister_chrdev(AOE_MAJOR, "aoechr"); |
278 | } | 277 | } |