tty: serial: bcm63xx_uart: drop bcm_{readl,writel} macros
authorFlorian Fainelli <florian@openwrt.org>
Fri, 6 Dec 2013 02:26:05 +0000 (18:26 -0800)
committerRalf Baechle <ralf@linux-mips.org>
Thu, 23 Jan 2014 12:02:36 +0000 (13:02 +0100)
bcm_{readl,writel} macros expand to __raw_{readl,writel}, use these
directly such that we do not rely on the platform to provide these for
us. As a result, we no longer use bcm63xx_io.h, so remove that inclusion
too.

Signed-off-by: Florian Fainelli <florian@openwrt.org>
Signed-off-by: John Crispin <blogic@openwrt.org>
Patchwork: http://patchwork.linux-mips.org/patch/6201/

drivers/tty/serial/bcm63xx_uart.c

index 2e72752d46bd59352c4e1ee32ec70ec33be959dd..6d773a3792c7c8d4500b6916261ae19dc98b6d0e 100644 (file)
@@ -31,7 +31,6 @@
 #include <linux/serial_core.h>
 
 #include <bcm63xx_regs.h>
-#include <bcm63xx_io.h>
 
 #define BCM63XX_NR_UARTS       2
 
@@ -80,13 +79,13 @@ static struct uart_port ports[BCM63XX_NR_UARTS];
 static inline unsigned int bcm_uart_readl(struct uart_port *port,
                                         unsigned int offset)
 {
-       return bcm_readl(port->membase + offset);
+       return __raw_readl(port->membase + offset);
 }
 
 static inline void bcm_uart_writel(struct uart_port *port,
                                  unsigned int value, unsigned int offset)
 {
-       bcm_writel(value, port->membase + offset);
+       __raw_writel(value, port->membase + offset);
 }
 
 /*