hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Akinobu Mita 2007-07-17 04:03:46 -07:00 committed by Linus Torvalds
parent 294462a5c6
commit 00d59405cf
5 changed files with 5 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/block/loop.c
View File

@ -1568,8 +1568,7 @@ static void __exit loop_exit(void)
loop_del_one(lo); loop_del_one(lo);
blk_unregister_region(MKDEV(LOOP_MAJOR, 0), range); blk_unregister_region(MKDEV(LOOP_MAJOR, 0), range);
if (unregister_blkdev(LOOP_MAJOR, "loop")) unregister_blkdev(LOOP_MAJOR, "loop");
printk(KERN_WARNING "loop: cannot unregister blkdev\n");
} }
module_init(loop_init); module_init(loop_init);

4
drivers/block/z2ram.c
View File

@ -371,9 +371,7 @@ static void __exit z2_exit(void)
{ {
int i, j; int i, j;
blk_unregister_region(MKDEV(Z2RAM_MAJOR, 0), 256); blk_unregister_region(MKDEV(Z2RAM_MAJOR, 0), 256);
if ( unregister_blkdev( Z2RAM_MAJOR, DEVICE_NAME ) != 0 ) unregister_blkdev(Z2RAM_MAJOR, DEVICE_NAME);
printk( KERN_ERR DEVICE_NAME ": unregister of device failed\n");
del_gendisk(z2ram_gendisk); del_gendisk(z2ram_gendisk);
put_disk(z2ram_gendisk); put_disk(z2ram_gendisk);
blk_cleanup_queue(z2_queue); blk_cleanup_queue(z2_queue);

4
drivers/md/dm.c
View File

@ -161,9 +161,7 @@ static void local_exit(void)
{ {
kmem_cache_destroy(_tio_cache); kmem_cache_destroy(_tio_cache);
kmem_cache_destroy(_io_cache); kmem_cache_destroy(_io_cache);
unregister_blkdev(_major, _name);
if (unregister_blkdev(_major, _name) < 0)
DMERR("unregister_blkdev failed");
_major = 0; _major = 0;

7
drivers/s390/block/dcssblk.c
View File

@ -747,14 +747,9 @@ dcssblk_check_params(void)
static void __exit static void __exit
dcssblk_exit(void) dcssblk_exit(void)
{ {
int rc;
PRINT_DEBUG("DCSSBLOCK EXIT...\n"); PRINT_DEBUG("DCSSBLOCK EXIT...\n");
s390_root_dev_unregister(dcssblk_root_dev); s390_root_dev_unregister(dcssblk_root_dev);
rc = unregister_blkdev(dcssblk_major, DCSSBLK_NAME); unregister_blkdev(dcssblk_major, DCSSBLK_NAME);
if (rc) {
PRINT_ERR("unregister_blkdev() failed!\n");
}
PRINT_DEBUG("...finished!\n"); PRINT_DEBUG("...finished!\n");
} }

3
drivers/sbus/char/jsflash.c
View File

@ -619,8 +619,7 @@ static void __exit jsflash_cleanup_module(void)
jsf0.busy = 0; jsf0.busy = 0;
misc_deregister(&jsf_dev); misc_deregister(&jsf_dev);
if (unregister_blkdev(JSFD_MAJOR, "jsfd") != 0) unregister_blkdev(JSFD_MAJOR, "jsfd");
printk("jsfd: cleanup_module failed\n");
blk_cleanup_queue(jsf_queue); blk_cleanup_queue(jsf_queue);
} }