summaryrefslogtreecommitdiffstats
path: root/drivers/input/mouse/hgpk.h
diff options
context:
space:
mode:
authorHui Wang <hui.wang@canonical.com>2019-08-20 21:07:01 +0200
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2019-08-20 23:15:36 +0200
commitcfd8579ddc02d8c5024bae7106ba37079653b3d2 (patch)
tree73fd7dcd7a80e03f3e7fdf9c8b1826d91df922d6 /drivers/input/mouse/hgpk.h
parentInput: add support for polling to input devices (diff)
downloadlinux-cfd8579ddc02d8c5024bae7106ba37079653b3d2.tar.xz
linux-cfd8579ddc02d8c5024bae7106ba37079653b3d2.zip
Input: psmouse - drop all unneeded functions from mouse headers
Recently we had a building error if we enable the MOUSE_PS2_ALPS while disable the MOUSE_PS2_TRACKPOINT, and was fixed by 49e6979e7e92 ("Input: psmouse - fix build error of multiple definition"). We could improve that fix by dropping all unneeded functions and CONFIG_MOUSE_ guards from the header, it is safe to do that since those functions are not directly called by psmouse-base.c anymore. Signed-off-by: Hui Wang <hui.wang@canonical.com> Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Diffstat (limited to 'drivers/input/mouse/hgpk.h')
-rw-r--r--drivers/input/mouse/hgpk.h13
1 files changed, 3 insertions, 10 deletions
diff --git a/drivers/input/mouse/hgpk.h b/drivers/input/mouse/hgpk.h
index 98b7b384229b..ce041591f1a8 100644
--- a/drivers/input/mouse/hgpk.h
+++ b/drivers/input/mouse/hgpk.h
@@ -47,22 +47,15 @@ struct hgpk_data {
int xsaw_secondary, ysaw_secondary; /* jumpiness detection */
};
-#ifdef CONFIG_MOUSE_PS2_OLPC
-void hgpk_module_init(void);
int hgpk_detect(struct psmouse *psmouse, bool set_properties);
int hgpk_init(struct psmouse *psmouse);
+
+#ifdef CONFIG_MOUSE_PS2_OLPC
+void hgpk_module_init(void);
#else
static inline void hgpk_module_init(void)
{
}
-static inline int hgpk_detect(struct psmouse *psmouse, bool set_properties)
-{
- return -ENODEV;
-}
-static inline int hgpk_init(struct psmouse *psmouse)
-{
- return -ENODEV;
-}
#endif
#endif