Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c35c0e7d authored by Paul Fox's avatar Paul Fox Committed by Dmitry Torokhov
Browse files

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: default avatarAndres Salomon <dilinger@queued.net>
Signed-off-by: default avatarDmitry Torokhov <dtor@mail.ru>
parent bd26f3d6

drivers/input/mouse/hgpk.c

+2 −7
Original line number Original line Diff line number Diff line
@@ -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");

drivers/input/mouse/sentelic.c

+4 −8
Original line number Original line Diff line number Diff line
@@ -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;