Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933219AbbHISTf (ORCPT ); Sun, 9 Aug 2015 14:19:35 -0400 Received: from mail-pa0-f41.google.com ([209.85.220.41]:34738 "EHLO mail-pa0-f41.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933143AbbHISTW (ORCPT ); Sun, 9 Aug 2015 14:19:22 -0400 From: Eduardo Valentin To: Greg Kroah-Hartman , Jiri Slaby , Fabio Stevam Cc: Linux PM , Eduardo Valentin , linux-serial@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 4/8] serial: imx: use dev_pm_ops Date: Sun, 9 Aug 2015 11:19:05 -0700 Message-Id: <1439144349-10494-5-git-send-email-edubezval@gmail.com> X-Mailer: git-send-email 2.5.0 In-Reply-To: <1439144349-10494-1-git-send-email-edubezval@gmail.com> References: <1439144349-10494-1-git-send-email-edubezval@gmail.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2637 Lines: 81 This is a simple reorganization to start using struct dev_pm_ops instead of assigning .suspend and .resume callbacks in platform driver. The change allows further code to be added, for example, runtime_pm. Cc: Fabio Stevam Cc: Greg Kroah-Hartman Cc: Jiri Slaby Cc: linux-serial@vger.kernel.org Cc: linux-kernel@vger.kernel.org Signed-off-by: Eduardo Valentin --- drivers/tty/serial/imx.c | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/drivers/tty/serial/imx.c b/drivers/tty/serial/imx.c index 70802be..a03855d 100644 --- a/drivers/tty/serial/imx.c +++ b/drivers/tty/serial/imx.c @@ -39,6 +39,7 @@ #include #include #include +#include #include #include @@ -1821,9 +1822,9 @@ static void serial_imx_enable_wakeup(struct imx_port *sport, bool on) writel(val, sport->port.membase + UCR1); } -static int serial_imx_suspend(struct platform_device *dev, pm_message_t state) +static int serial_imx_suspend(struct device *dev) { - struct imx_port *sport = platform_get_drvdata(dev); + struct imx_port *sport = dev_get_drvdata(dev); /* enable wakeup from i.MX UART */ serial_imx_enable_wakeup(sport, true); @@ -1833,9 +1834,9 @@ static int serial_imx_suspend(struct platform_device *dev, pm_message_t state) return 0; } -static int serial_imx_resume(struct platform_device *dev) +static int serial_imx_resume(struct device *dev) { - struct imx_port *sport = platform_get_drvdata(dev); + struct imx_port *sport = dev_get_drvdata(dev); /* disable wakeup from i.MX UART */ serial_imx_enable_wakeup(sport, false); @@ -1996,15 +1997,18 @@ static int serial_imx_remove(struct platform_device *pdev) return uart_remove_one_port(&imx_reg, &sport->port); } +static const struct dev_pm_ops serial_imx_dev_pm_ops = { + SET_SYSTEM_SLEEP_PM_OPS(serial_imx_suspend, serial_imx_resume) +}; + static struct platform_driver serial_imx_driver = { .probe = serial_imx_probe, .remove = serial_imx_remove, - .suspend = serial_imx_suspend, - .resume = serial_imx_resume, .id_table = imx_uart_devtype, .driver = { .name = "imx-uart", + .pm = &serial_imx_dev_pm_ops, .of_match_table = imx_uart_dt_ids, }, }; -- 2.5.0 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/