aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/staging/ste_rmi4
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/staging/ste_rmi4')
-rw-r--r--drivers/staging/ste_rmi4/synaptics_i2c_rmi4.c10
-rw-r--r--drivers/staging/ste_rmi4/synaptics_i2c_rmi4.h1
2 files changed, 3 insertions, 8 deletions
diff --git a/drivers/staging/ste_rmi4/synaptics_i2c_rmi4.c b/drivers/staging/ste_rmi4/synaptics_i2c_rmi4.c
index 80183a7e6624..51b4a79e4b83 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,11 +991,11 @@ 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);
- goto err_unset_clientdata;
+ goto err_query_dev;
}
retval = input_register_device(rmi4_data->input_dev);
@@ -1010,8 +1008,6 @@ static int __devinit synaptics_rmi4_probe
err_free_irq:
free_irq(platformdata->irq_number, rmi4_data);
-err_unset_clientdata:
- i2c_set_clientdata(client, NULL);
err_query_dev:
if (platformdata->regulator_en) {
regulator_disable(rmi4_data->regulator);
diff --git a/drivers/staging/ste_rmi4/synaptics_i2c_rmi4.h b/drivers/staging/ste_rmi4/synaptics_i2c_rmi4.h
index 820ae275fa2b..3686a2ff5964 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