diff options
| author | Florian Fainelli <florian@openwrt.org> | 2013-12-05 18:26:05 -0800 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2014-01-23 13:02:36 +0100 |
| commit | 99cf97907015025bb4d386115afacaafc9fa6da0 (patch) | |
| tree | ca9773f85135e2ebb574292d603b739591718395 /drivers/tty | |
| parent | c8fb5a271cb98e19daeb400431bc3d0793afc2fe (diff) | |
| download | linux-99cf97907015025bb4d386115afacaafc9fa6da0.tar.bz2 | |
tty: serial: bcm63xx_uart: drop bcm_{readl,writel} macros
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/
Diffstat (limited to 'drivers/tty')
| -rw-r--r-- | drivers/tty/serial/bcm63xx_uart.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/tty/serial/bcm63xx_uart.c b/drivers/tty/serial/bcm63xx_uart.c index 2e72752d46bd..6d773a3792c7 100644 --- a/drivers/tty/serial/bcm63xx_uart.c +++ b/drivers/tty/serial/bcm63xx_uart.c @@ -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); } /* |