redonkable
/
alistair23-linux
1
0
Fork 0
Code Releases Activity

serial: omap: Remove unnecessary checks from suspend/resume 

Drop the check for "up" being valid on suspend/resume callbacks.
It should be valid always. Get rid of the "pdata" check also as
serial_omap_get_context_loss_count() checks for it.

Tested on omap4 panda and 3630 based Beagle board.

Signed-off-by: Sourav Poddar <sourav.poddar@ti.com>
Reviewed-by: Felipe Balbi <balbi@ti.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
hifive-unleashed-5.1
Sourav Poddar 2012-09-18 17:05:54 +05:30 committed by Greg Kroah-Hartman
parent 034dc4db6f
commit ac57e7f38e
1 changed files with 9 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
drivers/tty/serial/omap-serial.c
View File

@ -1222,10 +1222,8 @@ static int serial_omap_suspend(struct device *dev)
{
struct uart_omap_port *up = dev_get_drvdata(dev);
if (up) {
uart_suspend_port(&serial_omap_reg, &up->port);
flush_work_sync(&up->qos_work);
}
uart_suspend_port(&serial_omap_reg, &up->port);
flush_work_sync(&up->qos_work);
return 0;
}
@ -1234,8 +1232,8 @@ static int serial_omap_resume(struct device *dev)
{
struct uart_omap_port *up = dev_get_drvdata(dev);
if (up)
uart_resume_port(&serial_omap_reg, &up->port);
uart_resume_port(&serial_omap_reg, &up->port);
return 0;
}
#endif
@ -1553,17 +1551,14 @@ static int serial_omap_runtime_suspend(struct device *dev)
static int serial_omap_runtime_resume(struct device *dev)
{
struct uart_omap_port *up = dev_get_drvdata(dev);
struct omap_uart_port_info *pdata = dev->platform_data;
if (up && pdata) {
u32 loss_cnt = serial_omap_get_context_loss_count(up);
u32 loss_cnt = serial_omap_get_context_loss_count(up);
if (up->context_loss_cnt != loss_cnt)
serial_omap_restore_context(up);
if (up->context_loss_cnt != loss_cnt)
serial_omap_restore_context(up);
up->latency = up->calc_latency;
schedule_work(&up->qos_work);
}
up->latency = up->calc_latency;
schedule_work(&up->qos_work);
return 0;
}