diff mbox

serial: omap: Remove unnecessary checks from suspend/resume

Message ID 1347968154-27997-1-git-send-email-sourav.poddar@ti.com (mailing list archive)
State New, archived
Headers show

Commit Message

Poddar, Sourav Sept. 18, 2012, 11:35 a.m. UTC
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>
---
 drivers/tty/serial/omap-serial.c |   23 +++++++++--------------
 1 files changed, 9 insertions(+), 14 deletions(-)

Comments

Felipe Balbi Sept. 18, 2012, 11:34 a.m. UTC | #1
On Tue, Sep 18, 2012 at 05:05:54PM +0530, Sourav Poddar wrote:
> 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.

you need a blank line here. Other than that:

Reviewed-by: Felipe Balbi <balbi@ti.com>

ps: what kind of tests did you run, btw ?

> Signed-off-by: Sourav Poddar <sourav.poddar@ti.com>
> ---
>  drivers/tty/serial/omap-serial.c |   23 +++++++++--------------
>  1 files changed, 9 insertions(+), 14 deletions(-)
> 
> diff --git a/drivers/tty/serial/omap-serial.c b/drivers/tty/serial/omap-serial.c
> index f175385..3c05c5e 100644
> --- a/drivers/tty/serial/omap-serial.c
> +++ b/drivers/tty/serial/omap-serial.c
> @@ -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;
>  }
> -- 
> 1.7.1
>
Poddar, Sourav Sept. 18, 2012, 11:44 a.m. UTC | #2
Hi Felipe,

On Tue, Sep 18, 2012 at 5:04 PM, Felipe Balbi <balbi@ti.com> wrote:
> On Tue, Sep 18, 2012 at 05:05:54PM +0530, Sourav Poddar wrote:
>> 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.
>
> you need a blank line here. Other than that:
>
> Reviewed-by: Felipe Balbi <balbi@ti.com>
>
> ps: what kind of tests did you run, btw ?
>
Boot tested on Panda.
Boot and PM tested(hitiing Off) on Beagle.
>> Signed-off-by: Sourav Poddar <sourav.poddar@ti.com>
>> ---
>>  drivers/tty/serial/omap-serial.c |   23 +++++++++--------------
>>  1 files changed, 9 insertions(+), 14 deletions(-)
>>
>> diff --git a/drivers/tty/serial/omap-serial.c b/drivers/tty/serial/omap-serial.c
>> index f175385..3c05c5e 100644
>> --- a/drivers/tty/serial/omap-serial.c
>> +++ b/drivers/tty/serial/omap-serial.c
>> @@ -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;
>>  }
>> --
>> 1.7.1
>>
>
> --
> balbi
--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Kevin Hilman Sept. 19, 2012, 9:43 p.m. UTC | #3
"Poddar, Sourav" <sourav.poddar@ti.com> writes:

> Hi Felipe,
>
> On Tue, Sep 18, 2012 at 5:04 PM, Felipe Balbi <balbi@ti.com> wrote:
>> On Tue, Sep 18, 2012 at 05:05:54PM +0530, Sourav Poddar wrote:
>>> 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.
>>
>> you need a blank line here. Other than that:
>>
>> Reviewed-by: Felipe Balbi <balbi@ti.com>
>>
>> ps: what kind of tests did you run, btw ?
>>
> Boot tested on Panda.
> Boot and PM tested(hitiing Off) on Beagle.

What does "PM tested" mean.  hitting off in idle?  hitting off in
suspend?  both?

Please clarify.

Thanks,

Kevin
--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Poddar, Sourav Sept. 21, 2012, 5:10 a.m. UTC | #4
Hi Kevin,

On Thu, Sep 20, 2012 at 3:13 AM, Kevin Hilman
<khilman@deeprootsystems.com> wrote:
> "Poddar, Sourav" <sourav.poddar@ti.com> writes:
>
>> Hi Felipe,
>>
>> On Tue, Sep 18, 2012 at 5:04 PM, Felipe Balbi <balbi@ti.com> wrote:
>>> On Tue, Sep 18, 2012 at 05:05:54PM +0530, Sourav Poddar wrote:
>>>> 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.
>>>
>>> you need a blank line here. Other than that:
>>>
>>> Reviewed-by: Felipe Balbi <balbi@ti.com>
>>>
>>> ps: what kind of tests did you run, btw ?
>>>
>> Boot tested on Panda.
>> Boot and PM tested(hitiing Off) on Beagle.
>
> What does "PM tested" mean.  hitting off in idle?  hitting off in
> suspend?  both?
>
Hitting off in both idle and suspend.
> Please clarify.
>
> Thanks,
>
> Kevin
~Sourav
--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
diff mbox

Patch

diff --git a/drivers/tty/serial/omap-serial.c b/drivers/tty/serial/omap-serial.c
index f175385..3c05c5e 100644
--- a/drivers/tty/serial/omap-serial.c
+++ b/drivers/tty/serial/omap-serial.c
@@ -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;
 }