From 60c73a736ba3c0ca7554335ff191086dc2c2938f Mon Sep 17 00:00:00 2001
From: Laxman Dewangan <ldewangan@nvidia.com>
Date: Tue, 29 Jan 2013 14:35:18 +0530
Subject: [PATCH] --- yaml --- r: 357601 b: refs/heads/master c:
 5fd86d34c1fad19a570e7f787d5e4ea94c6f38f7 h: refs/heads/master i:   357599:
 155f087b25c2301266aacd336c387b0abab05ff8 v: v3

---
 [refs]                       |  2 +-
 trunk/drivers/mfd/tps65090.c | 23 -----------------------
 2 files changed, 1 insertion(+), 24 deletions(-)

diff --git a/[refs] b/[refs]
index f247bf56a3f0..080dc54cdfee 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4f979ed5e2656570f433101bfc5bc116a919316b
+refs/heads/master: 5fd86d34c1fad19a570e7f787d5e4ea94c6f38f7
diff --git a/trunk/drivers/mfd/tps65090.c b/trunk/drivers/mfd/tps65090.c
index 2ad0a1528650..98edb5be85c6 100644
--- a/trunk/drivers/mfd/tps65090.c
+++ b/trunk/drivers/mfd/tps65090.c
@@ -230,28 +230,6 @@ static int tps65090_i2c_remove(struct i2c_client *client)
 	return 0;
 }
 
-#ifdef CONFIG_PM_SLEEP
-static int tps65090_suspend(struct device *dev)
-{
-	struct i2c_client *client = to_i2c_client(dev);
-	if (client->irq)
-		disable_irq(client->irq);
-	return 0;
-}
-
-static int tps65090_resume(struct device *dev)
-{
-	struct i2c_client *client = to_i2c_client(dev);
-	if (client->irq)
-		enable_irq(client->irq);
-	return 0;
-}
-#endif
-
-static const struct dev_pm_ops tps65090_pm_ops = {
-	SET_SYSTEM_SLEEP_PM_OPS(tps65090_suspend, tps65090_resume)
-};
-
 static const struct i2c_device_id tps65090_id_table[] = {
 	{ "tps65090", 0 },
 	{ },
@@ -263,7 +241,6 @@ static struct i2c_driver tps65090_driver = {
 		.name	= "tps65090",
 		.owner	= THIS_MODULE,
 		.of_match_table = of_match_ptr(tps65090_of_match),
-		.pm	= &tps65090_pm_ops,
 	},
 	.probe		= tps65090_i2c_probe,
 	.remove		= tps65090_i2c_remove,