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

Commit bd26f3d6 authored by Andres Salomon's avatar Andres Salomon Committed by Dmitry Torokhov
Browse files

Input: psmouse - allow drivers to use psmouse_{de,}activate 



Other drivers duplicate this code; no sense in having it be private
to psmouse-base.

Signed-off-by: default avatarAndres Salomon <dilinger@queued.net>
Signed-off-by: default avatarDmitry Torokhov <dtor@mail.ru>
parent 023cea0e

drivers/input/mouse/psmouse-base.c

+10 −5
Original line number Diff line number Diff line
@@ -1092,28 +1092,33 @@ static void psmouse_initialize(struct psmouse *psmouse) 
 * psmouse_activate() enables the mouse so that we get motion reports from it.

 */



static void psmouse_activate(struct psmouse *psmouse)

int psmouse_activate(struct psmouse *psmouse)

{

	if (ps2_command(&psmouse->ps2dev, NULL, PSMOUSE_CMD_ENABLE))

	if (ps2_command(&psmouse->ps2dev, NULL, PSMOUSE_CMD_ENABLE)) {

		psmouse_warn(psmouse, "Failed to enable mouse on %s\n",

			     psmouse->ps2dev.serio->phys);

		return -1;

	}



	psmouse_set_state(psmouse, PSMOUSE_ACTIVATED);

	return 0;

}





/*

 * psmouse_deactivate() puts the mouse into poll mode so that we don't get motion

 * reports from it unless we explicitly request it.

 */



static void psmouse_deactivate(struct psmouse *psmouse)

int psmouse_deactivate(struct psmouse *psmouse)

{

	if (ps2_command(&psmouse->ps2dev, NULL, PSMOUSE_CMD_DISABLE))

	if (ps2_command(&psmouse->ps2dev, NULL, PSMOUSE_CMD_DISABLE)) {

		psmouse_warn(psmouse, "Failed to deactivate mouse on %s\n",

			     psmouse->ps2dev.serio->phys);

		return -1;

	}



	psmouse_set_state(psmouse, PSMOUSE_CMD_MODE);

	return 0;

}

drivers/input/mouse/psmouse.h

+2 −0
Original line number Diff line number Diff line
@@ -105,6 +105,8 @@ int psmouse_reset(struct psmouse *psmouse); 
void psmouse_set_state(struct psmouse *psmouse, enum psmouse_state new_state);

void psmouse_set_resolution(struct psmouse *psmouse, unsigned int resolution);

psmouse_ret_t psmouse_process_byte(struct psmouse *psmouse);

int psmouse_activate(struct psmouse *psmouse);

int psmouse_deactivate(struct psmouse *psmouse);



struct psmouse_attribute {

	struct device_attribute dattr;