LKML Archive on lore.kernel.org
help / color / mirror / Atom feed
* [PATCH 1/2] staging:synaptics: Update with the kernel object name of touch device
@ 2011-01-21 10:20 Naveen Kumar G
  0 siblings, 0 replies; only message in thread
From: Naveen Kumar G @ 2011-01-21 10:20 UTC (permalink / raw)
  To: greg; +Cc: linux-kernel, STEricsson_nomadik_linux, Naveen Kumar Gaddipati

From: Naveen Kumar Gaddipati <naveen.gaddipati@stericsson.com>

Update with the kernel object name of touch device for getting
the regulator of the synaptics rmi4 touch device.

Signed-off-by: Naveen Kumar Gaddipati <naveen.gaddipati@stericsson.com>
---
 drivers/staging/ste_rmi4/synaptics_i2c_rmi4.c |    6 ++----
 drivers/staging/ste_rmi4/synaptics_i2c_rmi4.h |    1 -
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/drivers/staging/ste_rmi4/synaptics_i2c_rmi4.c b/drivers/staging/ste_rmi4/synaptics_i2c_rmi4.c
index 80183a7..21c1efd 100644
--- a/drivers/staging/ste_rmi4/synaptics_i2c_rmi4.c
+++ b/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__);
@@ -993,7 +991,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/drivers/staging/ste_rmi4/synaptics_i2c_rmi4.h b/drivers/staging/ste_rmi4/synaptics_i2c_rmi4.h
index 820ae27..3686a2f 100644
--- a/drivers/staging/ste_rmi4/synaptics_i2c_rmi4.h
+++ b/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;
-- 
1.7.2.dirty


^ permalink raw reply	[flat|nested] only message in thread

only message in thread, other threads:[~2011-01-21 10:21 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2011-01-21 10:20 [PATCH 1/2] staging:synaptics: Update with the kernel object name of touch device Naveen Kumar G

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).