diff options
author | Geert Uytterhoeven <geert@linux-m68k.org> | 2017-02-06 09:38:08 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-02-10 09:32:53 -0500 |
commit | 3f77b43965054c17fbc3111650c4e90f294a7bbe (patch) | |
tree | 4547d73551e38a7cddab21852e151a585b3b7b42 | |
parent | 9db3cf1ccd5f78ad5c2a01a2fd5c5774d0ed0f6f (diff) |
misc: panel: Remove always-true check from panel_detach()
panel_detach() already verified that pptr is a valid pointer.
Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r-- | drivers/misc/panel.c | 30 |
1 files changed, 14 insertions, 16 deletions
diff --git a/drivers/misc/panel.c b/drivers/misc/panel.c index 8af500ecaaaf..ed19b3e399b0 100644 --- a/drivers/misc/panel.c +++ b/drivers/misc/panel.c | |||
@@ -2266,24 +2266,22 @@ static void panel_detach(struct parport *port) | |||
2266 | if (scan_timer.function) | 2266 | if (scan_timer.function) |
2267 | del_timer_sync(&scan_timer); | 2267 | del_timer_sync(&scan_timer); |
2268 | 2268 | ||
2269 | if (pprt) { | 2269 | if (keypad.enabled) { |
2270 | if (keypad.enabled) { | 2270 | misc_deregister(&keypad_dev); |
2271 | misc_deregister(&keypad_dev); | 2271 | keypad_initialized = 0; |
2272 | keypad_initialized = 0; | 2272 | } |
2273 | } | ||
2274 | |||
2275 | if (lcd.enabled) { | ||
2276 | panel_lcd_print("\x0cLCD driver unloaded.\x1b[Lc\x1b[Lb\x1b[L-"); | ||
2277 | misc_deregister(&lcd_dev); | ||
2278 | lcd.initialized = false; | ||
2279 | } | ||
2280 | 2273 | ||
2281 | /* TODO: free all input signals */ | 2274 | if (lcd.enabled) { |
2282 | parport_release(pprt); | 2275 | panel_lcd_print("\x0cLCD driver unloaded.\x1b[Lc\x1b[Lb\x1b[L-"); |
2283 | parport_unregister_device(pprt); | 2276 | misc_deregister(&lcd_dev); |
2284 | pprt = NULL; | 2277 | lcd.initialized = false; |
2285 | unregister_reboot_notifier(&panel_notifier); | ||
2286 | } | 2278 | } |
2279 | |||
2280 | /* TODO: free all input signals */ | ||
2281 | parport_release(pprt); | ||
2282 | parport_unregister_device(pprt); | ||
2283 | pprt = NULL; | ||
2284 | unregister_reboot_notifier(&panel_notifier); | ||
2287 | } | 2285 | } |
2288 | 2286 | ||
2289 | static struct parport_driver panel_driver = { | 2287 | static struct parport_driver panel_driver = { |