Merge git://git.kernel.org/pub/scm/linux/kernel/git/hirofumi/fatfs-2.6

[sfrench/cifs-2.6.git] / drivers / serial / 8250_early.c

diff --git a/drivers/serial/8250_early.c b/drivers/serial/8250_early.c
index 4d4c9f01be8da7dbde5fa1951cbfbf5ab8bfb593..f279745e9fefe9f07114923d58ebaec052dda4cf 100644 (file)
--- a/drivers/serial/8250_early.c
+++ b/drivers/serial/8250_early.c
@@ -76,13 +76,14 @@ static void __init wait_for_xmitr(struct uart_port *port)
        }
 }
 
-static void __init putc(struct uart_port *port, int c)
+static void __init serial_putc(struct uart_port *port, int c)
 {
        wait_for_xmitr(port);
        serial_out(port, UART_TX, c);
 }
 
-static void __init early_serial8250_write(struct console *console, const char *s, unsigned int count)
+static void __init early_serial8250_write(struct console *console,
+                                       const char *s, unsigned int count)
 {
        struct uart_port *port = &early_device.port;
        unsigned int ier;
@@ -91,7 +92,7 @@ static void __init early_serial8250_write(struct console *console, const char *s
        ier = serial_in(port, UART_IER);
        serial_out(port, UART_IER, 0);
 
-       uart_console_write(port, s, count, putc);
+       uart_console_write(port, s, count, serial_putc);
 
        /* Wait for transmitter to become empty and restore the IER */
        wait_for_xmitr(port);
@@ -132,7 +133,8 @@ static void __init init_port(struct early_serial8250_device *device)
        serial_out(port, UART_LCR, c & ~UART_LCR_DLAB);
 }
 
-static int __init parse_options(struct early_serial8250_device *device, char *options)
+static int __init parse_options(struct early_serial8250_device *device,
+                                                               char *options)
 {
        struct uart_port *port = &device->port;
        int mmio, length;
@@ -145,14 +147,16 @@ static int __init parse_options(struct early_serial8250_device *device, char *op
                port->iotype = UPIO_MEM;
                port->mapbase = simple_strtoul(options + 5, &options, 0);
 #ifdef CONFIG_FIX_EARLYCON_MEM
-               set_fixmap_nocache(FIX_EARLYCON_MEM_BASE, port->mapbase & PAGE_MASK);
-               port->membase = (void __iomem *)__fix_to_virt(FIX_EARLYCON_MEM_BASE);
+               set_fixmap_nocache(FIX_EARLYCON_MEM_BASE,
+                                       port->mapbase & PAGE_MASK);
+               port->membase =
+                       (void __iomem *)__fix_to_virt(FIX_EARLYCON_MEM_BASE);
                port->membase += port->mapbase & ~PAGE_MASK;
 #else
-               port->membase = ioremap(port->mapbase, 64);
+               port->membase = ioremap_nocache(port->mapbase, 64);
                if (!port->membase) {
                        printk(KERN_ERR "%s: Couldn't ioremap 0x%llx\n",
-                               __FUNCTION__,
+                               __func__,
                               (unsigned long long)port->mapbase);
                        return -ENOMEM;
                }
@@ -165,7 +169,8 @@ static int __init parse_options(struct early_serial8250_device *device, char *op
        } else
                return -EINVAL;
 
-       if ((options = strchr(options, ','))) {
+       options = strchr(options, ',');
+       if (options) {
                options++;
                device->baud = simple_strtoul(options, NULL, 0);
                length = min(strcspn(options, " "), sizeof(device->options));
@@ -179,7 +184,7 @@ static int __init parse_options(struct early_serial8250_device *device, char *op
        printk(KERN_INFO "Early serial console at %s 0x%llx (options '%s')\n",
                mmio ? "MMIO" : "I/O port",
                mmio ? (unsigned long long) port->mapbase
-                    : (unsigned long long) port->iobase,
+                    : (unsigned long long) port->iobase,
                device->options);
        return 0;
 }
@@ -199,7 +204,8 @@ static int __init early_serial8250_setup(char *options)
        if (device->port.membase || device->port.iobase)
                return 0;
 
-       if ((err = parse_options(device, options)) < 0)
+       err = parse_options(device, options);
+       if (err < 0)
                return err;
 
        init_port(device);
@@ -219,7 +225,8 @@ int __init setup_early_serial8250_console(char *cmdline)
        }
 
        options = strchr(cmdline, ',') + 1;
-       if ((err = early_serial8250_setup(options)) < 0)
+       err = early_serial8250_setup(options);
+       if (err < 0)
                return err;
 
        register_console(&early_serial8250_console);