From patchwork Thu Jan 20 21:10:21 2011
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: Mark Brown <broonie@opensource.wolfsonmicro.com>
X-Patchwork-Id: 492761
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 p0KLAAWb016264
	for <patchwork-linux-input@patchwork.kernel.org>;
	Thu, 20 Jan 2011 21:10:10 GMT
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S1753926Ab1ATVKJ (ORCPT
	<rfc822;patchwork-linux-input@patchwork.kernel.org>);
	Thu, 20 Jan 2011 16:10:09 -0500
Received: from opensource.wolfsonmicro.com ([80.75.67.52]:46736 "EHLO
	opensource2.wolfsonmicro.com" rhost-flags-OK-OK-OK-FAIL)
	by vger.kernel.org with ESMTP id S1753882Ab1ATVKI (ORCPT
	<rfc822;linux-input@vger.kernel.org>);
	Thu, 20 Jan 2011 16:10:08 -0500
Received: from finisterre.wolfsonmicro.main
	(cpc3-sgyl4-0-0-cust125.sgyl.cable.virginmedia.com [82.41.240.126])
	by opensource2.wolfsonmicro.com (Postfix) with ESMTPSA id 6596678BBA3;
	Thu, 20 Jan 2011 21:10:07 +0000 (GMT)
Received: from broonie by finisterre.wolfsonmicro.main with local (Exim 4.72)
	(envelope-from <broonie@opensource.wolfsonmicro.com>)
	id 1Pg1lx-0005Rl-St; Thu, 20 Jan 2011 21:10:25 +0000
From: Mark Brown <broonie@opensource.wolfsonmicro.com>
To: Michael Hennerich <michael.hennerich@analog.com>,
	Dmitry Torokhov <dmitry.torokhov@gmail.com>,
	Mike Frysinger <vapier@gentoo.org>
Cc: linux-input@vger.kernel.org,
	Mark Brown <broonie@opensource.wolfsonmicro.com>
Subject: [PATCH 1/3] Input: ad7877 - Convert to dev_pm_ops
Date: Thu, 20 Jan 2011 21:10:21 +0000
Message-Id: 
 <1295557823-20907-1-git-send-email-broonie@opensource.wolfsonmicro.com>
X-Mailer: git-send-email 1.7.2.3
Sender: linux-input-owner@vger.kernel.org
Precedence: bulk
List-ID: <linux-input.vger.kernel.org>
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]);
	Thu, 20 Jan 2011 21:10:25 +0000 (UTC)


diff --git a/drivers/input/touchscreen/ad7877.c b/drivers/input/touchscreen/ad7877.c
index a1952fc..714d4e0 100644
--- a/drivers/input/touchscreen/ad7877.c
+++ b/drivers/input/touchscreen/ad7877.c
@@ -41,6 +41,7 @@
 #include <linux/delay.h>
 #include <linux/input.h>
 #include <linux/interrupt.h>
+#include <linux/pm.h>
 #include <linux/slab.h>
 #include <linux/spi/spi.h>
 #include <linux/spi/ad7877.h>
@@ -826,39 +827,37 @@ static int __devexit ad7877_remove(struct spi_device *spi)
 	return 0;
 }
 
-#ifdef CONFIG_PM
-static int ad7877_suspend(struct spi_device *spi, pm_message_t message)
+#ifdef CONFIG_PM_SLEEP
+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
 #endif
 
+static SIMPLE_DEV_PM_OPS(ad7877_pm, ad7877_suspend, ad7877_resume);
+
 static struct spi_driver ad7877_driver = {
 	.driver = {
 		.name	= "ad7877",
 		.bus	= &spi_bus_type,
 		.owner	= THIS_MODULE,
+		.pm	= &ad7877_pm,
 	},
 	.probe		= ad7877_probe,
 	.remove		= __devexit_p(ad7877_remove),
-	.suspend	= ad7877_suspend,
-	.resume		= ad7877_resume,
 };
 
 static int __init ad7877_init(void)