diff options
author | Akinobu Mita <akinobu.mita@gmail.com> | 2007-07-17 07:03:46 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-17 13:23:03 -0400 |
commit | 00d59405cf6d7ef8932394ab5a12da1a50ce581e (patch) | |
tree | ccd0c170b673a17792207b2b5816978bb27da436 /drivers/block | |
parent | 294462a5c6c4fb9a6ced9cb5a368ff335f1b656e (diff) |
unregister_blkdev() delete redundant messages in callers
No need to warn unregister_blkdev() failure by the callers. (The previous
patch makes unregister_blkdev() print error message in error case)
Signed-off-by: Akinobu Mita <akinobu.mita@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/block')
-rw-r--r-- | drivers/block/loop.c | 3 | ||||
-rw-r--r-- | drivers/block/z2ram.c | 4 |
2 files changed, 2 insertions, 5 deletions
diff --git a/drivers/block/loop.c b/drivers/block/loop.c index 06eaa11cbc2f..e425daa1eac3 100644 --- a/drivers/block/loop.c +++ b/drivers/block/loop.c | |||
@@ -1568,8 +1568,7 @@ static void __exit loop_exit(void) | |||
1568 | loop_del_one(lo); | 1568 | loop_del_one(lo); |
1569 | 1569 | ||
1570 | blk_unregister_region(MKDEV(LOOP_MAJOR, 0), range); | 1570 | blk_unregister_region(MKDEV(LOOP_MAJOR, 0), range); |
1571 | if (unregister_blkdev(LOOP_MAJOR, "loop")) | 1571 | unregister_blkdev(LOOP_MAJOR, "loop"); |
1572 | printk(KERN_WARNING "loop: cannot unregister blkdev\n"); | ||
1573 | } | 1572 | } |
1574 | 1573 | ||
1575 | module_init(loop_init); | 1574 | module_init(loop_init); |
diff --git a/drivers/block/z2ram.c b/drivers/block/z2ram.c index 2abf94cc3137..e40fa98842e5 100644 --- a/drivers/block/z2ram.c +++ b/drivers/block/z2ram.c | |||
@@ -371,9 +371,7 @@ static void __exit z2_exit(void) | |||
371 | { | 371 | { |
372 | int i, j; | 372 | int i, j; |
373 | blk_unregister_region(MKDEV(Z2RAM_MAJOR, 0), 256); | 373 | blk_unregister_region(MKDEV(Z2RAM_MAJOR, 0), 256); |
374 | if ( unregister_blkdev( Z2RAM_MAJOR, DEVICE_NAME ) != 0 ) | 374 | unregister_blkdev(Z2RAM_MAJOR, DEVICE_NAME); |
375 | printk( KERN_ERR DEVICE_NAME ": unregister of device failed\n"); | ||
376 | |||
377 | del_gendisk(z2ram_gendisk); | 375 | del_gendisk(z2ram_gendisk); |
378 | put_disk(z2ram_gendisk); | 376 | put_disk(z2ram_gendisk); |
379 | blk_cleanup_queue(z2_queue); | 377 | blk_cleanup_queue(z2_queue); |