Skip to contentSkip to conversation

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

PATCH Superseded Dmitry Torokhov 1 participant 2 messages Dec 2, 2015

Subsystems (2)
HID Input drivers

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore

Dmitry Torokhov

author maintainer
#0 lore raw

PATCH 1/1 Input: psmouse - rename ps2pp_init() to ps2pp_detect()

This makes Logitech PS2++ protocol implementation consistent with the naming in other protocols.

Signed-off-by Dmitry Torokhov <[email protected]>
---
 drivers/input/mouse/logips2pp.h    | 4 ++--
 drivers/input/mouse/psmouse-base.c | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)
drivers/input/mouse/logips2pp.h +2 -2
index 0c186f0..075fd32 100644
@@ -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
index e909c6e..90d9218 100644
@@ -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
 	{
Signature · 5 lines
2.6.0.rc2.230.g3dd15c0


-- 
Dmitry
author maintainer
#1 lore raw
Quoted 4 lines · Dmitry Torokhov

This makes Logitech PS2++ protocol implementation consistent with the naming in other protocols.

Signed-off-by Dmitry Torokhov <[email protected]>

Well, if I did not forget to add drivers/input/mouse/logips2pp.c that woudl be better...

Quoted 40 lines
---
 drivers/input/mouse/logips2pp.h    | 4 ++--
 drivers/input/mouse/psmouse-base.c | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)
drivers/input/mouse/logips2pp.h +2 -2
index 0c186f0..075fd32 100644
@@ -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
index e909c6e..90d9218 100644
@@ -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
 	{
Signature · 5 lines
2.6.0.rc2.230.g3dd15c0


-- 
Dmitry
Signature · 1 line
Dmitry