On Tue, Oct 11, 2011 at 5:12 AM, Kevin Hilman <khilman@xxxxxx> wrote:
> "Govindraj.R" <govindraj.raja@xxxxxx> writes:
>
>> Adapts omap-serial driver to use pm_runtime API's.
>
> [...]
>
>> @@ -1065,19 +1123,18 @@ static struct uart_driver serial_omap_reg = {
>> .cons = OMAP_CONSOLE,
>> };
>>
>> -static int
>> -serial_omap_suspend(struct platform_device *pdev, pm_message_t state)
>> +static int serial_omap_suspend(struct device *dev)
>> {
>> - struct uart_omap_port *up = platform_get_drvdata(pdev);
>> + struct uart_omap_port *up = dev_get_drvdata(dev);
>>
>> if (up)
>> uart_suspend_port(&serial_omap_reg, &up->port);
>> return 0;
>> }
>>
>> -static int serial_omap_resume(struct platform_device *dev)
>> +static int serial_omap_resume(struct device *dev)
>> {
>> - struct uart_omap_port *up = platform_get_drvdata(dev);
>> + struct uart_omap_port *up = dev_get_drvdata(dev);
>>
>> if (up)
>> uart_resume_port(&serial_omap_reg, &up->port);
>
> These functions need to be wrapped in #ifdef CONFIG_SUSPEND, otherwise,
> when building with !CONFIG_SUSPEND you'll get :
>
> /work/kernel/omap/pm/drivers/tty/serial/omap-serial.c:1134:12: warning: 'serial_omap_suspend' defined but not used
> /work/kernel/omap/pm/drivers/tty/serial/omap-serial.c:1150:12: warning: 'serial_omap_resume' defined but not used
>
>
> [...]
>
>> +static int serial_omap_runtime_suspend(struct device *dev)
>> +{
>> + struct uart_omap_port *up = dev_get_drvdata(dev);
>> + struct omap_uart_port_info *pdata = dev->platform_data;
>> +
>> + if (!up)
>> + return -EINVAL;
>> +
>> + if (!pdata->enable_wakeup || !pdata->get_context_loss_count)
>> + return 0;
>> +
>> + if (pdata->get_context_loss_count)
>> + up->context_loss_cnt = pdata->get_context_loss_count(dev);
>> +
>> + if (device_may_wakeup(dev)) {
>> + if (!up->wakeups_enabled) {
>> + pdata->enable_wakeup(up->pdev, true);
>> + up->wakeups_enabled = true;
>> + }
>> + } else {
>> + if (up->wakeups_enabled) {
>> + pdata->enable_wakeup(up->pdev, false);
>> + up->wakeups_enabled = false;
>> + }
>> + }
>> +
>> + return 0;
>> +}
>> +
>> +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) {
>> + if (pdata->get_context_loss_count) {
>> + u32 loss_cnt = pdata->get_context_loss_count(dev);
>> +
>> + if (up->context_loss_cnt != loss_cnt)
>> + serial_omap_restore_context(up);
>> + }
>> + }
>> +
>> return 0;
>> }
>
> Similarily, thse need to be wrapped with #ifdef CONFIG_PM_RUNTIME,
> otherwise, when !CONFIG_PM_RUNTIME:
>
> /work/kernel/omap/pm/drivers/tty/serial/omap-serial.c:1498:12: warning: 'serial_omap_runtime_suspend' defined but not used
> /work/kernel/omap/pm/drivers/tty/serial/omap-serial.c:1531:12: warning: 'serial_omap_runtime_resume' defined but not used
>
>> +static const struct dev_pm_ops serial_omap_dev_pm_ops = {
>> + SET_SYSTEM_SLEEP_PM_OPS(serial_omap_suspend, serial_omap_resume)
>> + SET_RUNTIME_PM_OPS(serial_omap_runtime_suspend,
>> + serial_omap_runtime_resume, NULL)
>> +};
>> +
>
> Note that you don't need #else parts to the above #ifdefs since
> the SET_*_OPS() macros used here take care of that.
>
Yes fine, Corrected
Thanks for catching this.
--
Govindraj.R
--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
