projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[NETLINK]: Switch cb_lock spinlock to mutex and allow to override it
[powerpc.git]
/
drivers
/
serial
/
vr41xx_siu.c
diff --git
a/drivers/serial/vr41xx_siu.c
b/drivers/serial/vr41xx_siu.c
index
e93d0ed
..
cf0e663
100644
(file)
--- a/
drivers/serial/vr41xx_siu.c
+++ b/
drivers/serial/vr41xx_siu.c
@@
-38,6
+38,7
@@
#include <linux/tty_flip.h>
#include <asm/io.h>
#include <linux/tty_flip.h>
#include <asm/io.h>
+#include <asm/vr41xx/irq.h>
#include <asm/vr41xx/siu.h>
#include <asm/vr41xx/vr41xx.h>
#include <asm/vr41xx/siu.h>
#include <asm/vr41xx/vr41xx.h>
@@
-358,8
+359,7
@@
static void siu_break_ctl(struct uart_port *port, int ctl)
spin_unlock_irqrestore(&port->lock, flags);
}
spin_unlock_irqrestore(&port->lock, flags);
}
-static inline void receive_chars(struct uart_port *port, uint8_t *status,
- struct pt_regs *regs)
+static inline void receive_chars(struct uart_port *port, uint8_t *status)
{
struct tty_struct *tty;
uint8_t lsr, ch;
{
struct tty_struct *tty;
uint8_t lsr, ch;
@@
-404,7
+404,7
@@
static inline void receive_chars(struct uart_port *port, uint8_t *status,
flag = TTY_PARITY;
}
flag = TTY_PARITY;
}
- if (uart_handle_sysrq_char(port, ch
, regs
))
+ if (uart_handle_sysrq_char(port, ch))
goto ignore_char;
uart_insert_char(port, lsr, UART_LSR_OE, ch, flag);
goto ignore_char;
uart_insert_char(port, lsr, UART_LSR_OE, ch, flag);
@@
-471,7
+471,7
@@
static inline void transmit_chars(struct uart_port *port)
siu_stop_tx(port);
}
siu_stop_tx(port);
}
-static irqreturn_t siu_interrupt(int irq, void *dev_id
, struct pt_regs *regs
)
+static irqreturn_t siu_interrupt(int irq, void *dev_id)
{
struct uart_port *port;
uint8_t iir, lsr;
{
struct uart_port *port;
uint8_t iir, lsr;
@@
-484,7
+484,7
@@
static irqreturn_t siu_interrupt(int irq, void *dev_id, struct pt_regs *regs)
lsr = siu_read(port, UART_LSR);
if (lsr & UART_LSR_DR)
lsr = siu_read(port, UART_LSR);
if (lsr & UART_LSR_DR)
- receive_chars(port, &lsr
, regs
);
+ receive_chars(port, &lsr);
check_modem_status(port);
check_modem_status(port);
@@
-562,8
+562,8
@@
static void siu_shutdown(struct uart_port *port)
free_irq(port->irq, port);
}
free_irq(port->irq, port);
}
-static void siu_set_termios(struct uart_port *port, struct termios *new,
- struct termios *old)
+static void siu_set_termios(struct uart_port *port, struct
k
termios *new,
+ struct
k
termios *old)
{
tcflag_t c_cflag, c_iflag;
uint8_t lcr, fcr, ier;
{
tcflag_t c_cflag, c_iflag;
uint8_t lcr, fcr, ier;