OSDN Git Service

staging: panel: remove duplicate code
authorSudip Mukherjee <sudipm.mukherjee@gmail.com>
Tue, 7 Apr 2015 08:25:01 +0000 (13:55 +0530)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 30 Apr 2015 15:10:51 +0000 (17:10 +0200)
both the misc_deregister(), parport_release() and
parport_unregister_device() is there in the module_exit function also.
detach is called from parport_unregister_driver() and by the time
detach executes misc_deregister(), parport_release() and
parport_unregister_device() has already executed marking
keypad_initialized and lcd.initialized  as false. so this part of the
code will never execute.

Signed-off-by: Sudip Mukherjee <sudip@vectorindia.org>
Reviewed-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/panel/panel.c

index ea54fb4..1d8ed8b 100644 (file)
@@ -2252,20 +2252,6 @@ static void panel_detach(struct parport *port)
        }
 
        unregister_reboot_notifier(&panel_notifier);
-
-       if (keypad.enabled && keypad_initialized) {
-               misc_deregister(&keypad_dev);
-               keypad_initialized = 0;
-       }
-
-       if (lcd.enabled && lcd.initialized) {
-               misc_deregister(&lcd_dev);
-               lcd.initialized = false;
-       }
-
-       parport_release(pprt);
-       parport_unregister_device(pprt);
-       pprt = NULL;
 }
 
 static struct parport_driver panel_driver = {