Skip to content

Commit

Permalink
s390: remove WARN_ON for misc_deregister() failures
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Akinobu Mita authored and Linus Torvalds committed Aug 10, 2010
1 parent b329bec commit 547415d
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion drivers/s390/block/dasd_eer.c
Original file line number Diff line number Diff line change
Expand Up @@ -701,7 +701,7 @@ int __init dasd_eer_init(void)
void dasd_eer_exit(void)
{
if (dasd_eer_dev) {
WARN_ON(misc_deregister(dasd_eer_dev) != 0);
misc_deregister(dasd_eer_dev);
kfree(dasd_eer_dev);
dasd_eer_dev = NULL;
}
Expand Down
2 changes: 1 addition & 1 deletion drivers/s390/char/monreader.c
Original file line number Diff line number Diff line change
Expand Up @@ -627,7 +627,7 @@ static int __init mon_init(void)
static void __exit mon_exit(void)
{
segment_unload(mon_dcss_name);
WARN_ON(misc_deregister(&mon_dev) != 0);
misc_deregister(&mon_dev);
device_unregister(monreader_device);
driver_unregister(&monreader_driver);
iucv_unregister(&monreader_iucv_handler, 1);
Expand Down
2 changes: 1 addition & 1 deletion drivers/s390/char/monwriter.c
Original file line number Diff line number Diff line change
Expand Up @@ -380,7 +380,7 @@ static int __init mon_init(void)

static void __exit mon_exit(void)
{
WARN_ON(misc_deregister(&mon_dev) != 0);
misc_deregister(&mon_dev);
platform_device_unregister(monwriter_pdev);
platform_driver_unregister(&monwriter_pdrv);
}
Expand Down

0 comments on commit 547415d

Please sign in to comment.