Commit f01c5e65 authored by Dmitry Torokhov's avatar Dmitry Torokhov
Browse files

Merge branch 'psmouse-passthrough' into next 

Bring in changes to limit number of protocols we try on pass-though PS/2
ports so that probe ocmpletes faster.
parents 40e3be39 190e2031

drivers/input/mouse/focaltech.c

+6 −16
Original line number Original line Diff line number Diff line
@@ -49,12 +49,6 @@ int focaltech_detect(struct psmouse *psmouse, bool set_properties) 
	return 0;

	return 0;

}

}





static void focaltech_reset(struct psmouse *psmouse)

{

	ps2_command(&psmouse->ps2dev, NULL, PSMOUSE_CMD_RESET_DIS);

	psmouse_reset(psmouse);

}



#ifdef CONFIG_MOUSE_PS2_FOCALTECH

#ifdef CONFIG_MOUSE_PS2_FOCALTECH





/*

/*
@@ -300,6 +294,12 @@ static int focaltech_switch_protocol(struct psmouse *psmouse) 
	return 0;

	return 0;

}

}





static void focaltech_reset(struct psmouse *psmouse)

{

	ps2_command(&psmouse->ps2dev, NULL, PSMOUSE_CMD_RESET_DIS);

	psmouse_reset(psmouse);

}



static void focaltech_disconnect(struct psmouse *psmouse)

static void focaltech_disconnect(struct psmouse *psmouse)

{

{

	focaltech_reset(psmouse);

	focaltech_reset(psmouse);
@@ -456,14 +456,4 @@ int focaltech_init(struct psmouse *psmouse) 
	kfree(priv);

	kfree(priv);

	return error;

	return error;

}

}



#else /* CONFIG_MOUSE_PS2_FOCALTECH */



int focaltech_init(struct psmouse *psmouse)

{

	focaltech_reset(psmouse);



	return 0;

}



#endif /* CONFIG_MOUSE_PS2_FOCALTECH */
 
#endif /* CONFIG_MOUSE_PS2_FOCALTECH */

drivers/input/mouse/focaltech.h

+8 −0
Original line number Original line Diff line number Diff line
@@ -18,6 +18,14 @@ 
#define _FOCALTECH_H

#define _FOCALTECH_H





int focaltech_detect(struct psmouse *psmouse, bool set_properties);

int focaltech_detect(struct psmouse *psmouse, bool set_properties);



#ifdef CONFIG_MOUSE_PS2_FOCALTECH

int focaltech_init(struct psmouse *psmouse);

int focaltech_init(struct psmouse *psmouse);

#else

static inline int focaltech_init(struct psmouse *psmouse)

{

	return -ENOSYS;

}

#endif





#endif
 
#endif

drivers/input/mouse/logips2pp.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -325,7 +325,7 @@ static void ps2pp_set_model_properties(struct psmouse *psmouse, 
 * that support it.

 * that support it.

 */

 */





int ps2pp_init(struct psmouse *psmouse, bool set_properties)

int ps2pp_detect(struct psmouse *psmouse, bool set_properties)

{

{

	struct ps2dev *ps2dev = &psmouse->ps2dev;

	struct ps2dev *ps2dev = &psmouse->ps2dev;

	unsigned char param[4];

	unsigned char param[4];

drivers/input/mouse/logips2pp.h

+2 −2
Original line number Original line Diff line number Diff line
@@ -12,9 +12,9 @@ 
#define _LOGIPS2PP_H

#define _LOGIPS2PP_H





#ifdef CONFIG_MOUSE_PS2_LOGIPS2PP

#ifdef CONFIG_MOUSE_PS2_LOGIPS2PP

int ps2pp_init(struct psmouse *psmouse, bool set_properties);

int ps2pp_detect(struct psmouse *psmouse, bool set_properties);

#else

#else

inline int ps2pp_init(struct psmouse *psmouse, bool set_properties)

static inline int ps2pp_detect(struct psmouse *psmouse, bool set_properties)

{

{

	return -ENOSYS;

	return -ENOSYS;

}

}