Skip to content

Commit

Permalink
staging: synaptics: Update with the kernel object name of touch device
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Naveen Kumar Gaddipati authored and Greg Kroah-Hartman committed Jan 21, 2011
1 parent 3ec6080 commit 4ac638b
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 5 deletions.
6 changes: 2 additions & 4 deletions drivers/staging/ste_rmi4/synaptics_i2c_rmi4.c
Original file line number Diff line number Diff line change
Expand Up @@ -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__);
Expand Down Expand Up @@ -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);
Expand Down
1 change: 0 additions & 1 deletion drivers/staging/ste_rmi4/synaptics_i2c_rmi4.h
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down

0 comments on commit 4ac638b

Please sign in to comment.