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>

diff --git a/drivers/staging/ste_rmi4/synaptics_i2c_rmi4.c b/drivers/staging/ste_rmi4/synaptics_i2c_rmi4.c
index e8f047e86a3292dcaf286a706ff32121665d9f6e..f69d3a34190a68eb20dafb3104bbe56d046ec6d0 100644 (file)
--- 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 820ae275fa2b412f3a9db3df7e05d66d89025418..3686a2ff5964fdbd616dadf5fecce2d5b59f7464 100644 (file)
--- 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;