From patchwork Wed Jan 19 12:45:38 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Brown X-Patchwork-Id: 489171 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id p0JEuJBK010815 for ; Wed, 19 Jan 2011 15:13:13 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754240Ab1ASMpq (ORCPT ); Wed, 19 Jan 2011 07:45:46 -0500 Received: from opensource.wolfsonmicro.com ([80.75.67.52]:58148 "EHLO opensource2.wolfsonmicro.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1754214Ab1ASMpp (ORCPT ); Wed, 19 Jan 2011 07:45:45 -0500 Received: from rakim.wolfsonmicro.main (lumison.wolfsonmicro.com [87.246.78.27]) by opensource2.wolfsonmicro.com (Postfix) with ESMTPSA id AC27A1103F4; Wed, 19 Jan 2011 12:45:43 +0000 (GMT) Received: by rakim.wolfsonmicro.main (Postfix, from userid 1000) id A3C1410B4F9; Wed, 19 Jan 2011 12:45:42 +0000 (GMT) From: Mark Brown To: Michael Hennerich , Dmitry Torokhov Cc: Mike Frysinger , linux-input@vger.kernel.org, Mark Brown Subject: [PATCH 2/3] Input: ad7979 - Convert SPI to dev_pm_ops Date: Wed, 19 Jan 2011 12:45:38 +0000 Message-Id: <1295441139-14706-2-git-send-email-broonie@opensource.wolfsonmicro.com> X-Mailer: git-send-email 1.7.2.3 In-Reply-To: <1295441139-14706-1-git-send-email-broonie@opensource.wolfsonmicro.com> References: <1295441139-14706-1-git-send-email-broonie@opensource.wolfsonmicro.com> Sender: linux-input-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-input@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter1.kernel.org [140.211.167.41]); Wed, 19 Jan 2011 15:13:26 +0000 (UTC) diff --git a/drivers/input/touchscreen/ad7879-spi.c b/drivers/input/touchscreen/ad7879-spi.c index 59c6e68..0b135a6 100644 --- a/drivers/input/touchscreen/ad7879-spi.c +++ b/drivers/input/touchscreen/ad7879-spi.c @@ -7,6 +7,7 @@ */ #include /* BUS_SPI */ +#include #include #include "ad7879.h" @@ -21,8 +22,9 @@ #define AD7879_READCMD(reg) (AD7879_CMD(reg) | AD7879_CMD_READ) #ifdef CONFIG_PM -static int ad7879_spi_suspend(struct spi_device *spi, pm_message_t message) +static int ad7879_spi_suspend(struct device *dev) { + struct spi_device *spi = to_spi_device(dev); struct ad7879 *ts = spi_get_drvdata(spi); ad7879_suspend(ts); @@ -30,17 +32,17 @@ static int ad7879_spi_suspend(struct spi_device *spi, pm_message_t message) return 0; } -static int ad7879_spi_resume(struct spi_device *spi) +static int ad7879_spi_resume(struct device *dev) { + struct spi_device *spi = to_spi_device(dev); struct ad7879 *ts = spi_get_drvdata(spi); ad7879_resume(ts); return 0; } -#else -# define ad7879_spi_suspend NULL -# define ad7879_spi_resume NULL + +static SIMPLE_DEV_PM_OPS(ad7879_spi_pm, ad7879_spi_suspend, ad7879_spi_resume); #endif /* @@ -173,11 +175,12 @@ static struct spi_driver ad7879_spi_driver = { .name = "ad7879", .bus = &spi_bus_type, .owner = THIS_MODULE, +#ifdef CONFIG_PM + .pm = &ad7879_spi_pm, +#endif }, .probe = ad7879_spi_probe, .remove = __devexit_p(ad7879_spi_remove), - .suspend = ad7879_spi_suspend, - .resume = ad7879_spi_resume, }; static int __init ad7879_spi_init(void)