From 03c7eeb9d46974ccb381e2a31953ad0fc374163a Mon Sep 17 00:00:00 2001
From: Marek Vasut <marek.vasut@gmail.com>
Date: Mon, 11 Apr 2011 01:40:13 +0200
Subject: [PATCH] --- yaml --- r: 252143 b: refs/heads/master c:
 906649de0eacde7a643b5a0750de6207441ad54f h: refs/heads/master i:   252141:
 15914fbbb8d2f9dcf4795023d056cbe592e94adb   252139:
 71c1d76ee0ce81615c2ac64ea8ede2fd7b38d9ae   252135:
 250f7e76af53c0239162433d8b7911e56a28575d   252127:
 842ea7552aafa5939067242bf239ef6a7cc44d5f v: v3

---
 [refs]                           |  2 +-
 trunk/drivers/power/z2_battery.c | 20 ++++++++++++++------
 2 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index 7d688034da3b..36d83a2290ff 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9c6f8740d0c8d2b4de78511257f38384f4cbb292
+refs/heads/master: 906649de0eacde7a643b5a0750de6207441ad54f
diff --git a/trunk/drivers/power/z2_battery.c b/trunk/drivers/power/z2_battery.c
index e5ced3a4c1ed..d119c38b3ff6 100644
--- a/trunk/drivers/power/z2_battery.c
+++ b/trunk/drivers/power/z2_battery.c
@@ -271,24 +271,33 @@ static int __devexit z2_batt_remove(struct i2c_client *client)
 }
 
 #ifdef CONFIG_PM
-static int z2_batt_suspend(struct i2c_client *client, pm_message_t state)
+static int z2_batt_suspend(struct device *dev)
 {
+	struct i2c_client *client = to_i2c_client(dev);
 	struct z2_charger *charger = i2c_get_clientdata(client);
 
 	flush_work_sync(&charger->bat_work);
 	return 0;
 }
 
-static int z2_batt_resume(struct i2c_client *client)
+static int z2_batt_resume(struct device *dev)
 {
+	struct i2c_client *client = to_i2c_client(dev);
 	struct z2_charger *charger = i2c_get_clientdata(client);
 
 	schedule_work(&charger->bat_work);
 	return 0;
 }
+
+static const struct dev_pm_ops z2_battery_pm_ops = {
+	.suspend	= z2_batt_suspend,
+	.resume		= z2_batt_resume,
+};
+
+#define	Z2_BATTERY_PM_OPS	(&z2_battery_pm_ops)
+
 #else
-#define z2_batt_suspend NULL
-#define z2_batt_resume NULL
+#define	Z2_BATTERY_PM_OPS	(NULL)
 #endif
 
 static const struct i2c_device_id z2_batt_id[] = {
@@ -301,11 +310,10 @@ static struct i2c_driver z2_batt_driver = {
 	.driver	= {
 		.name	= "z2-battery",
 		.owner	= THIS_MODULE,
+		.pm	= Z2_BATTERY_PM_OPS
 	},
 	.probe		= z2_batt_probe,
 	.remove		= z2_batt_remove,
-	.suspend	= z2_batt_suspend,
-	.resume		= z2_batt_resume,
 	.id_table	= z2_batt_id,
 };