diff options
| author |   Akinobu Mita <akinobu.mita@gmail.com> | 2007-07-17 04:03:46 -0700 |
|---|---|---|
| committer |   Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-17 10:23:03 -0700 |
| commit | 00d59405cf6d7ef8932394ab5a12da1a50ce581e (patch) | |
| tree | ccd0c170b673a17792207b2b5816978bb27da436 /drivers/block | |
| parent | unregister_blkdev(): do WARN_ON on failure (diff) | |
| download | linux-dev-00d59405cf6d7ef8932394ab5a12da1a50ce581e.tar.xz linux-dev-00d59405cf6d7ef8932394ab5a12da1a50ce581e.zip | |
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) loop_del_one(lo); blk_unregister_region(MKDEV(LOOP_MAJOR, 0), range); - if (unregister_blkdev(LOOP_MAJOR, "loop")) - printk(KERN_WARNING "loop: cannot unregister blkdev\n"); + unregister_blkdev(LOOP_MAJOR, "loop"); } 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) { int i, j; blk_unregister_region(MKDEV(Z2RAM_MAJOR, 0), 256); - if ( unregister_blkdev( Z2RAM_MAJOR, DEVICE_NAME ) != 0 ) - printk( KERN_ERR DEVICE_NAME ": unregister of device failed\n"); - + unregister_blkdev(Z2RAM_MAJOR, DEVICE_NAME); del_gendisk(z2ram_gendisk); put_disk(z2ram_gendisk); blk_cleanup_queue(z2_queue); |