leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Input: mouse - use local variables consistently

Browse Source 
If a function declares a variable to access a structure element,
use it consistently.

Signed-off-by: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
This commit is contained in:
Guenter Roeck 2017-01-21 23:44:46 -08:00 committed by Dmitry Torokhov
parent a0d86ecd23
commit ad56814fcc
9 changed files with 31 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/input/mouse/alps.c
View File

@ -1855,7 +1855,7 @@ static int alps_absolute_mode_v1_v2(struct psmouse *psmouse)
* Switch mouse to poll (remote) mode so motion data will not * Switch mouse to poll (remote) mode so motion data will not
* get in our way * get in our way
*/ */
return ps2_command(&psmouse->ps2dev, NULL, PSMOUSE_CMD_SETPOLL); return ps2_command(ps2dev, NULL, PSMOUSE_CMD_SETPOLL);
} }
static int alps_monitor_mode_send_word(struct psmouse *psmouse, u16 word) static int alps_monitor_mode_send_word(struct psmouse *psmouse, u16 word)

2
drivers/input/mouse/bcm5974.c
View File

@ -665,7 +665,7 @@ static int bcm5974_wellspring_mode(struct bcm5974 *dev, bool on)
char *data; char *data;
/* Type 3 does not require a mode switch */ /* Type 3 does not require a mode switch */
if (dev->cfg.tp_type == TYPE3) if (c->tp_type == TYPE3)
return 0; return 0;
data = kmalloc(c->um_size, GFP_KERNEL); data = kmalloc(c->um_size, GFP_KERNEL);

6
drivers/input/mouse/cyapa.c
View File

@ -832,8 +832,8 @@ static int cyapa_prepare_wakeup_controls(struct cyapa *cyapa)
int error; int error;
if (device_can_wakeup(dev)) { if (device_can_wakeup(dev)) {
error = sysfs_merge_group(&client->dev.kobj, error = sysfs_merge_group(&dev->kobj,
&cyapa_power_wakeup_group); &cyapa_power_wakeup_group);
if (error) { if (error) {
dev_err(dev, "failed to add power wakeup group: %d\n", dev_err(dev, "failed to add power wakeup group: %d\n",
error); error);
@ -1312,7 +1312,7 @@ static int cyapa_probe(struct i2c_client *client,
return error; return error;
} }
error = sysfs_create_group(&client->dev.kobj, &cyapa_sysfs_group); error = sysfs_create_group(&dev->kobj, &cyapa_sysfs_group);
if (error) { if (error) {
dev_err(dev, "failed to create sysfs entries: %d\n", error); dev_err(dev, "failed to create sysfs entries: %d\n", error);
return error; return error;

4
drivers/input/mouse/cypress_ps2.c
View File

@ -107,7 +107,7 @@ static int cypress_ps2_read_cmd_status(struct psmouse *psmouse,
enum psmouse_state old_state; enum psmouse_state old_state;
int pktsize; int pktsize;
ps2_begin_command(&psmouse->ps2dev); ps2_begin_command(ps2dev);
old_state = psmouse->state; old_state = psmouse->state;
psmouse->state = PSMOUSE_CMD_MODE; psmouse->state = PSMOUSE_CMD_MODE;
@ -133,7 +133,7 @@ out:
psmouse->state = old_state; psmouse->state = old_state;
psmouse->pktcnt = 0; psmouse->pktcnt = 0;
ps2_end_command(&psmouse->ps2dev); ps2_end_command(ps2dev);
return rc; return rc;
} }

46
drivers/input/mouse/elan_i2c_core.c
View File

@ -1041,8 +1041,7 @@ static int elan_probe(struct i2c_client *client,
return -EIO; return -EIO;
} }
data = devm_kzalloc(&client->dev, sizeof(struct elan_tp_data), data = devm_kzalloc(dev, sizeof(struct elan_tp_data), GFP_KERNEL);
GFP_KERNEL);
if (!data) if (!data)
return -ENOMEM; return -ENOMEM;
@ -1053,29 +1052,25 @@ static int elan_probe(struct i2c_client *client,
init_completion(&data->fw_completion); init_completion(&data->fw_completion);
mutex_init(&data->sysfs_mutex); mutex_init(&data->sysfs_mutex);
data->vcc = devm_regulator_get(&client->dev, "vcc"); data->vcc = devm_regulator_get(dev, "vcc");
if (IS_ERR(data->vcc)) { if (IS_ERR(data->vcc)) {
error = PTR_ERR(data->vcc); error = PTR_ERR(data->vcc);
if (error != -EPROBE_DEFER) if (error != -EPROBE_DEFER)
dev_err(&client->dev, dev_err(dev, "Failed to get 'vcc' regulator: %d\n",
"Failed to get 'vcc' regulator: %d\n",
error); error);
return error; return error;
} }
error = regulator_enable(data->vcc); error = regulator_enable(data->vcc);
if (error) { if (error) {
dev_err(&client->dev, dev_err(dev, "Failed to enable regulator: %d\n", error);
"Failed to enable regulator: %d\n", error);
return error; return error;
} }
error = devm_add_action(&client->dev, error = devm_add_action(dev, elan_disable_regulator, data);
elan_disable_regulator, data);
if (error) { if (error) {
regulator_disable(data->vcc); regulator_disable(data->vcc);
dev_err(&client->dev, dev_err(dev, "Failed to add disable regulator action: %d\n",
"Failed to add disable regulator action: %d\n",
error); error);
return error; return error;
} }
@ -1093,14 +1088,14 @@ static int elan_probe(struct i2c_client *client,
if (error) if (error)
return error; return error;
dev_info(&client->dev, dev_info(dev,
"Elan Touchpad: Module ID: 0x%04x, Firmware: 0x%04x, Sample: 0x%04x, IAP: 0x%04x\n", "Elan Touchpad: Module ID: 0x%04x, Firmware: 0x%04x, Sample: 0x%04x, IAP: 0x%04x\n",
data->product_id, data->product_id,
data->fw_version, data->fw_version,
data->sm_version, data->sm_version,
data->iap_version); data->iap_version);
dev_dbg(&client->dev, dev_dbg(dev,
"Elan Touchpad Extra Information:\n" "Elan Touchpad Extra Information:\n"
" Max ABS X,Y: %d,%d\n" " Max ABS X,Y: %d,%d\n"
" Width X,Y: %d,%d\n" " Width X,Y: %d,%d\n"
@ -1118,38 +1113,33 @@ static int elan_probe(struct i2c_client *client,
* Systems using device tree should set up interrupt via DTS, * Systems using device tree should set up interrupt via DTS,
* the rest will use the default falling edge interrupts. * the rest will use the default falling edge interrupts.
*/ */
irqflags = client->dev.of_node ? 0 : IRQF_TRIGGER_FALLING; irqflags = dev->of_node ? 0 : IRQF_TRIGGER_FALLING;
error = devm_request_threaded_irq(&client->dev, client->irq, error = devm_request_threaded_irq(dev, client->irq, NULL, elan_isr,
NULL, elan_isr,
irqflags | IRQF_ONESHOT, irqflags | IRQF_ONESHOT,
client->name, data); client->name, data);
if (error) { if (error) {
dev_err(&client->dev, "cannot register irq=%d\n", client->irq); dev_err(dev, "cannot register irq=%d\n", client->irq);
return error; return error;
} }
error = sysfs_create_groups(&client->dev.kobj, elan_sysfs_groups); error = sysfs_create_groups(&dev->kobj, elan_sysfs_groups);
if (error) { if (error) {
dev_err(&client->dev, "failed to create sysfs attributes: %d\n", dev_err(dev, "failed to create sysfs attributes: %d\n", error);
error);
return error; return error;
} }
error = devm_add_action(&client->dev, error = devm_add_action(dev, elan_remove_sysfs_groups, data);
elan_remove_sysfs_groups, data);
if (error) { if (error) {
elan_remove_sysfs_groups(data); elan_remove_sysfs_groups(data);
dev_err(&client->dev, dev_err(dev, "Failed to add sysfs cleanup action: %d\n",
"Failed to add sysfs cleanup action: %d\n",
error); error);
return error; return error;
} }
error = input_register_device(data->input); error = input_register_device(data->input);
if (error) { if (error) {
dev_err(&client->dev, "failed to register input device: %d\n", dev_err(dev, "failed to register input device: %d\n", error);
error);
return error; return error;
} }
@ -1157,8 +1147,8 @@ static int elan_probe(struct i2c_client *client,
* Systems using device tree should set up wakeup via DTS, * Systems using device tree should set up wakeup via DTS,
* the rest will configure device as wakeup source by default. * the rest will configure device as wakeup source by default.
*/ */
if (!client->dev.of_node) if (!dev->of_node)
device_init_wakeup(&client->dev, true); device_init_wakeup(dev, true);
return 0; return 0;
} }

2
drivers/input/mouse/elantech.c
View File

@ -1412,7 +1412,7 @@ int elantech_detect(struct psmouse *psmouse, bool set_properties)
struct ps2dev *ps2dev = &psmouse->ps2dev; struct ps2dev *ps2dev = &psmouse->ps2dev;
unsigned char param[3]; unsigned char param[3];
ps2_command(&psmouse->ps2dev, NULL, PSMOUSE_CMD_RESET_DIS); ps2_command(ps2dev, NULL, PSMOUSE_CMD_RESET_DIS);
if (ps2_command(ps2dev, NULL, PSMOUSE_CMD_DISABLE) || if (ps2_command(ps2dev, NULL, PSMOUSE_CMD_DISABLE) ||
ps2_command(ps2dev, NULL, PSMOUSE_CMD_SETSCALE11) || ps2_command(ps2dev, NULL, PSMOUSE_CMD_SETSCALE11) ||

5
drivers/input/mouse/hgpk.c
View File

@ -713,8 +713,7 @@ static int hgpk_toggle_powersave(struct psmouse *psmouse, int enable)
* the upper bound. (in practice, it takes about 3 loops.) * the upper bound. (in practice, it takes about 3 loops.)
*/ */
for (timeo = 20; timeo > 0; timeo--) { for (timeo = 20; timeo > 0; timeo--) {
if (!ps2_sendbyte(&psmouse->ps2dev, if (!ps2_sendbyte(ps2dev, PSMOUSE_CMD_DISABLE, 20))
PSMOUSE_CMD_DISABLE, 20))
break; break;
msleep(25); msleep(25);
} }
@ -740,7 +739,7 @@ static int hgpk_toggle_powersave(struct psmouse *psmouse, int enable)
psmouse_set_state(psmouse, PSMOUSE_IGNORE); psmouse_set_state(psmouse, PSMOUSE_IGNORE);
/* probably won't see an ACK, the touchpad will be off */ /* probably won't see an ACK, the touchpad will be off */
ps2_sendbyte(&psmouse->ps2dev, 0xec, 20); ps2_sendbyte(ps2dev, 0xec, 20);
} }
return 0; return 0;

2
drivers/input/mouse/logips2pp.c
View File

@ -402,7 +402,7 @@ int ps2pp_detect(struct psmouse *psmouse, bool set_properties)
psmouse->set_resolution = ps2pp_set_resolution; psmouse->set_resolution = ps2pp_set_resolution;
psmouse->disconnect = ps2pp_disconnect; psmouse->disconnect = ps2pp_disconnect;
error = device_create_file(&psmouse->ps2dev.serio->dev, error = device_create_file(&ps2dev->serio->dev,
&psmouse_attr_smartscroll.dattr); &psmouse_attr_smartscroll.dattr);
if (error) { if (error) {
psmouse_err(psmouse, psmouse_err(psmouse,

4
drivers/input/mouse/trackpoint.c
View File

@ -379,7 +379,7 @@ int trackpoint_detect(struct psmouse *psmouse, bool set_properties)
if (!set_properties) if (!set_properties)
return 0; return 0;
if (trackpoint_read(&psmouse->ps2dev, TP_EXT_BTN, &button_info)) { if (trackpoint_read(ps2dev, TP_EXT_BTN, &button_info)) {
psmouse_warn(psmouse, "failed to get extended button data\n"); psmouse_warn(psmouse, "failed to get extended button data\n");
button_info = 0; button_info = 0;
} }
@ -402,7 +402,7 @@ int trackpoint_detect(struct psmouse *psmouse, bool set_properties)
trackpoint_defaults(psmouse->private); trackpoint_defaults(psmouse->private);
error = trackpoint_power_on_reset(&psmouse->ps2dev); error = trackpoint_power_on_reset(ps2dev);
/* Write defaults to TP only if reset fails. */ /* Write defaults to TP only if reset fails. */
if (error) if (error)