From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751899AbbJLPEe (ORCPT ); Mon, 12 Oct 2015 11:04:34 -0400 Received: from mout.kundenserver.de ([212.227.126.130]:54526 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751782AbbJLPEb (ORCPT ); Mon, 12 Oct 2015 11:04:31 -0400 From: Arnd Bergmann To: linux-serial@vger.kernel.org, gregkh@linuxfoundation.org Cc: Jiri Slaby , linux-kernel@vger.kernel.org, Nicolas Ferre , u.kleine-koenig@pengutronix.de Subject: [PATCH] serial: fix mctrl helper functions Date: Mon, 12 Oct 2015 17:04:14 +0200 Message-ID: <5611419.Budt39N01Y@wuerfel> User-Agent: KMail/4.11.5 (Linux/3.16.0-10-generic; KDE/4.11.5; x86_64; ; ) MIME-Version: 1.0 Content-Transfer-Encoding: 7Bit Content-Type: text/plain; charset="us-ascii" X-Provags-ID: V03:K0:Crhs/t8VAeFGO7gsY9UGoOQ6Q1qdcXOsy/qVATVi7qZbE2G74lI DhtD11ocEj0wqWNLKLqK7NNHqHGY0lGiiGGadRA0CMtLwe4mDzG2VWjPyuEjgZU9SIhY7eN Q/YuO3sc2O1UTrAY95DNVrgpHHSU362n2nWvrhU9V+hUmdba62SXCKP4FaqEU8+pVCp6HP+ 1bgtATNLv71yWu3sl/Ugw== X-UI-Out-Filterresults: notjunk:1;V01:K0:PF5sORzBaR8=:KyMCXar5A9r5ENb0ku9GeF vb2cMAj21ZTOndqpZY5lu1iYNF15NqeZ+B1+HpNDIYqwg2mmXXc6wd38dHRbCL2z30sckOYM1 0z4eWdllb+WMeFa5StCRMJAwVpu3GFCsRhqW2+2NJE5xqoIucLDq95FOD/KJm4U7NU4n7ULmj ovw618dhWBs/MKoM7Pn94Lg037wjDe1iTPs+2sij5+g7jp8GbtJ8z3R7K9vv/WCIMLXzS1V1r 3S760TdbyWbSLDo2/KzzFtnwoGJUbxJxwEHNzQJCdDeMbgE3e1UzvENd2niFM37do9LhGIUeN NnVOr4xSSMPX+arA8Or+04krrZR63EyQIHgEQvDacc5zlDejt6CgCJezImU2dnAgCNgWyxHNz c4E2b6m04EZVsAqk6mfTQZJmlZQobOX3j2/jwQKL95p/v7p/YpGRxFmdekl5D/pphXcm/wCNZ 0yHKZxCB2bjb/m2NwXKzPpXgCg/CtaUTta3ceoBZs6GkDM2Kkcy7ZFOlrI+HKzOWcxKU1tM1v at1JoOUc9keBoNlPRJk79H1VL28aGUgNfr+4whEzWJiANAi21lkvB1Y8kqvGUwdK1rWYVOJQr QjGdAHi5DMdvFllpFlxxFxuF9Id3Dwk6TprzDMDHXt5kkTSm33YZSr/ze4T4eUSfSgRqODDse itnZv7RM4ow01W8HZHvQl7kXljzbs0JprZzJlfTtROMutkYGcPJzp7h9U9KIHBgfhm2lHqsql spwim+SEEpqb9DGS Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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: Arnd Bergmann Fixes: ce59e48fdbad ("serial: mctrl_gpio: implement interrupt handling") diff --git a/drivers/tty/serial/serial_mctrl_gpio.h b/drivers/tty/serial/serial_mctrl_gpio.h index 3c4ac9ae41f9..9716db283290 100644 --- a/drivers/tty/serial/serial_mctrl_gpio.h +++ b/drivers/tty/serial/serial_mctrl_gpio.h @@ -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) { }