On 2019/8/20 上午2:26, Dmitry Torokhov wrote:
Hi Hui, On Mon, Aug 19, 2019 at 09:55:00PM +0800, Hui Wang wrote: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 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@xxxxxxxxxxxxx> --- drivers/input/mouse/alps.h | 9 --------- drivers/input/mouse/byd.h | 9 --------- drivers/input/mouse/cypress_ps2.h | 9 --------- drivers/input/mouse/elantech.h | 13 ------------- drivers/input/mouse/hgpk.h | 8 -------- drivers/input/mouse/lifebook.h | 8 -------- drivers/input/mouse/logips2pp.h | 5 ----- drivers/input/mouse/sentelic.h | 9 --------- drivers/input/mouse/touchkit_ps2.h | 6 ------ drivers/input/mouse/trackpoint.h | 6 ------ drivers/input/mouse/vmmouse.h | 9 --------- 11 files changed, 91 deletions(-) diff --git a/drivers/input/mouse/alps.h b/drivers/input/mouse/alps.h index f4bab629739c..74ad10327c48 100644 --- a/drivers/input/mouse/alps.h +++ b/drivers/input/mouse/alps.h @@ -326,15 +326,6 @@ struct alps_data { #ifdef CONFIG_MOUSE_PS2_ALPSDo we need to keep the CONFIG_MOUSE_* guards if we are dropping stubs?
No, we don't need to keep them, will drop them all in the v2. Thanks.
int alps_detect(struct psmouse *psmouse, bool set_properties); int alps_init(struct psmouse *psmouse); -#else -inline int alps_detect(struct psmouse *psmouse, bool set_properties) -{ - return -ENOSYS; -} -inline int alps_init(struct psmouse *psmouse) -{ - return -ENOSYS; -} #endif /* CONFIG_MOUSE_PS2_ALPS */Thanks. - Dmitry
