diff options
Diffstat (limited to 'drivers/serial')
-rw-r--r-- | drivers/serial/clps711x.c | 2 | ||||
-rw-r--r-- | drivers/serial/imx.c | 2 | ||||
-rw-r--r-- | drivers/serial/ioc4_serial.c | 12 | ||||
-rw-r--r-- | drivers/serial/s3c2410.c | 6 | ||||
-rw-r--r-- | drivers/serial/serial_cs.c | 1 |
5 files changed, 5 insertions, 18 deletions
diff --git a/drivers/serial/clps711x.c b/drivers/serial/clps711x.c index 78c1f36ad9b7..87ef368384fb 100644 --- a/drivers/serial/clps711x.c +++ b/drivers/serial/clps711x.c | |||
@@ -98,7 +98,7 @@ static irqreturn_t clps711xuart_int_rx(int irq, void *dev_id, struct pt_regs *re | |||
98 | { | 98 | { |
99 | struct uart_port *port = dev_id; | 99 | struct uart_port *port = dev_id; |
100 | struct tty_struct *tty = port->info->tty; | 100 | struct tty_struct *tty = port->info->tty; |
101 | unsigned int status, ch, flg, ignored = 0; | 101 | unsigned int status, ch, flg; |
102 | 102 | ||
103 | status = clps_readl(SYSFLG(port)); | 103 | status = clps_readl(SYSFLG(port)); |
104 | while (!(status & SYSFLG_URXFE)) { | 104 | while (!(status & SYSFLG_URXFE)) { |
diff --git a/drivers/serial/imx.c b/drivers/serial/imx.c index 4c985e6b3784..4e1e80adaf11 100644 --- a/drivers/serial/imx.c +++ b/drivers/serial/imx.c | |||
@@ -860,7 +860,7 @@ imx_console_setup(struct console *co, char *options) | |||
860 | return uart_set_options(&sport->port, co, baud, parity, bits, flow); | 860 | return uart_set_options(&sport->port, co, baud, parity, bits, flow); |
861 | } | 861 | } |
862 | 862 | ||
863 | extern struct uart_driver imx_reg; | 863 | static struct uart_driver imx_reg; |
864 | static struct console imx_console = { | 864 | static struct console imx_console = { |
865 | .name = "ttySMX", | 865 | .name = "ttySMX", |
866 | .write = imx_console_write, | 866 | .write = imx_console_write, |
diff --git a/drivers/serial/ioc4_serial.c b/drivers/serial/ioc4_serial.c index 0c5c96a582b3..f88fdd480685 100644 --- a/drivers/serial/ioc4_serial.c +++ b/drivers/serial/ioc4_serial.c | |||
@@ -973,18 +973,6 @@ static irqreturn_t ioc4_intr(int irq, void *arg, struct pt_regs *regs) | |||
973 | this_ir &= ~this_mir; | 973 | this_ir &= ~this_mir; |
974 | } | 974 | } |
975 | } | 975 | } |
976 | if (this_ir) { | ||
977 | printk(KERN_ERR | ||
978 | "unknown IOC4 %s interrupt 0x%x, sio_ir = 0x%x," | ||
979 | " sio_ies = 0x%x, other_ir = 0x%x :" | ||
980 | "other_ies = 0x%x\n", | ||
981 | (intr_type == IOC4_SIO_INTR_TYPE) ? "sio" : | ||
982 | "other", this_ir, | ||
983 | readl(&soft->is_ioc4_misc_addr->sio_ir.raw), | ||
984 | readl(&soft->is_ioc4_misc_addr->sio_ies.raw), | ||
985 | readl(&soft->is_ioc4_misc_addr->other_ir.raw), | ||
986 | readl(&soft->is_ioc4_misc_addr->other_ies.raw)); | ||
987 | } | ||
988 | } | 976 | } |
989 | #ifdef DEBUG_INTERRUPTS | 977 | #ifdef DEBUG_INTERRUPTS |
990 | { | 978 | { |
diff --git a/drivers/serial/s3c2410.c b/drivers/serial/s3c2410.c index c361c6fb0809..50d7870d92bb 100644 --- a/drivers/serial/s3c2410.c +++ b/drivers/serial/s3c2410.c | |||
@@ -82,8 +82,6 @@ | |||
82 | #include <asm/arch/regs-serial.h> | 82 | #include <asm/arch/regs-serial.h> |
83 | #include <asm/arch/regs-gpio.h> | 83 | #include <asm/arch/regs-gpio.h> |
84 | 84 | ||
85 | #include <asm/mach-types.h> | ||
86 | |||
87 | /* structures */ | 85 | /* structures */ |
88 | 86 | ||
89 | struct s3c24xx_uart_info { | 87 | struct s3c24xx_uart_info { |
@@ -753,8 +751,8 @@ static void s3c24xx_serial_set_termios(struct uart_port *port, | |||
753 | { | 751 | { |
754 | struct s3c2410_uartcfg *cfg = s3c24xx_port_to_cfg(port); | 752 | struct s3c2410_uartcfg *cfg = s3c24xx_port_to_cfg(port); |
755 | struct s3c24xx_uart_port *ourport = to_ourport(port); | 753 | struct s3c24xx_uart_port *ourport = to_ourport(port); |
756 | struct s3c24xx_uart_clksrc *clksrc; | 754 | struct s3c24xx_uart_clksrc *clksrc = NULL; |
757 | struct clk *clk; | 755 | struct clk *clk = NULL; |
758 | unsigned long flags; | 756 | unsigned long flags; |
759 | unsigned int baud, quot; | 757 | unsigned int baud, quot; |
760 | unsigned int ulcon; | 758 | unsigned int ulcon; |
diff --git a/drivers/serial/serial_cs.c b/drivers/serial/serial_cs.c index 1ae0b381c162..2c7d3ef76e8e 100644 --- a/drivers/serial/serial_cs.c +++ b/drivers/serial/serial_cs.c | |||
@@ -859,6 +859,7 @@ static struct pcmcia_device_id serial_ids[] = { | |||
859 | PCMCIA_MFC_DEVICE_CIS_MANF_CARD(1, 0x0175, 0x0000, "DP83903.cis"), | 859 | PCMCIA_MFC_DEVICE_CIS_MANF_CARD(1, 0x0175, 0x0000, "DP83903.cis"), |
860 | PCMCIA_MFC_DEVICE_CIS_MANF_CARD(1, 0x0101, 0x0035, "3CXEM556.cis"), | 860 | PCMCIA_MFC_DEVICE_CIS_MANF_CARD(1, 0x0101, 0x0035, "3CXEM556.cis"), |
861 | PCMCIA_MFC_DEVICE_CIS_MANF_CARD(1, 0x0101, 0x003d, "3CXEM556.cis"), | 861 | PCMCIA_MFC_DEVICE_CIS_MANF_CARD(1, 0x0101, 0x003d, "3CXEM556.cis"), |
862 | PCMCIA_DEVICE_CIS_MANF_CARD(0x0192, 0x0710, "SW_7xx_SER.cis"), /* Sierra Wireless AC710/AC750 GPRS Network Adapter R1 */ | ||
862 | PCMCIA_DEVICE_CIS_PROD_ID12("MultiTech", "PCMCIA 56K DataFax", 0x842047ee, 0xc2efcf03, "MT5634ZLX.cis"), | 863 | PCMCIA_DEVICE_CIS_PROD_ID12("MultiTech", "PCMCIA 56K DataFax", 0x842047ee, 0xc2efcf03, "MT5634ZLX.cis"), |
863 | PCMCIA_DEVICE_CIS_PROD_ID12("ADVANTECH", "COMpad-32/85B-4", 0x96913a85, 0xcec8f102, "COMpad4.cis"), | 864 | PCMCIA_DEVICE_CIS_PROD_ID12("ADVANTECH", "COMpad-32/85B-4", 0x96913a85, 0xcec8f102, "COMpad4.cis"), |
864 | PCMCIA_DEVICE_CIS_PROD_ID123("ADVANTECH", "COMpad-32/85", "1.0", 0x96913a85, 0x8fbe92ae, 0x0877b627, "COMpad2.cis"), | 865 | PCMCIA_DEVICE_CIS_PROD_ID123("ADVANTECH", "COMpad-32/85", "1.0", 0x96913a85, 0x8fbe92ae, 0x0877b627, "COMpad2.cis"), |