iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Input: psmouse - use IS_ENABLED instead of homegrown code

Browse Source 
Instead of having various protocols provide <protocol>_supported()
functions, let's use IS_ENABLED() macro that works well in "if" statements.

Acked-by: Hans de Goede <hdegoede@redhat.com>
Reviewed-by: Benjamin Tissoires <benjamin.tissoires@redhat.com>
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
This commit is contained in:
Dmitry Torokhov 2014-12-29 12:06:38 -08:00
parent 97ae2b5c17
commit 290b799c39
7 changed files with 3 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/input/mouse/cypress_ps2.c
View File

@ -710,8 +710,3 @@ err_exit:
return -1; return -1;
} }
bool cypress_supported(void)
{
return true;
}

5
drivers/input/mouse/cypress_ps2.h
View File

@ -172,7 +172,6 @@ struct cytp_data {
#ifdef CONFIG_MOUSE_PS2_CYPRESS #ifdef CONFIG_MOUSE_PS2_CYPRESS
int cypress_detect(struct psmouse *psmouse, bool set_properties); int cypress_detect(struct psmouse *psmouse, bool set_properties);
int cypress_init(struct psmouse *psmouse); int cypress_init(struct psmouse *psmouse);
bool cypress_supported(void);
#else #else
inline int cypress_detect(struct psmouse *psmouse, bool set_properties) inline int cypress_detect(struct psmouse *psmouse, bool set_properties)
{ {
@ -182,10 +181,6 @@ inline int cypress_init(struct psmouse *psmouse)
{ {
return -ENOSYS; return -ENOSYS;
} }
inline bool cypress_supported(void)
{
return 0;
}
#endif /* CONFIG_MOUSE_PS2_CYPRESS */ #endif /* CONFIG_MOUSE_PS2_CYPRESS */
#endif /* _CYPRESS_PS2_H */ #endif /* _CYPRESS_PS2_H */

10
drivers/input/mouse/focaltech.c
View File

@ -424,11 +424,6 @@ fail:
return error; return error;
} }
bool focaltech_supported(void)
{
return true;
}
#else /* CONFIG_MOUSE_PS2_FOCALTECH */ #else /* CONFIG_MOUSE_PS2_FOCALTECH */
int focaltech_init(struct psmouse *psmouse) int focaltech_init(struct psmouse *psmouse)
@ -438,9 +433,4 @@ int focaltech_init(struct psmouse *psmouse)
return 0; return 0;
} }
bool focaltech_supported(void)
{
return false;
}
#endif /* CONFIG_MOUSE_PS2_FOCALTECH */ #endif /* CONFIG_MOUSE_PS2_FOCALTECH */

1
drivers/input/mouse/focaltech.h
View File

@ -19,6 +19,5 @@
int focaltech_detect(struct psmouse *psmouse, bool set_properties); int focaltech_detect(struct psmouse *psmouse, bool set_properties);
int focaltech_init(struct psmouse *psmouse); int focaltech_init(struct psmouse *psmouse);
bool focaltech_supported(void);
#endif #endif

6
drivers/input/mouse/psmouse-base.c
View File

@ -727,7 +727,7 @@ static int psmouse_extensions(struct psmouse *psmouse,
if (psmouse_do_detect(focaltech_detect, psmouse, set_properties) == 0) { if (psmouse_do_detect(focaltech_detect, psmouse, set_properties) == 0) {
if (max_proto > PSMOUSE_IMEX) { if (max_proto > PSMOUSE_IMEX) {
if (!set_properties || focaltech_init(psmouse) == 0) { if (!set_properties || focaltech_init(psmouse) == 0) {
if (focaltech_supported()) if (IS_ENABLED(CONFIG_MOUSE_PS2_FOCALTECH))
return PSMOUSE_FOCALTECH; return PSMOUSE_FOCALTECH;
/* /*
* Note that we need to also restrict * Note that we need to also restrict
@ -776,7 +776,7 @@ static int psmouse_extensions(struct psmouse *psmouse,
* Try activating protocol, but check if support is enabled first, since * Try activating protocol, but check if support is enabled first, since
* we try detecting Synaptics even when protocol is disabled. * we try detecting Synaptics even when protocol is disabled.
*/ */
if (synaptics_supported() && if (IS_ENABLED(CONFIG_MOUSE_PS2_SYNAPTICS) &&
(!set_properties || synaptics_init(psmouse) == 0)) { (!set_properties || synaptics_init(psmouse) == 0)) {
return PSMOUSE_SYNAPTICS; return PSMOUSE_SYNAPTICS;
} }
@ -801,7 +801,7 @@ static int psmouse_extensions(struct psmouse *psmouse,
*/ */
if (max_proto > PSMOUSE_IMEX && if (max_proto > PSMOUSE_IMEX &&
cypress_detect(psmouse, set_properties) == 0) { cypress_detect(psmouse, set_properties) == 0) {
if (cypress_supported()) { if (IS_ENABLED(CONFIG_MOUSE_PS2_CYPRESS)) {
if (cypress_init(psmouse) == 0) if (cypress_init(psmouse) == 0)
return PSMOUSE_CYPRESS; return PSMOUSE_CYPRESS;

10
drivers/input/mouse/synaptics.c
View File

@ -1454,11 +1454,6 @@ int synaptics_init_relative(struct psmouse *psmouse)
return __synaptics_init(psmouse, false); return __synaptics_init(psmouse, false);
} }
bool synaptics_supported(void)
{
return true;
}
#else /* CONFIG_MOUSE_PS2_SYNAPTICS */ #else /* CONFIG_MOUSE_PS2_SYNAPTICS */
void __init synaptics_module_init(void) void __init synaptics_module_init(void)
@ -1470,9 +1465,4 @@ int synaptics_init(struct psmouse *psmouse)
return -ENOSYS; return -ENOSYS;
} }
bool synaptics_supported(void)
{
return false;
}
#endif /* CONFIG_MOUSE_PS2_SYNAPTICS */ #endif /* CONFIG_MOUSE_PS2_SYNAPTICS */

1
drivers/input/mouse/synaptics.h
View File

@ -175,6 +175,5 @@ int synaptics_detect(struct psmouse *psmouse, bool set_properties);
int synaptics_init(struct psmouse *psmouse); int synaptics_init(struct psmouse *psmouse);
int synaptics_init_relative(struct psmouse *psmouse); int synaptics_init_relative(struct psmouse *psmouse);
void synaptics_reset(struct psmouse *psmouse); void synaptics_reset(struct psmouse *psmouse);
bool synaptics_supported(void);
#endif /* _SYNAPTICS_H */ #endif /* _SYNAPTICS_H */