Merge tag 'nfs-for-3.12-2' of git://git.linux-nfs.org/projects/trondmy/linux-nfs

[~andy/linux] / drivers / tty / serial / pch_uart.c

diff --git a/drivers/tty/serial/pch_uart.c b/drivers/tty/serial/pch_uart.c
index 271cc733573cdbf5b031f4f3a7dba0e7af1a3011..52379e56a31e7abc43a6642a799b1be7744be6c8 100644 (file)
--- a/drivers/tty/serial/pch_uart.c
+++ b/drivers/tty/serial/pch_uart.c
@@ -232,7 +232,7 @@ struct eg20t_port {
        unsigned int iobase;
        struct pci_dev *pdev;
        int fifo_size;
-       int uartclk;
+       unsigned int uartclk;
        int start_tx;
        int start_rx;
        int tx_empty;
@@ -373,7 +373,7 @@ static const struct file_operations port_regs_ops = {
 };
 #endif /* CONFIG_DEBUG_FS */
 
-static struct dmi_system_id __initdata pch_uart_dmi_table[] = {
+static struct dmi_system_id pch_uart_dmi_table[] = {
        {
                .ident = "CM-iTC",
                {
@@ -419,7 +419,7 @@ static struct dmi_system_id __initdata pch_uart_dmi_table[] = {
 };
 
 /* Return UART clock, checking for board specific clocks. */
-static int pch_uart_get_uartclk(void)
+static unsigned int pch_uart_get_uartclk(void)
 {
        const struct dmi_system_id *d;
 
@@ -428,7 +428,7 @@ static int pch_uart_get_uartclk(void)
 
        d = dmi_first_match(pch_uart_dmi_table);
        if (d)
-               return (int)d->driver_data;
+               return (unsigned long)d->driver_data;
 
        return DEFAULT_UARTCLK;
 }
@@ -449,7 +449,7 @@ static void pch_uart_hal_disable_interrupt(struct eg20t_port *priv,
        iowrite8(ier, priv->membase + UART_IER);
 }
 
-static int pch_uart_hal_set_line(struct eg20t_port *priv, int baud,
+static int pch_uart_hal_set_line(struct eg20t_port *priv, unsigned int baud,
                                 unsigned int parity, unsigned int bits,
                                 unsigned int stb)
 {
@@ -484,7 +484,7 @@ static int pch_uart_hal_set_line(struct eg20t_port *priv, int baud,
        lcr |= bits;
        lcr |= stb;
 
-       dev_dbg(priv->port.dev, "%s:baud = %d, div = %04x, lcr = %02x (%lu)\n",
+       dev_dbg(priv->port.dev, "%s:baud = %u, div = %04x, lcr = %02x (%lu)\n",
                 __func__, baud, div, lcr, jiffies);
        iowrite8(PCH_UART_LCR_DLAB, priv->membase + UART_LCR);
        iowrite8(dll, priv->membase + PCH_UART_DLL);
@@ -1390,9 +1390,8 @@ static void pch_uart_shutdown(struct uart_port *port)
 static void pch_uart_set_termios(struct uart_port *port,
                                 struct ktermios *termios, struct ktermios *old)
 {
-       int baud;
        int rtn;
-       unsigned int parity, bits, stb;
+       unsigned int baud, parity, bits, stb;
        struct eg20t_port *priv;
        unsigned long flags;
 
@@ -1525,6 +1524,7 @@ static int pch_uart_verify_port(struct uart_port *port,
        return 0;
 }
 
+#if defined(CONFIG_CONSOLE_POLL) || defined(CONFIG_SERIAL_PCH_UART_CONSOLE)
 /*
  *     Wait for transmitter & holding register to empty
  */
@@ -1555,6 +1555,7 @@ static void wait_for_xmitr(struct eg20t_port *up, int bits)
                }
        }
 }
+#endif /* CONFIG_CONSOLE_POLL || CONFIG_SERIAL_PCH_UART_CONSOLE */
 
 #ifdef CONFIG_CONSOLE_POLL
 /*