From mboxrd@z Thu Jan 1 00:00:00 1970 From: Mark Brown Subject: [PATCH 1/3] Input: ad7877 - Convert to dev_pm_ops Date: Wed, 19 Jan 2011 12:45:37 +0000 Message-ID: <1295441139-14706-1-git-send-email-broonie@opensource.wolfsonmicro.com> Return-path: Received: from opensource.wolfsonmicro.com ([80.75.67.52]:58153 "EHLO opensource2.wolfsonmicro.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1754221Ab1ASMpp (ORCPT ); Wed, 19 Jan 2011 07:45:45 -0500 Sender: linux-input-owner@vger.kernel.org List-Id: linux-input@vger.kernel.org To: Michael Hennerich , Dmitry Torokhov Cc: Mike Frysinger , linux-input@vger.kernel.org, Mark Brown There is a move to deprecate bus-specific PM operations and move to using dev_pm_ops instead in order to reduce the amount of boilerplate code in buses and facilitiate updates to the PM core. Do this move for the ad7879 SPI driver. Signed-off-by: Mark Brown --- drivers/input/touchscreen/ad7877.c | 19 ++++++++++--------- 1 files changed, 10 insertions(+), 9 deletions(-) diff --git a/drivers/input/touchscreen/ad7877.c b/drivers/input/touchscreen/ad7877.c index a1952fc..6ee868f 100644 --- a/drivers/input/touchscreen/ad7877.c +++ b/drivers/input/touchscreen/ad7877.c @@ -41,6 +41,7 @@ #include #include #include +#include #include #include #include @@ -827,26 +828,25 @@ static int __devexit ad7877_remove(struct spi_device *spi) } #ifdef CONFIG_PM -static int ad7877_suspend(struct spi_device *spi, pm_message_t message) +static int ad7877_suspend(struct device *dev) { - struct ad7877 *ts = dev_get_drvdata(&spi->dev); + struct ad7877 *ts = dev_get_drvdata(dev); ad7877_disable(ts); return 0; } -static int ad7877_resume(struct spi_device *spi) +static int ad7877_resume(struct device *dev) { - struct ad7877 *ts = dev_get_drvdata(&spi->dev); + struct ad7877 *ts = dev_get_drvdata(dev); ad7877_enable(ts); return 0; } -#else -#define ad7877_suspend NULL -#define ad7877_resume NULL + +static SIMPLE_DEV_PM_OPS(ad7877_pm, ad7877_suspend, ad7877_resume); #endif static struct spi_driver ad7877_driver = { @@ -854,11 +854,12 @@ static struct spi_driver ad7877_driver = { .name = "ad7877", .bus = &spi_bus_type, .owner = THIS_MODULE, +#ifdef CONFIG_PM + .pm = &ad7877_pm, +#endif }, .probe = ad7877_probe, .remove = __devexit_p(ad7877_remove), - .suspend = ad7877_suspend, - .resume = ad7877_resume, }; static int __init ad7877_init(void) -- 1.7.2.3