Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753611Ab3CKSct (ORCPT ); Mon, 11 Mar 2013 14:32:49 -0400 Received: from mailhost.informatik.uni-hamburg.de ([134.100.9.70]:60399 "EHLO mailhost.informatik.uni-hamburg.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751665Ab3CKScr (ORCPT ); Mon, 11 Mar 2013 14:32:47 -0400 Message-ID: <513E23DA.90100@metafoo.de> Date: Mon, 11 Mar 2013 19:35:06 +0100 From: Lars-Peter Clausen User-Agent: Mozilla/5.0 (X11; U; Linux x86_64; en-US; rv:1.9.1.16) Gecko/20121215 Icedove/3.0.11 MIME-Version: 1.0 To: Alexander Shiyan CC: Greg Kroah-Hartman , linux-serial@vger.kernel.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH 2/4] tty: max310x: Use dev_pm_ops References: <1363023892-15957-1-git-send-email-lars@metafoo.de> <1363023892-15957-2-git-send-email-lars@metafoo.de> <1363025431.558252587@f43.mail.ru> In-Reply-To: <1363025431.558252587@f43.mail.ru> X-Enigmail-Version: 1.0.1 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2884 Lines: 94 On 03/11/2013 07:10 PM, Alexander Shiyan wrote: > Hello. > >> Use dev_pm_ops instead of the deprecated legacy suspend/resume for the >> max310x driver. >> >> Cc: Alexander Shiyan >> Signed-off-by: Lars-Peter Clausen >> --- >> drivers/tty/serial/max310x.c | 24 ++++++++++++++++-------- >> 1 file changed, 16 insertions(+), 8 deletions(-) >> >> diff --git a/drivers/tty/serial/max310x.c b/drivers/tty/serial/max310x.c >> index 0c2422c..8941e64 100644 >> --- a/drivers/tty/serial/max310x.c >> +++ b/drivers/tty/serial/max310x.c >> @@ -881,12 +881,14 @@ static struct uart_ops max310x_ops = { >> .verify_port = max310x_verify_port, >> }; >> >> -static int max310x_suspend(struct spi_device *spi, pm_message_t state) >> +#ifdef CONFIG_PM_SLEEP >> + >> +static int max310x_suspend(struct device *dev) >> { >> int ret; >> - struct max310x_port *s = dev_get_drvdata(&spi->dev); >> + struct max310x_port *s = dev_get_drvdata(dev); >> >> - dev_dbg(&spi->dev, "Suspend\n"); >> + dev_dbg(dev, "Suspend\n"); >> >> ret = uart_suspend_port(&s->uart, &s->port); >> >> @@ -905,11 +907,11 @@ static int max310x_suspend(struct spi_device *spi, pm_message_t state) >> return ret; >> } >> >> -static int max310x_resume(struct spi_device *spi) >> +static int max310x_resume(struct device *dev) >> { >> - struct max310x_port *s = dev_get_drvdata(&spi->dev); >> + struct max310x_port *s = dev_get_drvdata(dev); >> >> - dev_dbg(&spi->dev, "Resume\n"); >> + dev_dbg(dev, "Resume\n"); >> >> if (s->pdata->suspend) >> s->pdata->suspend(0); >> @@ -928,6 +930,13 @@ static int max310x_resume(struct spi_device *spi) >> return uart_resume_port(&s->uart, &s->port); >> } >> >> +static SIMPLE_DEV_PM_OPS(max310x_pm_ops, max310x_suspend, max310x_resume); >> +#define MAX310X_PM_OPS (&max310x_pm_ops) >> + >> +#else >> +#define MAX310X_PM_OPS NULL >> +#endif >> + >> #ifdef CONFIG_GPIOLIB >> static int max310x_gpio_get(struct gpio_chip *chip, unsigned offset) >> { >> @@ -1242,11 +1251,10 @@ static struct spi_driver max310x_driver = { >> .driver = { >> .name = "max310x", >> .owner = THIS_MODULE, >> + .pm = MAX310X_PM_OPS, > > Check for CONFIG_PM_SLEEP not necessary at all. > will do all for us. No it wont, you'll end up with a dev_pm_ops struct full of zeros and two warnings from your compiler about unused functions. > >> }, >> .probe = max310x_probe, >> .remove = max310x_remove, >> - .suspend = max310x_suspend, >> - .resume = max310x_resume, >> .id_table = max310x_id_table, >> }; >> module_spi_driver(max310x_driver); >> -- >> 1.8.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/