AcoSail/kernel_optimize_test
8
0
Fork 0
forked from luck/tmp_suning_uos_patched
Code Pull Requests Activity

[PARISC] Compile fixups for serial/mux.c

Browse Source 
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>
This commit is contained in:
Ryan Bradetich 2005-11-17 16:36:52 -05:00 committed by Kyle McMartin
parent 08dc2ca61e
commit 92495c0ebc
1 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
drivers/serial/mux.c
View File

@ -65,8 +65,8 @@ static struct uart_driver mux_driver = {
static struct timer_list mux_timer; 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_PUT_CHAR(p, c) __raw_writel((c), (p)->membase + IO_DATA_REG_OFFSET)
#define UART_GET_FIFO_CNT(p) __raw_readl((unsigned long)(p)->membase + IO_DCOUNT_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 #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) static unsigned int mux_tx_empty(struct uart_port *port)
{ {
unsigned int cnt = __raw_readl((unsigned long)port->membase return UART_GET_FIFO_CNT(port) ? 0 : TIOCSER_TEMT;
+ IO_DCOUNT_REG_OFFSET);
return cnt ? 0 : TIOCSER_TEMT;
} }
/** /**
@ -218,8 +215,7 @@ static void mux_read(struct uart_port *port)
__u32 start_count = port->icount.rx; __u32 start_count = port->icount.rx;
while(1) { while(1) {
data = __raw_readl((unsigned long)port->membase data = __raw_readl(port->membase + IO_DATA_REG_OFFSET);
+ IO_DATA_REG_OFFSET);
if (MUX_STATUS(data)) if (MUX_STATUS(data))
continue; continue;