From 07cb7afd40b9a0eec612d17b1bdfb08bca764778 Mon Sep 17 00:00:00 2001
From: Akinobu Mita <akinobu.mita@gmail.com>
Date: Tue, 17 Jul 2007 04:03:47 -0700
Subject: [PATCH] --- yaml --- r: 60765 b: refs/heads/master c:
 f4480240f700587c15507b7815e75989b16825b2 h: refs/heads/master i:   60763:
 04a52aa14e6b92f10a592c3f9b5ed048ab3bab40 v: v3

---
 [refs]                   | 2 +-
 trunk/block/genhd.c      | 7 +------
 trunk/include/linux/fs.h | 2 +-
 3 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/[refs] b/[refs]
index 9eb42ad04527..fbffcf3e7f14 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c6d4d63489f2e3ce38c80e7073952f0c58d4c2bc
+refs/heads/master: f4480240f700587c15507b7815e75989b16825b2
diff --git a/trunk/block/genhd.c b/trunk/block/genhd.c
index 7f71b2c472b8..3af1e7a378d4 100644
--- a/trunk/block/genhd.c
+++ b/trunk/block/genhd.c
@@ -108,13 +108,11 @@ int register_blkdev(unsigned int major, const char *name)
 
 EXPORT_SYMBOL(register_blkdev);
 
-/* todo: make void - error printk here */
-int unregister_blkdev(unsigned int major, const char *name)
+void unregister_blkdev(unsigned int major, const char *name)
 {
 	struct blk_major_name **n;
 	struct blk_major_name *p = NULL;
 	int index = major_to_index(major);
-	int ret = 0;
 
 	mutex_lock(&block_subsys_lock);
 	for (n = &major_names[index]; *n; n = &(*n)->next)
@@ -122,15 +120,12 @@ int unregister_blkdev(unsigned int major, const char *name)
 			break;
 	if (!*n || strcmp((*n)->name, name)) {
 		WARN_ON(1);
-		ret = -EINVAL;
 	} else {
 		p = *n;
 		*n = p->next;
 	}
 	mutex_unlock(&block_subsys_lock);
 	kfree(p);
-
-	return ret;
 }
 
 EXPORT_SYMBOL(unregister_blkdev);
diff --git a/trunk/include/linux/fs.h b/trunk/include/linux/fs.h
index b3a9f0db9d80..aa74f7de9dcd 100644
--- a/trunk/include/linux/fs.h
+++ b/trunk/include/linux/fs.h
@@ -1527,7 +1527,7 @@ extern void putname(const char *name);
 
 #ifdef CONFIG_BLOCK
 extern int register_blkdev(unsigned int, const char *);
-extern int unregister_blkdev(unsigned int, const char *);
+extern void unregister_blkdev(unsigned int, const char *);
 extern struct block_device *bdget(dev_t);
 extern void bd_set_size(struct block_device *, loff_t size);
 extern void bd_forget(struct inode *inode);