aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/staging/ste_rmi4
diff options
context:
space:
mode:
authorNaveen Kumar Gaddipati <naveen.gaddipati@stericsson.com>2011-01-21 10:20:16 (GMT)
committerGreg Kroah-Hartman <gregkh@suse.de>2011-01-21 20:36:22 (GMT)
commit4ac638b2ce0738183019c9fe72a8cd1259eb2ad1 (patch)
treef2149bfa1fd707aedfc782daf1897bd9016e320b /drivers/staging/ste_rmi4
parent3ec6080e2e5be05e6f7fbbe5ab20b0eab84e166b (diff)
staging: synaptics: Update with the kernel object name of touch device
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> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/ste_rmi4')
-rw-r--r--drivers/staging/ste_rmi4/synaptics_i2c_rmi4.c6
-rw-r--r--drivers/staging/ste_rmi4/synaptics_i2c_rmi4.h1
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 e8f047e..f69d3a3 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__);
@@ -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/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;

Privacy Policy