From 947c7fd2b8b8d8bf9908f3466f07ce1b9ec15073 Mon Sep 17 00:00:00 2001
From: Naveen Kumar Gaddipati <naveen.gaddipati@stericsson.com>
Date: Fri, 21 Jan 2011 15:50:16 +0530
Subject: [PATCH] --- yaml --- r: 235679 b: refs/heads/master c:
 4ac638b2ce0738183019c9fe72a8cd1259eb2ad1 h: refs/heads/master i:   235677:
 6452e06272aa73a48bb61210327f710a62c657e2   235675:
 63a52f1d03744817150d9a000afa9451640b7064   235671:
 aab8766895733f84dc369891c8f8871a027496e0   235663:
 83a4f6e986a2939660a6502ad3c665354ff1764f   235647:
 0736a8e0b079c634bdf473c748979fc8f8e585f1 v: v3

---
 [refs]                                              | 2 +-
 trunk/drivers/staging/ste_rmi4/synaptics_i2c_rmi4.c | 6 ++----
 trunk/drivers/staging/ste_rmi4/synaptics_i2c_rmi4.h | 1 -
 3 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index 7267c198b356..d537ffbe4644 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3ec6080e2e5be05e6f7fbbe5ab20b0eab84e166b
+refs/heads/master: 4ac638b2ce0738183019c9fe72a8cd1259eb2ad1
diff --git a/trunk/drivers/staging/ste_rmi4/synaptics_i2c_rmi4.c b/trunk/drivers/staging/ste_rmi4/synaptics_i2c_rmi4.c
index e8f047e86a32..f69d3a34190a 100644
--- a/trunk/drivers/staging/ste_rmi4/synaptics_i2c_rmi4.c
+++ b/trunk/drivers/staging/ste_rmi4/synaptics_i2c_rmi4.c
@@ -924,10 +924,8 @@ static int __devinit synaptics_rmi4_probe
 		goto err_input;
 	}
 
-	dev_set_name(&client->dev, platformdata->name);
-
 	if (platformdata->regulator_en) {
-		rmi4_data->regulator = regulator_get(&client->dev, "v-touch");
+		rmi4_data->regulator = regulator_get(&client->dev, "vdd");
 		if (IS_ERR(rmi4_data->regulator)) {
 			dev_err(&client->dev, "%s:get regulator failed\n",
 								__func__);
@@ -999,7 +997,7 @@ static int __devinit synaptics_rmi4_probe
 	retval = request_threaded_irq(platformdata->irq_number, NULL,
 					synaptics_rmi4_irq,
 					platformdata->irq_type,
-					platformdata->name, rmi4_data);
+					DRIVER_NAME, rmi4_data);
 	if (retval) {
 		dev_err(&client->dev, "%s:Unable to get attn irq %d\n",
 				__func__, platformdata->irq_number);
diff --git a/trunk/drivers/staging/ste_rmi4/synaptics_i2c_rmi4.h b/trunk/drivers/staging/ste_rmi4/synaptics_i2c_rmi4.h
index 820ae275fa2b..3686a2ff5964 100644
--- a/trunk/drivers/staging/ste_rmi4/synaptics_i2c_rmi4.h
+++ b/trunk/drivers/staging/ste_rmi4/synaptics_i2c_rmi4.h
@@ -39,7 +39,6 @@
  * This structure gives platform data for rmi4.
  */
 struct synaptics_rmi4_platform_data {
-	const char *name;
 	int irq_number;
 	int irq_type;
 	bool x_flip;