From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752224AbbLIQ0M (ORCPT ); Wed, 9 Dec 2015 11:26:12 -0500 Received: from mout.kundenserver.de ([212.227.126.135]:55885 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751989AbbLIQ0I (ORCPT ); Wed, 9 Dec 2015 11:26:08 -0500 From: Arnd Bergmann To: linux-arm-kernel@lists.infradead.org Cc: linux-kernel@vger.kernel.org Subject: [PATCH] ARM: uncompress: mark putc as inline Date: Wed, 09 Dec 2015 17:25:41 +0100 Message-ID: <1962264.KJrrNzEWG9@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:JSyq2MWmgxlaEPPhJ2Xv46E5OLmwNZVSvXElIBASuRMu6gD9eKB MZPpyy5OgbMOwSIpPaFwkrkKHd/lPCXDm10zlt7LYHMXlsGD881uI78b8bvFVePagFVnmPH 9Yf/hsLBtKsn14IfkNSKSIuwQBefEJKjuZBoJYUkdyC/kjjkg260FR1xYpk7QMZkCE05+Fi jsvGP/EnmAOOnFLft+g4g== X-UI-Out-Filterresults: notjunk:1;V01:K0:OX9Gm8EOF5M=:WS4v3QpZRgRoAuSAEOuxMk 1Tw4WT4QkHubNRT1GBSVs9GGQP/UnuKmnBqzPh0XUWAx49GKTThxdzLAbZFQ+4yjUkHubzIEk yo2g/PQbdxp1JDSEq90kT0Hl9IVZAnPrC5bf638RZBNKzPBbX+cRI+mJrLk+GbStUaHR/r6Yi b8oLynvx0iUYLFbGzLIprPak2Ig3xTxTaumBZYy1LkoZhPQt8jRXuYNFCIHuXD/VR4l8zWYsB lNvkEf63EuM2R+2mPV9Lp+kJqzPZ13Egk+8oTjroZ7Pz+Khl4qzqu9fjpD1IORLLULoDVd6ky igBLDqVTbkcyM066EjZCzZXAEQUzKSjYcNTPr3oDpoNXZZpbMdFELOrw/xh+HWC9rJGJouy07 DgsK1ZqlCZGze/5nybSUAlQYMJu6NmNxLw4ByW5ZzmIVduYXmoK9scbJv3DSrCRIKn/aukExx GO4HOTd717rI4uiqX6HjnraFPahHp2kfHPHea/Z20/aZK0At+/NMvaWj0m1cB379iRY46WkvB Gwf+byqEOTnrpXIjPScB2PbZRZcFMKIKQNdbo92OPQ5l+ae9C9Al0zrK1TNKkNllyL9x3uatX 2WkZwx9Y1L0oAbjsNJi1d6MdDlfoXXTpKqk3QzYfGb+tn6B8n179h+mZ3FUoKLSYD4jKB9yS0 aq21FE9PZQfH1E9Mmr5XDRZIW4cFk50Ues9YBJC+ZxVXtQ430ELmr8qh8f/AD55sX5GAzO5RV XPchI1h04nQQ0FpW Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org When CONFIG_DEBUG_ICEDCC is set, we don't use the platform specific putc() function, but use icedcc_putc() instead, so putc is unused and causes a compile time warning: In file included from ../arch/arm/boot/compressed/misc.c:28:0: arch/arm/mach-rpc/include/mach/uncompress.h:79:13: warning: 'putc' defined but not used [-Wunused-function] arch/arm/mach-w90x900/include/mach/uncompress.h:30:13: warning: 'putc' defined but not used [-Wunused-function] On most platforms, this does not happen, because putc is defined as 'static inline' so the compiler will automatically drop it when it's unused. This changes the remaining seven platforms to behave the same way. Signed-off-by: Arnd Bergmann diff --git a/arch/arm/mach-davinci/include/mach/uncompress.h b/arch/arm/mach-davinci/include/mach/uncompress.h index 8fb97b93b6bb..53b456a5bbe0 100644 --- a/arch/arm/mach-davinci/include/mach/uncompress.h +++ b/arch/arm/mach-davinci/include/mach/uncompress.h @@ -30,7 +30,7 @@ u32 *uart; /* PORT_16C550A, in polled non-fifo mode */ -static void putc(char c) +static inline void putc(char c) { if (!uart) return; diff --git a/arch/arm/mach-ks8695/include/mach/uncompress.h b/arch/arm/mach-ks8695/include/mach/uncompress.h index c089a1aea674..a001c7c34df2 100644 --- a/arch/arm/mach-ks8695/include/mach/uncompress.h +++ b/arch/arm/mach-ks8695/include/mach/uncompress.h @@ -17,7 +17,7 @@ #include #include -static void putc(char c) +static inline void putc(char c) { while (!(__raw_readl((void __iomem*)KS8695_UART_PA + KS8695_URLS) & URLS_URTHRE)) barrier(); diff --git a/arch/arm/mach-netx/include/mach/uncompress.h b/arch/arm/mach-netx/include/mach/uncompress.h index 5cb1051b5831..033875dbc32b 100644 --- a/arch/arm/mach-netx/include/mach/uncompress.h +++ b/arch/arm/mach-netx/include/mach/uncompress.h @@ -40,7 +40,7 @@ #define FR_BUSY (1<<3) #define FR_TXFF (1<<5) -static void putc(char c) +static inline void putc(char c) { unsigned long base; diff --git a/arch/arm/mach-omap1/include/mach/uncompress.h b/arch/arm/mach-omap1/include/mach/uncompress.h index 4869633de8cd..9cca6a56788f 100644 --- a/arch/arm/mach-omap1/include/mach/uncompress.h +++ b/arch/arm/mach-omap1/include/mach/uncompress.h @@ -45,7 +45,7 @@ static void set_omap_uart_info(unsigned char port) *uart_info = port; } -static void putc(int c) +static inline void putc(int c) { if (!uart_base) return; diff --git a/arch/arm/mach-rpc/include/mach/uncompress.h b/arch/arm/mach-rpc/include/mach/uncompress.h index 0fd4b0b8ef22..654a6f3f2547 100644 --- a/arch/arm/mach-rpc/include/mach/uncompress.h +++ b/arch/arm/mach-rpc/include/mach/uncompress.h @@ -76,7 +76,7 @@ int white; /* * This does not append a newline */ -static void putc(int c) +static inline void putc(int c) { extern void ll_write_char(char *, char c, char white); int x,y; diff --git a/arch/arm/mach-sa1100/include/mach/uncompress.h b/arch/arm/mach-sa1100/include/mach/uncompress.h index 73093dc89829..a1a041b9740b 100644 --- a/arch/arm/mach-sa1100/include/mach/uncompress.h +++ b/arch/arm/mach-sa1100/include/mach/uncompress.h @@ -19,7 +19,7 @@ #define UART(x) (*(volatile unsigned long *)(serial_port + (x))) -static void putc(int c) +static inline void putc(int c) { unsigned long serial_port; diff --git a/arch/arm/mach-w90x900/include/mach/uncompress.h b/arch/arm/mach-w90x900/include/mach/uncompress.h index 4b7c324ff664..3855ecebda6e 100644 --- a/arch/arm/mach-w90x900/include/mach/uncompress.h +++ b/arch/arm/mach-w90x900/include/mach/uncompress.h @@ -27,7 +27,7 @@ #define TX_DONE (UART_LSR_TEMT | UART_LSR_THRE) static volatile u32 * const uart_base = (u32 *)UART0_PA; -static void putc(int ch) +static inline void putc(int ch) { /* Check THRE and TEMT bits before we transmit the character. */