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>

5 files changed, 5 insertions, 16 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);
diff --git a/drivers/md/dm.c b/drivers/md/dm.c
index f4f7d35561ab..846614e676c6 100644
--- a/drivers/md/dm.c
+++ b/drivers/md/dm.c
@@ -161,9 +161,7 @@ static void local_exit(void)
 {
         kmem_cache_destroy(_tio_cache);
         kmem_cache_destroy(_io_cache);
-
-        if (unregister_blkdev(_major, _name) < 0)
-                DMERR("unregister_blkdev failed");
+        unregister_blkdev(_major, _name);
 
         _major = 0;
 
diff --git a/drivers/s390/block/dcssblk.c b/drivers/s390/block/dcssblk.c
index 1340451ea408..35765f6a86e0 100644
--- a/drivers/s390/block/dcssblk.c
+++ b/drivers/s390/block/dcssblk.c
@@ -747,14 +747,9 @@ dcssblk_check_params(void)
 static void __exit
 dcssblk_exit(void)
 {
-        int rc;
-
         PRINT_DEBUG("DCSSBLOCK EXIT...\n");
         s390_root_dev_unregister(dcssblk_root_dev);
-        rc = unregister_blkdev(dcssblk_major, DCSSBLK_NAME);
-        if (rc) {
-                PRINT_ERR("unregister_blkdev() failed!\n");
-        }
+        unregister_blkdev(dcssblk_major, DCSSBLK_NAME);
         PRINT_DEBUG("...finished!\n");
 }
 
diff --git a/drivers/sbus/char/jsflash.c b/drivers/sbus/char/jsflash.c
index 512857a23169..5157a2abc58d 100644
--- a/drivers/sbus/char/jsflash.c
+++ b/drivers/sbus/char/jsflash.c
@@ -619,8 +619,7 @@ static void __exit jsflash_cleanup_module(void)
         jsf0.busy = 0;
 
         misc_deregister(&jsf_dev);
-        if (unregister_blkdev(JSFD_MAJOR, "jsfd") != 0)
-                printk("jsfd: cleanup_module failed\n");
+        unregister_blkdev(JSFD_MAJOR, "jsfd");
         blk_cleanup_queue(jsf_queue);
 }