hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Input: psmouse - use psmouse_[de]activate() from sentelic and hgpk drivers 

Make use of psmouse_activate() and psmouse_deactivate() from psmouse-base.c

Signed-off-by: Andres Salomon <dilinger@queued.net>
Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
This commit is contained in:
Paul Fox 2012-02-24 00:51:37 -08:00 committed by Dmitry Torokhov
parent bd26f3d6fb
commit c35c0e7d42
2 changed files with 6 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -640,7 +640,6 @@ static int hgpk_reset_device(struct psmouse *psmouse, bool recalibrate)
static int hgpk_force_recalibrate(struct psmouse *psmouse) static int hgpk_force_recalibrate(struct psmouse *psmouse)
{ {
struct ps2dev *ps2dev = &psmouse->ps2dev;
struct hgpk_data *priv = psmouse->private; struct hgpk_data *priv = psmouse->private;
int err; int err;
@ -669,12 +668,9 @@ static int hgpk_force_recalibrate(struct psmouse *psmouse)
* we don't have a good way to deal with it. The 2s window stuff * we don't have a good way to deal with it. The 2s window stuff
* (below) is our best option for now. * (below) is our best option for now.
*/ */
if (psmouse_activate(psmouse))
if (ps2_command(ps2dev, NULL, PSMOUSE_CMD_ENABLE))
return -1; return -1;
psmouse_set_state(psmouse, PSMOUSE_ACTIVATED);
if (tpdebug) if (tpdebug)
psmouse_dbg(psmouse, "touchpad reactivated\n"); psmouse_dbg(psmouse, "touchpad reactivated\n");
@ -733,8 +729,7 @@ static int hgpk_toggle_powersave(struct psmouse *psmouse, int enable)
} }
/* should be all set, enable the touchpad */ /* should be all set, enable the touchpad */
ps2_command(&psmouse->ps2dev, NULL, PSMOUSE_CMD_ENABLE); psmouse_activate(psmouse);
psmouse_set_state(psmouse, PSMOUSE_ACTIVATED);
psmouse_dbg(psmouse, "Touchpad powered up.\n"); psmouse_dbg(psmouse, "Touchpad powered up.\n");
} else { } else {
psmouse_dbg(psmouse, "Powering off touchpad.\n"); psmouse_dbg(psmouse, "Powering off touchpad.\n");

12
drivers/input/mouse/sentelic.c
View File

@ -90,8 +90,7 @@ static int fsp_reg_read(struct psmouse *psmouse, int reg_addr, int *reg_val)
* to do that for writes because sysfs set helper does this for * to do that for writes because sysfs set helper does this for
* us. * us.
*/ */
ps2_command(ps2dev, NULL, PSMOUSE_CMD_DISABLE); psmouse_deactivate(psmouse);
psmouse_set_state(psmouse, PSMOUSE_CMD_MODE);
ps2_begin_command(ps2dev); ps2_begin_command(ps2dev);
@ -128,8 +127,7 @@ static int fsp_reg_read(struct psmouse *psmouse, int reg_addr, int *reg_val)
out: out:
ps2_end_command(ps2dev); ps2_end_command(ps2dev);
ps2_command(ps2dev, NULL, PSMOUSE_CMD_ENABLE); psmouse_activate(psmouse);
psmouse_set_state(psmouse, PSMOUSE_ACTIVATED);
dev_dbg(&ps2dev->serio->dev, "READ REG: 0x%02x is 0x%02x (rc = %d)\n", dev_dbg(&ps2dev->serio->dev, "READ REG: 0x%02x is 0x%02x (rc = %d)\n",
reg_addr, *reg_val, rc); reg_addr, *reg_val, rc);
return rc; return rc;
@ -213,8 +211,7 @@ static int fsp_page_reg_read(struct psmouse *psmouse, int *reg_val)
unsigned char param[3]; unsigned char param[3];
int rc = -1; int rc = -1;
ps2_command(ps2dev, NULL, PSMOUSE_CMD_DISABLE); psmouse_deactivate(psmouse);
psmouse_set_state(psmouse, PSMOUSE_CMD_MODE);
ps2_begin_command(ps2dev); ps2_begin_command(ps2dev);
@ -239,8 +236,7 @@ static int fsp_page_reg_read(struct psmouse *psmouse, int *reg_val)
out: out:
ps2_end_command(ps2dev); ps2_end_command(ps2dev);
ps2_command(ps2dev, NULL, PSMOUSE_CMD_ENABLE); psmouse_activate(psmouse);
psmouse_set_state(psmouse, PSMOUSE_ACTIVATED);
dev_dbg(&ps2dev->serio->dev, "READ PAGE REG: 0x%02x (rc = %d)\n", dev_dbg(&ps2dev->serio->dev, "READ PAGE REG: 0x%02x (rc = %d)\n",
*reg_val, rc); *reg_val, rc);
return rc; return rc;