Commit 1b306f99 authored by Arnd Bergmann's avatar Arnd Bergmann Committed by Greg Kroah-Hartman

serial: fix mctrl helper functions

A recent patch to create common helper functions for modem control
lines created empty helper functions in a header file, but accidentally
did not mark them as 'static inline', which causes build errors:

drivers/tty/serial/mxs-auart.o: In function `mctrl_gpio_enable_ms':
mxs-auart.c:(.text+0x171c): multiple definition of `mctrl_gpio_enable_ms'
drivers/tty/serial/clps711x.o:clps711x.c:(.text+0x768): first defined here
drivers/tty/serial/mxs-auart.o: In function `mctrl_gpio_disable_ms':
mxs-auart.c:(.text+0x1720): multiple definition of `mctrl_gpio_disable_ms'
drivers/tty/serial/clps711x.o:clps711x.c:(.text+0x76c): first defined here

This adds the missing annotation, so the functions do not get placed
in each object file.
Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
Fixes: ce59e48f ("serial: mctrl_gpio: implement interrupt handling")
Acked-by: default avatarUwe Kleine-König <u.kleine-koenig@pengutronix.de>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent d9eda9ba
......@@ -133,11 +133,11 @@ void mctrl_gpio_free(struct device *dev, struct mctrl_gpios *gpios)
{
}
void mctrl_gpio_enable_ms(struct mctrl_gpios *gpios)
static inline void mctrl_gpio_enable_ms(struct mctrl_gpios *gpios)
{
}
void mctrl_gpio_disable_ms(struct mctrl_gpios *gpios)
static inline void mctrl_gpio_disable_ms(struct mctrl_gpios *gpios)
{
}
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment