| Message ID | 1430072122-9902-1-git-send-email-raj.khem@gmail.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Sun, Apr 26, 2015 at 06:15:22PM +0000, Khem Raj wrote: > gcc-5 defaults to gnu11 which used c99 inline semantics > in c99 'inline' is not externally visible unlike gnu89, therefore > we use 'static inline' which has same semantics between gnu89 and c99 > > Signed-off-by: Khem Raj <raj.khem@gmail.com> > CC: Dmitry Torokhov <dmitry.torokhov@gmail.com> Applied, thank you. > --- > drivers/input/mouse/sentelic.h | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/drivers/input/mouse/sentelic.h b/drivers/input/mouse/sentelic.h > index aa697ec..42df9e3 100644 > --- a/drivers/input/mouse/sentelic.h > +++ b/drivers/input/mouse/sentelic.h > @@ -123,11 +123,11 @@ struct fsp_data { > extern int fsp_detect(struct psmouse *psmouse, bool set_properties); > extern int fsp_init(struct psmouse *psmouse); > #else > -inline int fsp_detect(struct psmouse *psmouse, bool set_properties) > +static inline int fsp_detect(struct psmouse *psmouse, bool set_properties) > { > return -ENOSYS; > } > -inline int fsp_init(struct psmouse *psmouse) > +static inline int fsp_init(struct psmouse *psmouse) > { > return -ENOSYS; > } > -- > 2.1.4 >
diff --git a/drivers/input/mouse/sentelic.h b/drivers/input/mouse/sentelic.h index aa697ec..42df9e3 100644 --- a/drivers/input/mouse/sentelic.h +++ b/drivers/input/mouse/sentelic.h @@ -123,11 +123,11 @@ struct fsp_data { extern int fsp_detect(struct psmouse *psmouse, bool set_properties); extern int fsp_init(struct psmouse *psmouse); #else -inline int fsp_detect(struct psmouse *psmouse, bool set_properties) +static inline int fsp_detect(struct psmouse *psmouse, bool set_properties) { return -ENOSYS; } -inline int fsp_init(struct psmouse *psmouse) +static inline int fsp_init(struct psmouse *psmouse) { return -ENOSYS; }
gcc-5 defaults to gnu11 which used c99 inline semantics in c99 'inline' is not externally visible unlike gnu89, therefore we use 'static inline' which has same semantics between gnu89 and c99 Signed-off-by: Khem Raj <raj.khem@gmail.com> CC: Dmitry Torokhov <dmitry.torokhov@gmail.com> --- drivers/input/mouse/sentelic.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)