renegade-project/linux-next
2
0
Fork 0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-28 07:04:00 +08:00
Code

staging: synaptics: Update with the kernel object name of touch device

Browse Source 
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>
This commit is contained in:
Naveen Kumar Gaddipati 2011-01-21 15:50:16 +05:30 committed by Greg Kroah-Hartman
parent 3ec6080e2e
commit 4ac638b2ce
2 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/staging/ste_rmi4/synaptics_i2c_rmi4.c
View File

@ -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);

1
drivers/staging/ste_rmi4/synaptics_i2c_rmi4.h
View File

@ -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;