From patchwork Wed Jan 19 12:45:39 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Brown X-Patchwork-Id: 489191 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 p0JEuJBO010815 for ; Wed, 19 Jan 2011 15:15:57 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754221Ab1ASMpr (ORCPT ); Wed, 19 Jan 2011 07:45:47 -0500 Received: from opensource.wolfsonmicro.com ([80.75.67.52]:58152 "EHLO opensource2.wolfsonmicro.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1754212Ab1ASMpp (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 ACAE211041F; Wed, 19 Jan 2011 12:45:43 +0000 (GMT) Received: by rakim.wolfsonmicro.main (Postfix, from userid 1000) id BA2AE10B4FA; 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 3/3] Input: ads7846 - Convert to dev_pm_ops Date: Wed, 19 Jan 2011 12:45:39 +0000 Message-Id: <1295441139-14706-3-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:16:25 +0000 (UTC) diff --git a/drivers/input/touchscreen/ads7846.c b/drivers/input/touchscreen/ads7846.c index 14ea54b..ff13b93 100644 --- a/drivers/input/touchscreen/ads7846.c +++ b/drivers/input/touchscreen/ads7846.c @@ -26,6 +26,7 @@ #include #include #include +#include #include #include #include @@ -892,9 +893,9 @@ static irqreturn_t ads7846_irq(int irq, void *handle) return IRQ_HANDLED; } -static int ads7846_suspend(struct spi_device *spi, pm_message_t message) +static int ads7846_suspend(struct device *dev) { - struct ads7846 *ts = dev_get_drvdata(&spi->dev); + struct ads7846 *ts = dev_get_drvdata(dev); mutex_lock(&ts->lock); @@ -914,9 +915,9 @@ static int ads7846_suspend(struct spi_device *spi, pm_message_t message) return 0; } -static int ads7846_resume(struct spi_device *spi) +static int ads7846_resume(struct device *dev) { - struct ads7846 *ts = dev_get_drvdata(&spi->dev); + struct ads7846 *ts = dev_get_drvdata(dev); mutex_lock(&ts->lock); @@ -936,6 +937,8 @@ static int ads7846_resume(struct spi_device *spi) return 0; } +static SIMPLE_DEV_PM_OPS(ads7846_pm, ads7846_suspend, ads7846_resume); + static int __devinit ads7846_setup_pendown(struct spi_device *spi, struct ads7846 *ts) { struct ads7846_platform_data *pdata = spi->dev.platform_data; @@ -1402,11 +1405,10 @@ static struct spi_driver ads7846_driver = { .name = "ads7846", .bus = &spi_bus_type, .owner = THIS_MODULE, + .pm = &ads7846_pm, }, .probe = ads7846_probe, .remove = __devexit_p(ads7846_remove), - .suspend = ads7846_suspend, - .resume = ads7846_resume, }; static int __init ads7846_init(void)