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

Commit 190e2031 authored by Dmitry Torokhov's avatar Dmitry Torokhov
Browse files

Input: psmouse - rename ps2pp_init() to ps2pp_detect() 



This makes Logitech PS2++ protocol implementation consistent with
the naming in other protocols. Also mark the stub as "static inline"

Reviewed-by: default avatarHans de Goede <hdegoede@redhat.com>
Tested-by: default avatarMarcin Sochacki <msochacki+kernel@gmail.com>
Tested-by: default avatarTill <till2.schaefer@uni-dortmund.de>
Signed-off-by: default avatarDmitry Torokhov <dmitry.torokhov@gmail.com>
parent ec6184b1

drivers/input/mouse/logips2pp.c

+1 −1
Original line number Diff line number Diff line
@@ -325,7 +325,7 @@ static void ps2pp_set_model_properties(struct psmouse *psmouse, 
 * 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;

	unsigned char param[4];

drivers/input/mouse/logips2pp.h

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



#ifdef CONFIG_MOUSE_PS2_LOGIPS2PP

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

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

#else

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

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

{

	return -ENOSYS;

}

drivers/input/mouse/psmouse-base.c

+1 −1
Original line number Diff line number Diff line
@@ -699,7 +699,7 @@ static const struct psmouse_protocol psmouse_protocols[] = { 
		.type		= PSMOUSE_PS2PP,

		.name		= "PS2++",

		.alias		= "logitech",

		.detect		= ps2pp_init,

		.detect		= ps2pp_detect,

	},

#endif

	{