From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754174AbdBFOlP (ORCPT ); Mon, 6 Feb 2017 09:41:15 -0500 Received: from michel.telenet-ops.be ([195.130.137.88]:55402 "EHLO michel.telenet-ops.be" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751437AbdBFOiK (ORCPT ); Mon, 6 Feb 2017 09:38:10 -0500 From: Geert Uytterhoeven To: Miguel Ojeda Sandonis , Greg Kroah-Hartman , Willy Tarreau , Ksenija Stanojevic , Arnd Bergmann Cc: linux-kernel@vger.kernel.org, Geert Uytterhoeven Subject: [PATCH 06/13] misc: panel: Remove always-true check from panel_detach() Date: Mon, 6 Feb 2017 15:38:08 +0100 Message-Id: <1486391895-9554-7-git-send-email-geert@linux-m68k.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1486391895-9554-1-git-send-email-geert@linux-m68k.org> References: <1486391895-9554-1-git-send-email-geert@linux-m68k.org> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org panel_detach() already verified that pptr is a valid pointer. Signed-off-by: Geert Uytterhoeven --- drivers/misc/panel.c | 30 ++++++++++++++---------------- 1 file changed, 14 insertions(+), 16 deletions(-) diff --git a/drivers/misc/panel.c b/drivers/misc/panel.c index 8af500ecaaaf6634..ed19b3e399b08d1f 100644 --- a/drivers/misc/panel.c +++ b/drivers/misc/panel.c @@ -2266,24 +2266,22 @@ static void panel_detach(struct parport *port) if (scan_timer.function) del_timer_sync(&scan_timer); - if (pprt) { - if (keypad.enabled) { - misc_deregister(&keypad_dev); - keypad_initialized = 0; - } - - if (lcd.enabled) { - panel_lcd_print("\x0cLCD driver unloaded.\x1b[Lc\x1b[Lb\x1b[L-"); - misc_deregister(&lcd_dev); - lcd.initialized = false; - } + if (keypad.enabled) { + misc_deregister(&keypad_dev); + keypad_initialized = 0; + } - /* TODO: free all input signals */ - parport_release(pprt); - parport_unregister_device(pprt); - pprt = NULL; - unregister_reboot_notifier(&panel_notifier); + if (lcd.enabled) { + panel_lcd_print("\x0cLCD driver unloaded.\x1b[Lc\x1b[Lb\x1b[L-"); + misc_deregister(&lcd_dev); + lcd.initialized = false; } + + /* TODO: free all input signals */ + parport_release(pprt); + parport_unregister_device(pprt); + pprt = NULL; + unregister_reboot_notifier(&panel_notifier); } static struct parport_driver panel_driver = { -- 1.9.1