Commit 92495c0e authored by Ryan Bradetich's avatar Ryan Bradetich Committed by Kyle McMartin
Browse files

[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: default avatarRyan Bradetich <rbrad@parisc-linux.org>
Signed-off-by: default avatarKyle McMartin <kyle@parisc-linux.org>
parent 08dc2ca6

drivers/serial/mux.c

+4 −8
Original line number Diff line number Diff line
@@ -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;