mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-29 11:11:45 -04:00
unregister_blkdev(): return void
Put WARN_ON and fixed all callers of unregister_blkdev(). Now we can make unregister_blkdev return void. Cc: Jens Axboe <[email protected]> Signed-off-by: Akinobu Mita <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
This commit is contained in:
parent
c6d4d63489
commit
f4480240f7
2 changed files with 2 additions and 7 deletions
|
|
@ -108,13 +108,11 @@ out:
|
|||
|
||||
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);
|
||||
|
|
|
|||
Loading…
Reference in a new issue