mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-10-06 16:49:22 +00:00
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: Andres Salomon <dilinger@queued.net> Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
This commit is contained in:
parent
023cea0ecf
commit
bd26f3d6fb
2 changed files with 12 additions and 5 deletions
|
@ -1092,28 +1092,33 @@ static void psmouse_initialize(struct psmouse *psmouse)
|
||||||
* psmouse_activate() enables the mouse so that we get motion reports from it.
|
* 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_warn(psmouse, "Failed to enable mouse on %s\n",
|
||||||
psmouse->ps2dev.serio->phys);
|
psmouse->ps2dev.serio->phys);
|
||||||
|
return -1;
|
||||||
|
}
|
||||||
|
|
||||||
psmouse_set_state(psmouse, PSMOUSE_ACTIVATED);
|
psmouse_set_state(psmouse, PSMOUSE_ACTIVATED);
|
||||||
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* psmouse_deactivate() puts the mouse into poll mode so that we don't get motion
|
* psmouse_deactivate() puts the mouse into poll mode so that we don't get motion
|
||||||
* reports from it unless we explicitly request it.
|
* 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_warn(psmouse, "Failed to deactivate mouse on %s\n",
|
||||||
psmouse->ps2dev.serio->phys);
|
psmouse->ps2dev.serio->phys);
|
||||||
|
return -1;
|
||||||
|
}
|
||||||
|
|
||||||
psmouse_set_state(psmouse, PSMOUSE_CMD_MODE);
|
psmouse_set_state(psmouse, PSMOUSE_CMD_MODE);
|
||||||
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -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_state(struct psmouse *psmouse, enum psmouse_state new_state);
|
||||||
void psmouse_set_resolution(struct psmouse *psmouse, unsigned int resolution);
|
void psmouse_set_resolution(struct psmouse *psmouse, unsigned int resolution);
|
||||||
psmouse_ret_t psmouse_process_byte(struct psmouse *psmouse);
|
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 psmouse_attribute {
|
||||||
struct device_attribute dattr;
|
struct device_attribute dattr;
|
||||||
|
|
Loading…
Reference in a new issue