ARM: 8532/1: uncompress: mark putc as inline

arndb · Russell King · commit 4d2b7d4cb4e0 · 2016-02-22T16:55:42.000Z
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 &lt;arnd@arndb.de&gt;
Signed-off-by: Russell King &lt;rmk+kernel@arm.linux.org.uk&gt;
diff --git 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
@@ -17,7 +17,7 @@
 #include <linux/io.h>
 #include <mach/regs-uart.h>
 
-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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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.
 	 */

Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@`
`30`	`30`	`u32 *uart;`
`31`	`31`
`32`	`32`	`/* PORT_16C550A, in polled non-fifo mode */`
`33`		`-static void putc(char c)`
	`33`	`+static inline void putc(char c)`
`34`	`34`	`{`
`35`	`35`	`if (!uart)`
`36`	`36`	`return;`
Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@`
`17`	`17`	`#include <linux/io.h>`
`18`	`18`	`#include <mach/regs-uart.h>`
`19`	`19`
`20`		`-static void putc(char c)`
	`20`	`+static inline void putc(char c)`
`21`	`21`	`{`
`22`	`22`	`while (!(__raw_readl((void __iomem*)KS8695_UART_PA + KS8695_URLS) & URLS_URTHRE))`
`23`	`23`	`barrier();`
Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,7 @@`
`40`	`40`	`#define FR_BUSY (1<<3)`
`41`	`41`	`#define FR_TXFF (1<<5)`
`42`	`42`
`43`		`-static void putc(char c)`
	`43`	`+static inline void putc(char c)`
`44`	`44`	`{`
`45`	`45`	`unsigned long base;`
`46`	`46`
Original file line number	Diff line number	Diff line change
`@@ -45,7 +45,7 @@ static void set_omap_uart_info(unsigned char port)`
`45`	`45`	`*uart_info = port;`
`46`	`46`	`}`
`47`	`47`
`48`		`-static void putc(int c)`
	`48`	`+static inline void putc(int c)`
`49`	`49`	`{`
`50`	`50`	`if (!uart_base)`
`51`	`51`	`return;`
Original file line number	Diff line number	Diff line change
`@@ -76,7 +76,7 @@ int white;`
`76`	`76`	`/*`
`77`	`77`	`* This does not append a newline`
`78`	`78`	`*/`
`79`		`-static void putc(int c)`
	`79`	`+static inline void putc(int c)`
`80`	`80`	`{`
`81`	`81`	`extern void ll_write_char(char *, char c, char white);`
`82`	`82`	`int x,y;`
Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@`
`19`	`19`
`20`	`20`	`#define UART(x) ((volatile unsigned long )(serial_port + (x)))`
`21`	`21`
`22`		`-static void putc(int c)`
	`22`	`+static inline void putc(int c)`
`23`	`23`	`{`
`24`	`24`	`unsigned long serial_port;`
`25`	`25`
Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@`
`27`	`27`	`#define TX_DONE (UART_LSR_TEMT \| UART_LSR_THRE)`
`28`	`28`	`static volatile u32 * const uart_base = (u32 *)UART0_PA;`
`29`	`29`
`30`		`-static void putc(int ch)`
	`30`	`+static inline void putc(int ch)`
`31`	`31`	`{`
`32`	`32`	`/* Check THRE and TEMT bits before we transmit the character.`
`33`	`33`	`*/`