aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorAkinobu Mita <akinobu.mita@gmail.com>2010-08-09 20:20:35 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2010-08-09 23:45:06 -0400
commit547415d5edf8660aee040dc81d8c71b081a59bda (patch)
tree21221c9702e65a71354ce5c672a085d00ff9b5a6 /drivers
parentb329becfc78b180d5c422c9cb24a6ab378603305 (diff)
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>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/s390/block/dasd_eer.c2
-rw-r--r--drivers/s390/char/monreader.c2
-rw-r--r--drivers/s390/char/monwriter.c2
3 files changed, 3 insertions, 3 deletions
diff --git a/drivers/s390/block/dasd_eer.c b/drivers/s390/block/dasd_eer.c
index dd88803e4899..7158f9528ecc 100644
--- a/drivers/s390/block/dasd_eer.c
+++ b/drivers/s390/block/dasd_eer.c
@@ -701,7 +701,7 @@ int __init dasd_eer_init(void)
701void dasd_eer_exit(void) 701void dasd_eer_exit(void)
702{ 702{
703 if (dasd_eer_dev) { 703 if (dasd_eer_dev) {
704 WARN_ON(misc_deregister(dasd_eer_dev) != 0); 704 misc_deregister(dasd_eer_dev);
705 kfree(dasd_eer_dev); 705 kfree(dasd_eer_dev);
706 dasd_eer_dev = NULL; 706 dasd_eer_dev = NULL;
707 } 707 }
diff --git a/drivers/s390/char/monreader.c b/drivers/s390/char/monreader.c
index 2ed3f82e5c30..e021ec663ef9 100644
--- a/drivers/s390/char/monreader.c
+++ b/drivers/s390/char/monreader.c
@@ -627,7 +627,7 @@ out_iucv:
627static void __exit mon_exit(void) 627static void __exit mon_exit(void)
628{ 628{
629 segment_unload(mon_dcss_name); 629 segment_unload(mon_dcss_name);
630 WARN_ON(misc_deregister(&mon_dev) != 0); 630 misc_deregister(&mon_dev);
631 device_unregister(monreader_device); 631 device_unregister(monreader_device);
632 driver_unregister(&monreader_driver); 632 driver_unregister(&monreader_driver);
633 iucv_unregister(&monreader_iucv_handler, 1); 633 iucv_unregister(&monreader_iucv_handler, 1);
diff --git a/drivers/s390/char/monwriter.c b/drivers/s390/char/monwriter.c
index 98a49dfda1de..572a1e7fd099 100644
--- a/drivers/s390/char/monwriter.c
+++ b/drivers/s390/char/monwriter.c
@@ -380,7 +380,7 @@ out_driver:
380 380
381static void __exit mon_exit(void) 381static void __exit mon_exit(void)
382{ 382{
383 WARN_ON(misc_deregister(&mon_dev) != 0); 383 misc_deregister(&mon_dev);
384 platform_device_unregister(monwriter_pdev); 384 platform_device_unregister(monwriter_pdev);
385 platform_driver_unregister(&monwriter_pdrv); 385 platform_driver_unregister(&monwriter_pdrv);
386} 386}