aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/tty
diff options
context:
space:
mode:
authorFlorian Fainelli <florian@openwrt.org>2013-12-05 21:26:05 -0500
committerRalf Baechle <ralf@linux-mips.org>2014-01-23 07:02:36 -0500
commit99cf97907015025bb4d386115afacaafc9fa6da0 (patch)
treeca9773f85135e2ebb574292d603b739591718395 /drivers/tty
parentc8fb5a271cb98e19daeb400431bc3d0793afc2fe (diff)
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.c5
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 @@
31#include <linux/serial_core.h> 31#include <linux/serial_core.h>
32 32
33#include <bcm63xx_regs.h> 33#include <bcm63xx_regs.h>
34#include <bcm63xx_io.h>
35 34
36#define BCM63XX_NR_UARTS 2 35#define BCM63XX_NR_UARTS 2
37 36
@@ -80,13 +79,13 @@ static struct uart_port ports[BCM63XX_NR_UARTS];
80static inline unsigned int bcm_uart_readl(struct uart_port *port, 79static inline unsigned int bcm_uart_readl(struct uart_port *port,
81 unsigned int offset) 80 unsigned int offset)
82{ 81{
83 return bcm_readl(port->membase + offset); 82 return __raw_readl(port->membase + offset);
84} 83}
85 84
86static inline void bcm_uart_writel(struct uart_port *port, 85static inline void bcm_uart_writel(struct uart_port *port,
87 unsigned int value, unsigned int offset) 86 unsigned int value, unsigned int offset)
88{ 87{
89 bcm_writel(value, port->membase + offset); 88 __raw_writel(value, port->membase + offset);
90} 89}
91 90
92/* 91/*