Commit 4ac638b2 authored by Naveen Kumar Gaddipati's avatar Naveen Kumar Gaddipati Committed by Greg Kroah-Hartman

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: default avatarNaveen Kumar Gaddipati <naveen.gaddipati@stericsson.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 3ec6080e
...@@ -924,10 +924,8 @@ static int __devinit synaptics_rmi4_probe ...@@ -924,10 +924,8 @@ static int __devinit synaptics_rmi4_probe
goto err_input; goto err_input;
} }
dev_set_name(&client->dev, platformdata->name);
if (platformdata->regulator_en) { 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)) { if (IS_ERR(rmi4_data->regulator)) {
dev_err(&client->dev, "%s:get regulator failed\n", dev_err(&client->dev, "%s:get regulator failed\n",
__func__); __func__);
...@@ -999,7 +997,7 @@ static int __devinit synaptics_rmi4_probe ...@@ -999,7 +997,7 @@ static int __devinit synaptics_rmi4_probe
retval = request_threaded_irq(platformdata->irq_number, NULL, retval = request_threaded_irq(platformdata->irq_number, NULL,
synaptics_rmi4_irq, synaptics_rmi4_irq,
platformdata->irq_type, platformdata->irq_type,
platformdata->name, rmi4_data); DRIVER_NAME, rmi4_data);
if (retval) { if (retval) {
dev_err(&client->dev, "%s:Unable to get attn irq %d\n", dev_err(&client->dev, "%s:Unable to get attn irq %d\n",
__func__, platformdata->irq_number); __func__, platformdata->irq_number);
......
...@@ -39,7 +39,6 @@ ...@@ -39,7 +39,6 @@
* This structure gives platform data for rmi4. * This structure gives platform data for rmi4.
*/ */
struct synaptics_rmi4_platform_data { struct synaptics_rmi4_platform_data {
const char *name;
int irq_number; int irq_number;
int irq_type; int irq_type;
bool x_flip; bool x_flip;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment