From patchwork Fri Feb 11 14:48:50 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: 549651
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 p1BEmeuZ008437
	for <patchwork-linux-input@patchwork.kernel.org>;
	Fri, 11 Feb 2011 14:48:40 GMT
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S1756775Ab1BKOsg (ORCPT
	<rfc822;patchwork-linux-input@patchwork.kernel.org>);
	Fri, 11 Feb 2011 09:48:36 -0500
Received: from opensource.wolfsonmicro.com ([80.75.67.52]:58054 "EHLO
	opensource2.wolfsonmicro.com" rhost-flags-OK-OK-OK-FAIL)
	by vger.kernel.org with ESMTP id S1752260Ab1BKOsf (ORCPT
	<rfc822;linux-input@vger.kernel.org>);
	Fri, 11 Feb 2011 09:48:35 -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 CEDB2110067;
	Fri, 11 Feb 2011 14:48:33 +0000 (GMT)
Received: from broonie by finisterre.wolfsonmicro.main with local (Exim 4.72)
	(envelope-from <broonie@opensource.wolfsonmicro.com>)
	id 1PnuIq-0003Zn-FV; Fri, 11 Feb 2011 14:48:56 +0000
From: Mark Brown <broonie@opensource.wolfsonmicro.com>
To: Kim Kyuwon <q1.kim@samsung.com>, Dmitry Torokhov <dtor@mail.ru>
Cc: linux-input@vger.kernel.org,
	Mark Brown <broonie@opensource.wolfsonmicro.com>
Subject: [PATCH] Input: max7359 - Convert to dev_pm_ops
Date: Fri, 11 Feb 2011 14:48:50 +0000
Message-Id: 
 <1297435730-13719-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]);
	Fri, 11 Feb 2011 14:48:40 +0000 (UTC)


diff --git a/drivers/input/keyboard/max7359_keypad.c b/drivers/input/keyboard/max7359_keypad.c
index 9091ff5..5afe35a 100644
--- a/drivers/input/keyboard/max7359_keypad.c
+++ b/drivers/input/keyboard/max7359_keypad.c
@@ -17,6 +17,7 @@
 #include <linux/i2c.h>
 #include <linux/slab.h>
 #include <linux/interrupt.h>
+#include <linux/pm.h>
 #include <linux/input.h>
 #include <linux/input/matrix_keypad.h>
 
@@ -271,8 +272,10 @@ static int __devexit max7359_remove(struct i2c_client *client)
 }
 
 #ifdef CONFIG_PM
-static int max7359_suspend(struct i2c_client *client, pm_message_t mesg)
+static int max7359_suspend(struct device *dev)
 {
+	struct i2c_client *client = to_i2c_client(dev);
+
 	max7359_fall_deepsleep(client);
 
 	if (device_may_wakeup(&client->dev))
@@ -281,8 +284,10 @@ static int max7359_suspend(struct i2c_client *client, pm_message_t mesg)
 	return 0;
 }
 
-static int max7359_resume(struct i2c_client *client)
+static int max7359_resume(struct device *dev)
 {
+	struct i2c_client *client = to_i2c_client(dev);
+
 	if (device_may_wakeup(&client->dev))
 		disable_irq_wake(client->irq);
 
@@ -291,11 +296,10 @@ static int max7359_resume(struct i2c_client *client)
 
 	return 0;
 }
-#else
-#define max7359_suspend	NULL
-#define max7359_resume	NULL
 #endif
 
+static SIMPLE_DEV_PM_OPS(max7359_pm, max7359_suspend, max7359_resume);
+
 static const struct i2c_device_id max7359_ids[] = {
 	{ "max7359", 0 },
 	{ }
@@ -305,11 +309,10 @@ MODULE_DEVICE_TABLE(i2c, max7359_ids);
 static struct i2c_driver max7359_i2c_driver = {
 	.driver = {
 		.name = "max7359",
+		.pm   = &max7359_pm,
 	},
 	.probe		= max7359_probe,
 	.remove		= __devexit_p(max7359_remove),
-	.suspend	= max7359_suspend,
-	.resume		= max7359_resume,
 	.id_table	= max7359_ids,
 };