1*4882a593SmuzhiyunFrom 0e07e82121697d99470a147eadad9a708889c4df Mon Sep 17 00:00:00 2001 2*4882a593SmuzhiyunFrom: Fabrice Fontaine <fontaine.fabrice@gmail.com> 3*4882a593SmuzhiyunDate: Thu, 2 Sep 2021 18:13:03 +0200 4*4882a593SmuzhiyunSubject: [PATCH] psmouse-back.c: fix build with gcc 11 5*4882a593Smuzhiyun 6*4882a593SmuzhiyunFix the following build failures with gcc 11 by defining inline 7*4882a593Smuzhiyunfunctions as static: 8*4882a593Smuzhiyun 9*4882a593Smuzhiyun/home/buildroot/autobuild/instance-3/output-1/host/lib/gcc/arm-buildroot-linux-gnueabihf/11.1.0/../../../../arm-buildroot-linux-gnueabihf/bin/ld: /home/buildroot/autobuild/instance-3/output-1/build/xvisor-0.3.0/build/drivers/drivers.o: in function `psmouse_extensions': 10*4882a593Smuzhiyun/home/buildroot/autobuild/instance-3/output-1/build/xvisor-0.3.0/drivers/input/mouse/psmouse-base.c:783: undefined reference to `lifebook_detect' 11*4882a593Smuzhiyun/home/buildroot/autobuild/instance-3/output-1/host/lib/gcc/arm-buildroot-linux-gnueabihf/11.1.0/../../../../arm-buildroot-linux-gnueabihf/bin/ld: /home/buildroot/autobuild/instance-3/output-1/build/xvisor-0.3.0/drivers/input/mouse/psmouse-base.c:783: undefined reference to `alps_detect' 12*4882a593Smuzhiyun/home/buildroot/autobuild/instance-3/output-1/host/lib/gcc/arm-buildroot-linux-gnueabihf/11.1.0/../../../../arm-buildroot-linux-gnueabihf/bin/ld: /home/buildroot/autobuild/instance-3/output-1/build/xvisor-0.3.0/drivers/input/mouse/psmouse-base.c:783: undefined reference to `ps2pp_init' 13*4882a593Smuzhiyun/home/buildroot/autobuild/instance-3/output-1/host/lib/gcc/arm-buildroot-linux-gnueabihf/11.1.0/../../../../arm-buildroot-linux-gnueabihf/bin/ld: /home/buildroot/autobuild/instance-3/output-1/build/xvisor-0.3.0/drivers/input/mouse/psmouse-base.c:783: undefined reference to `trackpoint_detect' 14*4882a593Smuzhiyun/home/buildroot/autobuild/instance-3/output-1/host/lib/gcc/arm-buildroot-linux-gnueabihf/11.1.0/../../../../arm-buildroot-linux-gnueabihf/bin/ld: /home/buildroot/autobuild/instance-3/output-1/build/xvisor-0.3.0/drivers/input/mouse/psmouse-base.c:783: undefined reference to `fsp_detect' 15*4882a593Smuzhiyun 16*4882a593SmuzhiyunFixes: 17*4882a593Smuzhiyun - http://autobuild.buildroot.org/results/69062b9c80567d135edd48890165e69881cf7295 18*4882a593Smuzhiyun 19*4882a593SmuzhiyunSigned-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com> 20*4882a593Smuzhiyun--- 21*4882a593Smuzhiyun drivers/input/mouse/alps.h | 4 ++-- 22*4882a593Smuzhiyun drivers/input/mouse/lifebook.h | 6 +++--- 23*4882a593Smuzhiyun drivers/input/mouse/logips2pp.h | 2 +- 24*4882a593Smuzhiyun drivers/input/mouse/sentelic.h | 4 ++-- 25*4882a593Smuzhiyun drivers/input/mouse/trackpoint.h | 2 +- 26*4882a593Smuzhiyun 5 files changed, 9 insertions(+), 9 deletions(-) 27*4882a593Smuzhiyun 28*4882a593Smuzhiyundiff --git a/drivers/input/mouse/alps.h b/drivers/input/mouse/alps.h 29*4882a593Smuzhiyunindex ae1ac354..acc1e89e 100644 30*4882a593Smuzhiyun--- a/drivers/input/mouse/alps.h 31*4882a593Smuzhiyun+++ b/drivers/input/mouse/alps.h 32*4882a593Smuzhiyun@@ -51,11 +51,11 @@ struct alps_data { 33*4882a593Smuzhiyun int alps_detect(struct psmouse *psmouse, bool set_properties); 34*4882a593Smuzhiyun int alps_init(struct psmouse *psmouse); 35*4882a593Smuzhiyun #else 36*4882a593Smuzhiyun-inline int alps_detect(struct psmouse *psmouse, bool set_properties) 37*4882a593Smuzhiyun+static inline int alps_detect(struct psmouse *psmouse, bool set_properties) 38*4882a593Smuzhiyun { 39*4882a593Smuzhiyun return -ENOSYS; 40*4882a593Smuzhiyun } 41*4882a593Smuzhiyun-inline int alps_init(struct psmouse *psmouse) 42*4882a593Smuzhiyun+static inline int alps_init(struct psmouse *psmouse) 43*4882a593Smuzhiyun { 44*4882a593Smuzhiyun return -ENOSYS; 45*4882a593Smuzhiyun } 46*4882a593Smuzhiyundiff --git a/drivers/input/mouse/lifebook.h b/drivers/input/mouse/lifebook.h 47*4882a593Smuzhiyunindex 4c4326c6..0baf02a7 100644 48*4882a593Smuzhiyun--- a/drivers/input/mouse/lifebook.h 49*4882a593Smuzhiyun+++ b/drivers/input/mouse/lifebook.h 50*4882a593Smuzhiyun@@ -16,14 +16,14 @@ void lifebook_module_init(void); 51*4882a593Smuzhiyun int lifebook_detect(struct psmouse *psmouse, bool set_properties); 52*4882a593Smuzhiyun int lifebook_init(struct psmouse *psmouse); 53*4882a593Smuzhiyun #else 54*4882a593Smuzhiyun-inline void lifebook_module_init(void) 55*4882a593Smuzhiyun+static inline void lifebook_module_init(void) 56*4882a593Smuzhiyun { 57*4882a593Smuzhiyun } 58*4882a593Smuzhiyun-inline int lifebook_detect(struct psmouse *psmouse, bool set_properties) 59*4882a593Smuzhiyun+static inline int lifebook_detect(struct psmouse *psmouse, bool set_properties) 60*4882a593Smuzhiyun { 61*4882a593Smuzhiyun return -ENOSYS; 62*4882a593Smuzhiyun } 63*4882a593Smuzhiyun-inline int lifebook_init(struct psmouse *psmouse) 64*4882a593Smuzhiyun+static inline int lifebook_init(struct psmouse *psmouse) 65*4882a593Smuzhiyun { 66*4882a593Smuzhiyun return -ENOSYS; 67*4882a593Smuzhiyun } 68*4882a593Smuzhiyundiff --git a/drivers/input/mouse/logips2pp.h b/drivers/input/mouse/logips2pp.h 69*4882a593Smuzhiyunindex 0c186f02..439e9c58 100644 70*4882a593Smuzhiyun--- a/drivers/input/mouse/logips2pp.h 71*4882a593Smuzhiyun+++ b/drivers/input/mouse/logips2pp.h 72*4882a593Smuzhiyun@@ -14,7 +14,7 @@ 73*4882a593Smuzhiyun #ifdef CONFIG_MOUSE_PS2_LOGIPS2PP 74*4882a593Smuzhiyun int ps2pp_init(struct psmouse *psmouse, bool set_properties); 75*4882a593Smuzhiyun #else 76*4882a593Smuzhiyun-inline int ps2pp_init(struct psmouse *psmouse, bool set_properties) 77*4882a593Smuzhiyun+static inline int ps2pp_init(struct psmouse *psmouse, bool set_properties) 78*4882a593Smuzhiyun { 79*4882a593Smuzhiyun return -ENOSYS; 80*4882a593Smuzhiyun } 81*4882a593Smuzhiyundiff --git a/drivers/input/mouse/sentelic.h b/drivers/input/mouse/sentelic.h 82*4882a593Smuzhiyunindex aa697ece..42df9e3b 100644 83*4882a593Smuzhiyun--- a/drivers/input/mouse/sentelic.h 84*4882a593Smuzhiyun+++ b/drivers/input/mouse/sentelic.h 85*4882a593Smuzhiyun@@ -123,11 +123,11 @@ struct fsp_data { 86*4882a593Smuzhiyun extern int fsp_detect(struct psmouse *psmouse, bool set_properties); 87*4882a593Smuzhiyun extern int fsp_init(struct psmouse *psmouse); 88*4882a593Smuzhiyun #else 89*4882a593Smuzhiyun-inline int fsp_detect(struct psmouse *psmouse, bool set_properties) 90*4882a593Smuzhiyun+static inline int fsp_detect(struct psmouse *psmouse, bool set_properties) 91*4882a593Smuzhiyun { 92*4882a593Smuzhiyun return -ENOSYS; 93*4882a593Smuzhiyun } 94*4882a593Smuzhiyun-inline int fsp_init(struct psmouse *psmouse) 95*4882a593Smuzhiyun+static inline int fsp_init(struct psmouse *psmouse) 96*4882a593Smuzhiyun { 97*4882a593Smuzhiyun return -ENOSYS; 98*4882a593Smuzhiyun } 99*4882a593Smuzhiyundiff --git a/drivers/input/mouse/trackpoint.h b/drivers/input/mouse/trackpoint.h 100*4882a593Smuzhiyunindex e558a709..f14e59c0 100644 101*4882a593Smuzhiyun--- a/drivers/input/mouse/trackpoint.h 102*4882a593Smuzhiyun+++ b/drivers/input/mouse/trackpoint.h 103*4882a593Smuzhiyun@@ -145,7 +145,7 @@ struct trackpoint_data 104*4882a593Smuzhiyun #ifdef CONFIG_MOUSE_PS2_TRACKPOINT 105*4882a593Smuzhiyun int trackpoint_detect(struct psmouse *psmouse, bool set_properties); 106*4882a593Smuzhiyun #else 107*4882a593Smuzhiyun-inline int trackpoint_detect(struct psmouse *psmouse, bool set_properties) 108*4882a593Smuzhiyun+static inline int trackpoint_detect(struct psmouse *psmouse, bool set_properties) 109*4882a593Smuzhiyun { 110*4882a593Smuzhiyun return -ENOSYS; 111*4882a593Smuzhiyun } 112*4882a593Smuzhiyun-- 113*4882a593Smuzhiyun2.32.0 114*4882a593Smuzhiyun 115