Commit daea65a7 authored Sep 23, 2014 by Daniel Thompson Committed by Greg Kroah-Hartman Sep 28, 2014

serial: asc: Conditionally use readl_relaxed (COMPILE_TEST)



Commit 08177ece ("serial: asc: Adopt readl_/writel_relaxed()) is
regressing the m68k allmodconfig build. This is due to the unconditional
use of readl_relaxed() which, although documented, does not currently
exist for m68k.

This is trivially fixable for st-asc because we can just update the
asc_in() accessor to make this conditional.

Reported-by: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: Daniel Thompson <daniel.thompson@linaro.org>
Cc: Srinivas Kandagatla <srinivas.kandagatla@gmail.com>
Cc: Maxime Coquelin <maxime.coquelin@st.com>
Cc: Patrice Chotard <patrice.chotard@st.com>
Cc: Jiri Slaby <jslaby@suse.cz>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

parent 2dea53bf

drivers/tty/serial/st-asc.c

+4 −0

Original line number	Original line	Diff line number	Diff line
	@@ -151,7 +151,11 @@ static inline struct asc_port to_asc_port(struct uart_port port)

	static inline u32 asc_in(struct uart_port *port, u32 offset)		static inline u32 asc_in(struct uart_port *port, u32 offset)
	{		{
			#ifdef readl_relaxed
	return readl_relaxed(port->membase + offset);		return readl_relaxed(port->membase + offset);
			#else
			return readl(port->membase + offset);
			#endif
	}		}

	static inline void asc_out(struct uart_port *port, u32 offset, u32 value)		static inline void asc_out(struct uart_port *port, u32 offset, u32 value)