leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

s390: remove WARN_ON for misc_deregister() failures

Browse Source 
The previous change added WARN_ON() in misc_deregister().  So it is not
necessary to WARN_ON() misc_deregister() failure by callers.

Signed-off-by: Akinobu Mita <akinobu.mita@gmail.com>
Cc: Martin Schwidefsky <schwidefsky@de.ibm.com>
Cc: Heiko Carstens <heiko.carstens@de.ibm.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 2010-08-09 17:20:35 -07:00 committed by Linus Torvalds
parent b329becfc7
commit 547415d5ed
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/s390/block/dasd_eer.c
View File

@ -701,7 +701,7 @@ int __init dasd_eer_init(void)
void dasd_eer_exit(void) void dasd_eer_exit(void)
{ {
if (dasd_eer_dev) { if (dasd_eer_dev) {
WARN_ON(misc_deregister(dasd_eer_dev) != 0); misc_deregister(dasd_eer_dev);
kfree(dasd_eer_dev); kfree(dasd_eer_dev);
dasd_eer_dev = NULL; dasd_eer_dev = NULL;
} }

2
drivers/s390/char/monreader.c
View File

@ -627,7 +627,7 @@ out_iucv:
static void __exit mon_exit(void) static void __exit mon_exit(void)
{ {
segment_unload(mon_dcss_name); segment_unload(mon_dcss_name);
WARN_ON(misc_deregister(&mon_dev) != 0); misc_deregister(&mon_dev);
device_unregister(monreader_device); device_unregister(monreader_device);
driver_unregister(&monreader_driver); driver_unregister(&monreader_driver);
iucv_unregister(&monreader_iucv_handler, 1); iucv_unregister(&monreader_iucv_handler, 1);

2
drivers/s390/char/monwriter.c
View File

@ -380,7 +380,7 @@ out_driver:
static void __exit mon_exit(void) static void __exit mon_exit(void)
{ {
WARN_ON(misc_deregister(&mon_dev) != 0); misc_deregister(&mon_dev);
platform_device_unregister(monwriter_pdev); platform_device_unregister(monwriter_pdev);
platform_driver_unregister(&monwriter_pdrv); platform_driver_unregister(&monwriter_pdrv);
} }