char: add WARN_ON() in misc_deregister()
Subsystems (3)
PATCH 1/2 char: add WARN_ON() in misc_deregister()
misc_deregister() returns an error only when it attempts to unregister the device that is not registered. This is the driver's bug.
Most of the drivers don't check the return value of misc_deregister(). (It is not bad thing because most of kernel *_unregister() API always succeed and do not return value)
So it is better to indicate the error by WARN_ON() in misc_deregister().
Signed-off-by Akinobu Mita <[email protected]>
--- drivers/char/misc.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
drivers/char/misc.c +1 -1
@@ -242,7 +242,7 @@ int misc_deregister(struct miscdevice *misc) {int i =DYNAMIC_MINORS - misc->minor -1 ; -if (list_empty (&misc->list)) +if (WARN_ON (list_empty (&misc->list)))return -EINVAL ;mutex_lock (&misc_mtx);
Signature · 1 line
1.6.0.6
PATCH 2/2 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 <[email protected]>
Cc Martin Schwidefsky <[email protected]>
Cc Heiko Carstens <[email protected]>
--- drivers/s390/block/dasd_eer.c | 2 +- drivers/s390/char/monreader.c | 2 +- drivers/s390/char/monwriter.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-)
drivers/s390/block/dasd_eer.c +1 -1
@@ -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
@@ -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 );
drivers/s390/char/monwriter.c +1 -1
@@ -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); }
Signature · 1 line
1.6.0.6