From daea65a7be76953bb80d13d0ac43e7441fd42cdf Mon Sep 17 00:00:00 2001 From: Daniel Thompson Date: Tue, 23 Sep 2014 08:31:30 +0100 Subject: serial: asc: Conditionally use readl_relaxed (COMPILE_TEST) Commit 08177ece596c ("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 Signed-off-by: Daniel Thompson Cc: Srinivas Kandagatla Cc: Maxime Coquelin Cc: Patrice Chotard Cc: Jiri Slaby Signed-off-by: Greg Kroah-Hartman --- drivers/tty/serial/st-asc.c | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'drivers/tty/serial') diff --git a/drivers/tty/serial/st-asc.c b/drivers/tty/serial/st-asc.c index a3fc1678d2b9..a3165842ca29 100644 --- a/drivers/tty/serial/st-asc.c +++ b/drivers/tty/serial/st-asc.c @@ -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) { +#ifdef readl_relaxed 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) -- cgit v1.2.3