Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 547415d5 authored by Akinobu Mita's avatar Akinobu Mita Committed by Linus Torvalds
Browse files

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: default avatarAkinobu Mita <akinobu.mita@gmail.com>
Cc: Martin Schwidefsky <schwidefsky@de.ibm.com>
Cc: Heiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent b329becf

drivers/s390/block/dasd_eer.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

	}

drivers/s390/char/monreader.c

+1 −1
Original line number Diff line number Diff line
@@ -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);

drivers/s390/char/monwriter.c

+1 −1
Original line number Diff line number Diff line
@@ -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);

}