From 04a52aa14e6b92f10a592c3f9b5ed048ab3bab40 Mon Sep 17 00:00:00 2001
From: Akinobu Mita <akinobu.mita@gmail.com>
Date: Tue, 17 Jul 2007 04:03:46 -0700
Subject: [PATCH] --- yaml --- r: 60763 b: refs/heads/master c:
 00d59405cf6d7ef8932394ab5a12da1a50ce581e h: refs/heads/master i:   60761:
 3a928feca4f5f23b9337d973115760470bf24052   60759:
 283e574386d5dbe5a8e11bf9f78a45ad51cf10de v: v3

---
 [refs]                             | 2 +-
 trunk/drivers/block/loop.c         | 3 +--
 trunk/drivers/block/z2ram.c        | 4 +---
 trunk/drivers/md/dm.c              | 4 +---
 trunk/drivers/s390/block/dcssblk.c | 7 +------
 trunk/drivers/sbus/char/jsflash.c  | 3 +--
 6 files changed, 6 insertions(+), 17 deletions(-)

diff --git a/[refs] b/[refs]
index 518e5fff58fe..4370f521949f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 294462a5c6c4fb9a6ced9cb5a368ff335f1b656e
+refs/heads/master: 00d59405cf6d7ef8932394ab5a12da1a50ce581e
diff --git a/trunk/drivers/block/loop.c b/trunk/drivers/block/loop.c
index 06eaa11cbc2f..e425daa1eac3 100644
--- a/trunk/drivers/block/loop.c
+++ b/trunk/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/trunk/drivers/block/z2ram.c b/trunk/drivers/block/z2ram.c
index 2abf94cc3137..e40fa98842e5 100644
--- a/trunk/drivers/block/z2ram.c
+++ b/trunk/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/trunk/drivers/md/dm.c b/trunk/drivers/md/dm.c
index f4f7d35561ab..846614e676c6 100644
--- a/trunk/drivers/md/dm.c
+++ b/trunk/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/trunk/drivers/s390/block/dcssblk.c b/trunk/drivers/s390/block/dcssblk.c
index 1340451ea408..35765f6a86e0 100644
--- a/trunk/drivers/s390/block/dcssblk.c
+++ b/trunk/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/trunk/drivers/sbus/char/jsflash.c b/trunk/drivers/sbus/char/jsflash.c
index 512857a23169..5157a2abc58d 100644
--- a/trunk/drivers/sbus/char/jsflash.c
+++ b/trunk/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);
 }