diff options
| author | Ryan Bradetich <rbrad@parisc-linux.org> | 2005-11-17 22:36:52 +0100 |
|---|---|---|
| committer | Kyle McMartin <kyle@parisc-linux.org> | 2005-11-17 22:36:52 +0100 |
| commit | 92495c0ebc99ee00651571cba6939783234f7696 (patch) | |
| tree | db6ddc761e9481f1141bbac73e63c6b5f7c67560 /drivers/serial/mux.c | |
| parent | [PARISC] Fix our spinlock implementation (diff) | |
| download | linux-92495c0ebc99ee00651571cba6939783234f7696.tar.xz linux-92495c0ebc99ee00651571cba6939783234f7696.zip | |
[PARISC] Compile fixups for serial/mux.c
This patch does the following:
* Fixes compiler warnings.
* Replaces a __raw_readl call with the existing macro.
Signed-off-by: Ryan Bradetich <rbrad@parisc-linux.org>
Signed-off-by: Kyle McMartin <kyle@parisc-linux.org>
Diffstat (limited to '')
| -rw-r--r-- | drivers/serial/mux.c | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/drivers/serial/mux.c b/drivers/serial/mux.c index 660bae5ba179..36e3bcb1ebf0 100644 --- a/drivers/serial/mux.c +++ b/drivers/serial/mux.c @@ -65,8 +65,8 @@ static struct uart_driver mux_driver = { static struct timer_list mux_timer; -#define UART_PUT_CHAR(p, c) __raw_writel((c), (unsigned long)(p)->membase + IO_DATA_REG_OFFSET) -#define UART_GET_FIFO_CNT(p) __raw_readl((unsigned long)(p)->membase + IO_DCOUNT_REG_OFFSET) +#define UART_PUT_CHAR(p, c) __raw_writel((c), (p)->membase + IO_DATA_REG_OFFSET) +#define UART_GET_FIFO_CNT(p) __raw_readl((p)->membase + IO_DCOUNT_REG_OFFSET) #define GET_MUX_PORTS(iodc_data) ((((iodc_data)[4] & 0xf0) >> 4) * 8) + 8 /** @@ -79,10 +79,7 @@ static struct timer_list mux_timer; */ static unsigned int mux_tx_empty(struct uart_port *port) { - unsigned int cnt = __raw_readl((unsigned long)port->membase - + IO_DCOUNT_REG_OFFSET); - - return cnt ? 0 : TIOCSER_TEMT; + return UART_GET_FIFO_CNT(port) ? 0 : TIOCSER_TEMT; } /** @@ -218,8 +215,7 @@ static void mux_read(struct uart_port *port) __u32 start_count = port->icount.rx; while(1) { - data = __raw_readl((unsigned long)port->membase - + IO_DATA_REG_OFFSET); + data = __raw_readl(port->membase + IO_DATA_REG_OFFSET); if (MUX_STATUS(data)) continue; |