diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2018-03-17 18:58:05 +0100 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2018-03-17 18:58:05 +0100 |
| commit | ba521f1bd202237d2c1dea95e4213169b8c6ba01 (patch) | |
| tree | 2a0a1b5e158a2a2311221f05b873cbae6672643d /drivers/input/mouse/synaptics.c | |
| parent | Input: gpio-keys - add support for wakeup event action (diff) | |
| parent | Input: trackpoint - combine calls to ps2_command() (diff) | |
| download | linux-ba521f1bd202237d2c1dea95e4213169b8c6ba01.tar.xz linux-ba521f1bd202237d2c1dea95e4213169b8c6ba01.zip | |
Merge branch 'psmouse' into next
Merge various PS/2 handling improvements.
Diffstat (limited to 'drivers/input/mouse/synaptics.c')
| -rw-r--r-- | drivers/input/mouse/synaptics.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/input/mouse/synaptics.c b/drivers/input/mouse/synaptics.c index dcb8e0cfaa1a..0d7c781674ca 100644 --- a/drivers/input/mouse/synaptics.c +++ b/drivers/input/mouse/synaptics.c @@ -84,7 +84,7 @@ static int synaptics_mode_cmd(struct psmouse *psmouse, u8 mode) u8 param[1]; int error; - error = psmouse_sliced_command(psmouse, mode); + error = ps2_sliced_command(&psmouse->ps2dev, mode); if (error) return error; @@ -190,7 +190,7 @@ static int synaptics_send_cmd(struct psmouse *psmouse, u8 cmd, u8 *param) { int error; - error = psmouse_sliced_command(psmouse, cmd); + error = ps2_sliced_command(&psmouse->ps2dev, cmd); if (error) return error; @@ -547,7 +547,7 @@ static int synaptics_set_advanced_gesture_mode(struct psmouse *psmouse) static u8 param = 0xc8; int error; - error = psmouse_sliced_command(psmouse, SYN_QUE_MODEL); + error = ps2_sliced_command(&psmouse->ps2dev, SYN_QUE_MODEL); if (error) return error; @@ -614,7 +614,7 @@ static int synaptics_pt_write(struct serio *serio, u8 c) u8 rate_param = SYN_PS_CLIENT_CMD; /* indicates that we want pass-through port */ int error; - error = psmouse_sliced_command(parent, c); + error = ps2_sliced_command(&parent->ps2dev, c); if (error) return error; |