s390: remove WARN_ON for misc_deregister() failures

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>

diff --git a/drivers/s390/block/dasd_eer.c b/drivers/s390/block/dasd_eer.c
index dd88803e4899c415e1cba6e0fe402f3b79a77664..7158f9528eccd74a238b85b783a094240d4de6af 100644 (file)
--- a/drivers/s390/block/dasd_eer.c
+++ b/drivers/s390/block/dasd_eer.c
@@ -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;
        }

diff --git a/drivers/s390/char/monreader.c b/drivers/s390/char/monreader.c
index 2ed3f82e5c30e1e5ead0f0a159a83174c70d2079..e021ec663ef9bf140283ebe5a7b698f01438bfb6 100644 (file)
--- a/drivers/s390/char/monreader.c
+++ b/drivers/s390/char/monreader.c
@@ -627,7 +627,7 @@ out_iucv:
 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);

diff --git a/drivers/s390/char/monwriter.c b/drivers/s390/char/monwriter.c
index 98a49dfda1de0d425b8f6b3157c1e0c131d3a8a5..572a1e7fd099f5da539f070a1ba3475f26ad338d 100644 (file)
--- a/drivers/s390/char/monwriter.c
+++ b/drivers/s390/char/monwriter.c
@@ -380,7 +380,7 @@ out_driver:
 
 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);
 }