Commit 74ee31b1 authored by Russell King's avatar Russell King

[SERIAL] Unuse old SERIAL_IO_xxx macros.

8250.c should be using the replacement UPIO_xxx macros instead.
parent e72509c4
No related merge requests found
...@@ -177,11 +177,11 @@ static _INLINE_ unsigned int serial_in(struct uart_8250_port *up, int offset) ...@@ -177,11 +177,11 @@ static _INLINE_ unsigned int serial_in(struct uart_8250_port *up, int offset)
offset <<= up->port.regshift; offset <<= up->port.regshift;
switch (up->port.iotype) { switch (up->port.iotype) {
case SERIAL_IO_HUB6: case UPIO_HUB6:
outb(up->port.hub6 - 1 + offset, up->port.iobase); outb(up->port.hub6 - 1 + offset, up->port.iobase);
return inb(up->port.iobase + 1); return inb(up->port.iobase + 1);
case SERIAL_IO_MEM: case UPIO_MEM:
return readb(up->port.membase + offset); return readb(up->port.membase + offset);
default: default:
...@@ -195,12 +195,12 @@ serial_out(struct uart_8250_port *up, int offset, int value) ...@@ -195,12 +195,12 @@ serial_out(struct uart_8250_port *up, int offset, int value)
offset <<= up->port.regshift; offset <<= up->port.regshift;
switch (up->port.iotype) { switch (up->port.iotype) {
case SERIAL_IO_HUB6: case UPIO_HUB6:
outb(up->port.hub6 - 1 + offset, up->port.iobase); outb(up->port.hub6 - 1 + offset, up->port.iobase);
outb(value, up->port.iobase + 1); outb(value, up->port.iobase + 1);
break; break;
case SERIAL_IO_MEM: case UPIO_MEM:
writeb(value, up->port.membase + offset); writeb(value, up->port.membase + offset);
break; break;
...@@ -1613,7 +1613,7 @@ serial8250_request_std_resource(struct uart_8250_port *up, struct resource **res ...@@ -1613,7 +1613,7 @@ serial8250_request_std_resource(struct uart_8250_port *up, struct resource **res
int ret = 0; int ret = 0;
switch (up->port.iotype) { switch (up->port.iotype) {
case SERIAL_IO_MEM: case UPIO_MEM:
if (up->port.mapbase) { if (up->port.mapbase) {
*res = request_mem_region(up->port.mapbase, size, "serial"); *res = request_mem_region(up->port.mapbase, size, "serial");
if (!*res) if (!*res)
...@@ -1621,8 +1621,8 @@ serial8250_request_std_resource(struct uart_8250_port *up, struct resource **res ...@@ -1621,8 +1621,8 @@ serial8250_request_std_resource(struct uart_8250_port *up, struct resource **res
} }
break; break;
case SERIAL_IO_HUB6: case UPIO_HUB6:
case SERIAL_IO_PORT: case UPIO_PORT:
*res = request_region(up->port.iobase, size, "serial"); *res = request_region(up->port.iobase, size, "serial");
if (!*res) if (!*res)
ret = -EBUSY; ret = -EBUSY;
...@@ -1639,7 +1639,7 @@ serial8250_request_rsa_resource(struct uart_8250_port *up, struct resource **res ...@@ -1639,7 +1639,7 @@ serial8250_request_rsa_resource(struct uart_8250_port *up, struct resource **res
int ret = 0; int ret = 0;
switch (up->port.iotype) { switch (up->port.iotype) {
case SERIAL_IO_MEM: case UPIO_MEM:
if (up->port.mapbase) { if (up->port.mapbase) {
start = up->port.mapbase; start = up->port.mapbase;
start += UART_RSA_BASE << up->port.regshift; start += UART_RSA_BASE << up->port.regshift;
...@@ -1649,8 +1649,8 @@ serial8250_request_rsa_resource(struct uart_8250_port *up, struct resource **res ...@@ -1649,8 +1649,8 @@ serial8250_request_rsa_resource(struct uart_8250_port *up, struct resource **res
} }
break; break;
case SERIAL_IO_HUB6: case UPIO_HUB6:
case SERIAL_IO_PORT: case UPIO_PORT:
start = up->port.iobase; start = up->port.iobase;
start += UART_RSA_BASE << up->port.regshift; start += UART_RSA_BASE << up->port.regshift;
*res = request_region(start, size, "serial-rsa"); *res = request_region(start, size, "serial-rsa");
...@@ -1675,7 +1675,7 @@ static void serial8250_release_port(struct uart_port *port) ...@@ -1675,7 +1675,7 @@ static void serial8250_release_port(struct uart_port *port)
size <<= up->port.regshift; size <<= up->port.regshift;
switch (up->port.iotype) { switch (up->port.iotype) {
case SERIAL_IO_MEM: case UPIO_MEM:
if (up->port.mapbase) { if (up->port.mapbase) {
/* /*
* Unmap the area. * Unmap the area.
...@@ -1691,8 +1691,8 @@ static void serial8250_release_port(struct uart_port *port) ...@@ -1691,8 +1691,8 @@ static void serial8250_release_port(struct uart_port *port)
} }
break; break;
case SERIAL_IO_HUB6: case UPIO_HUB6:
case SERIAL_IO_PORT: case UPIO_PORT:
start = up->port.iobase; start = up->port.iobase;
if (size) if (size)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment