]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
tty: serial: bcm63xx_uart: define UART_REG_SIZE constant
authorFlorian Fainelli <f.fainelli@gmail.com>
Thu, 20 Feb 2014 18:15:52 +0000 (10:15 -0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sat, 1 Mar 2014 00:27:18 +0000 (16:27 -0800)
The bcm63xx_uart driver uses RSET_UART_SIZE which is a constant defined
for MIPS-based BCM63xx platforms, pull this constant value from the
MIPS-specific header and put it in include/linux/serial_bcm63xx.h to
make the driver platform agnostic.

Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/tty/serial/bcm63xx_uart.c
include/linux/serial_bcm63xx.h

index d71143e4e9dfd220a97c751ab4eea5de4e4a742f..37e7e336f70a54e54d8bb2a64a108dcde814b9b0 100644 (file)
@@ -589,7 +589,7 @@ static int bcm_uart_request_port(struct uart_port *port)
 {
        unsigned int size;
 
-       size = RSET_UART_SIZE;
+       size = UART_REG_SIZE;
        if (!request_mem_region(port->mapbase, size, "bcm63xx")) {
                dev_err(port->dev, "Memory region busy\n");
                return -EBUSY;
@@ -609,7 +609,7 @@ static int bcm_uart_request_port(struct uart_port *port)
  */
 static void bcm_uart_release_port(struct uart_port *port)
 {
-       release_mem_region(port->mapbase, RSET_UART_SIZE);
+       release_mem_region(port->mapbase, UART_REG_SIZE);
        iounmap(port->membase);
 }
 
index 570e964dc899c39928ec18dce0db1073838c986f..a80aa1a5bee2bebc53c87e7fde4e6e4881a38fee 100644 (file)
                                        UART_FIFO_PARERR_MASK |         \
                                        UART_FIFO_BRKDET_MASK)
 
+#define UART_REG_SIZE                  24
+
 #endif /* _LINUX_SERIAL_BCM63XX_H */