diff options
| author |   Felipe Balbi <balbi@ti.com> | 2012-09-06 15:45:28 +0300 |
|---|---|---|
| committer |   Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-09-06 09:17:01 -0700 |
| commit | 1b42c8b29b1822436e690fd0a7906aaa62099f91 (patch) | |
| tree | 68415b46c24da4d99fc45ee759bdb31fdffee88e /drivers | |
| parent | serial: omap: set dev->drvdata before enabling pm_runtime (diff) | |
| download | linux-dev-1b42c8b29b1822436e690fd0a7906aaa62099f91.tar.xz linux-dev-1b42c8b29b1822436e690fd0a7906aaa62099f91.zip | |
serial: omap: drop unnecessary check from remove
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>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/tty/serial/omap-serial.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/drivers/tty/serial/omap-serial.c b/drivers/tty/serial/omap-serial.c index 8a696a4efbee..c19d340f6ba8 100644 --- a/drivers/tty/serial/omap-serial.c +++ b/drivers/tty/serial/omap-serial.c @@ -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; } |