serial: omap: drop unnecessary check from remove
authorFelipe Balbi <balbi@ti.com>
Thu, 6 Sep 2012 12:45:28 +0000 (15:45 +0300)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 6 Sep 2012 16:17:01 +0000 (09:17 -0700)
if platform_get_drvdata() returns NULL, that's
quite a nasty bug on the driver which we want to
catch ASAP. Otherwise, that check is hugely
unneeded.

Tested-by: Shubhrajyoti D <shubhrajyoti@ti.com>
Acked-by: Santosh Shilimkar <santosh.shilimkar@ti.com>
Signed-off-by: Felipe Balbi <balbi@ti.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/tty/serial/omap-serial.c

index 8a696a4efbee733237583a46a9ecd980a65f4479..c19d340f6ba87cbfb85a58d6780a27218a460beb 100644 (file)
@@ -1369,13 +1369,10 @@ static int serial_omap_remove(struct platform_device *dev)
 {
        struct uart_omap_port *up = platform_get_drvdata(dev);
 
-       if (up) {
-               pm_runtime_disable(up->dev);
-               uart_remove_one_port(&serial_omap_reg, &up->port);
-               pm_qos_remove_request(&up->pm_qos_request);
-       }
+       pm_runtime_disable(up->dev);
+       uart_remove_one_port(&serial_omap_reg, &up->port);
+       pm_qos_remove_request(&up->pm_qos_request);
 
-       platform_set_drvdata(dev, NULL);
        return 0;
 }