* [PATCH] Input: psmouse - rename ps2pp_init() to ps2pp_detect()
@ 2015-12-02 19:20 Dmitry Torokhov
2015-12-02 19:26 ` Dmitry Torokhov
0 siblings, 1 reply; 2+ messages in thread
From: Dmitry Torokhov @ 2015-12-02 19:20 UTC (permalink / raw)
To: linux-input, Hans de Goede; +Cc: linux-kernel
This makes Logitech PS2++ protocol implementation consistent with
the naming in other protocols.
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
---
drivers/input/mouse/logips2pp.h | 4 ++--
drivers/input/mouse/psmouse-base.c | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/input/mouse/logips2pp.h b/drivers/input/mouse/logips2pp.h
index 0c186f0..075fd32 100644
--- a/drivers/input/mouse/logips2pp.h
+++ b/drivers/input/mouse/logips2pp.h
@@ -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;
}
diff --git a/drivers/input/mouse/psmouse-base.c b/drivers/input/mouse/psmouse-base.c
index e909c6e..90d9218 100644
--- a/drivers/input/mouse/psmouse-base.c
+++ b/drivers/input/mouse/psmouse-base.c
@@ -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
{
--
2.6.0.rc2.230.g3dd15c0
--
Dmitry
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] Input: psmouse - rename ps2pp_init() to ps2pp_detect()
2015-12-02 19:20 [PATCH] Input: psmouse - rename ps2pp_init() to ps2pp_detect() Dmitry Torokhov
@ 2015-12-02 19:26 ` Dmitry Torokhov
0 siblings, 0 replies; 2+ messages in thread
From: Dmitry Torokhov @ 2015-12-02 19:26 UTC (permalink / raw)
To: linux-input, Hans de Goede; +Cc: linux-kernel
On Wed, Dec 02, 2015 at 11:20:44AM -0800, Dmitry Torokhov wrote:
> This makes Logitech PS2++ protocol implementation consistent with
> the naming in other protocols.
>
> Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Well, if I did not forget to add drivers/input/mouse/logips2pp.c that
woudl be better...
> ---
> drivers/input/mouse/logips2pp.h | 4 ++--
> drivers/input/mouse/psmouse-base.c | 2 +-
> 2 files changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/input/mouse/logips2pp.h b/drivers/input/mouse/logips2pp.h
> index 0c186f0..075fd32 100644
> --- a/drivers/input/mouse/logips2pp.h
> +++ b/drivers/input/mouse/logips2pp.h
> @@ -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;
> }
> diff --git a/drivers/input/mouse/psmouse-base.c b/drivers/input/mouse/psmouse-base.c
> index e909c6e..90d9218 100644
> --- a/drivers/input/mouse/psmouse-base.c
> +++ b/drivers/input/mouse/psmouse-base.c
> @@ -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
> {
> --
> 2.6.0.rc2.230.g3dd15c0
>
>
> --
> Dmitry
--
Dmitry
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2015-12-02 19:26 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-12-02 19:20 [PATCH] Input: psmouse - rename ps2pp_init() to ps2pp_detect() Dmitry Torokhov
2015-12-02 19:26 ` Dmitry Torokhov
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).