From 93f379e6cfadfded0d262192ca69d1abc096d90e Mon Sep 17 00:00:00 2001
From: Benn Pörscke <benn.porscke@stericsson.com>
Date: Fri, 16 Dec 2011 15:04:55 +0100
Subject: Squash

Change-Id: I2fcf46d1fc4b0cd4c61e5be3654c43b80db86015
---
 drivers/input/misc/lps001wp_prs.c | 36 +++++++++++++++++++++++++++---------
 1 file changed, 27 insertions(+), 9 deletions(-)

(limited to 'drivers/input/misc/lps001wp_prs.c')

diff --git a/drivers/input/misc/lps001wp_prs.c b/drivers/input/misc/lps001wp_prs.c
index 9ec96ba3863..cb60762ac61 100644
--- a/drivers/input/misc/lps001wp_prs.c
+++ b/drivers/input/misc/lps001wp_prs.c
@@ -46,6 +46,7 @@
 #include <linux/input.h>
 #include <linux/workqueue.h>
 #include <linux/device.h>
+#include <linux/regulator/consumer.h>
 
 #include <linux/input/lps001wp.h>
 
@@ -164,6 +165,8 @@ struct lps001wp_prs_data {
 
 	u8 resume_state[RESUME_ENTRIES];
 
+	struct regulator *regulator;
+
 #ifdef DEBUG
 	u8 reg_addr;
 #endif
@@ -380,10 +383,13 @@ static void lps001wp_prs_device_power_off(struct lps001wp_prs_data *prs)
 	if (err < 0)
 		dev_err(&prs->client->dev, "soft power off failed: %d\n", err);
 
-	if (prs->pdata->power_off) {
-		prs->pdata->power_off();
-		prs->hw_initialized = 0;
+	/* disable regulator */
+	if (prs->regulator) {
+		err = regulator_disable(prs->regulator);
+		if (err < 0)
+			dev_err(&prs->client->dev, "failed to disable regulator\n");
 	}
+
 	if (prs->hw_initialized) {
 		prs->hw_initialized = 0;
 	}
@@ -394,15 +400,23 @@ static int lps001wp_prs_device_power_on(struct lps001wp_prs_data *prs)
 {
 	int err = -1;
 
-	if (prs->pdata->power_on) {
-		err = prs->pdata->power_on();
-		if (err < 0) {
-			dev_err(&prs->client->dev,
-					"power_on failed: %d\n", err);
-			return err;
+	/* get the regulator the first time */
+	if (!prs->regulator) {
+		prs->regulator = regulator_get(&prs->client->dev, "vdd");
+		if (IS_ERR(prs->regulator)) {
+			dev_err(&prs->client->dev, "failed to get regulator\n");
+			prs->regulator = NULL;
+			return PTR_ERR(prs->regulator);
 		}
 	}
 
+	/* enable it also */
+	err = regulator_enable(prs->regulator);
+	if (err < 0) {
+		dev_err(&prs->client->dev, "failed to enable regulator\n");
+		return err;
+	}
+
 	if (!prs->hw_initialized) {
 		err = lps001wp_prs_hw_init(prs);
 		if (prs->hw_working == 1 && err < 0) {
@@ -1210,6 +1224,10 @@ static int __devexit lps001wp_prs_remove(struct i2c_client *client)
 
 	if (prs->pdata->exit)
 		prs->pdata->exit();
+
+	if (prs->regulator)
+		regulator_put(prs->regulator);
+
 	kfree(prs->pdata);
 	kfree(prs);
 
-- 
cgit v1.2.3