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