git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fedora core 6 1.2949 + vserver 2.2.0
[linux-2.6.git]
/
drivers
/
serial
/
v850e_uart.c
diff --git
a/drivers/serial/v850e_uart.c
b/drivers/serial/v850e_uart.c
index
bb48278
..
dd98aca
100644
(file)
--- a/
drivers/serial/v850e_uart.c
+++ b/
drivers/serial/v850e_uart.c
@@
-240,7
+240,7
@@
console_initcall(v850e_uart_console_init);
\f
/* TX/RX interrupt handlers. */
\f
/* TX/RX interrupt handlers. */
-static void v850e_uart_stop_tx (struct uart_port *port
, unsigned tty_stop
);
+static void v850e_uart_stop_tx (struct uart_port *port);
void v850e_uart_tx (struct uart_port *port)
{
void v850e_uart_tx (struct uart_port *port)
{
@@
-271,14
+271,14
@@
void v850e_uart_tx (struct uart_port *port)
v850e_uart_stop_tx (port, stopped);
}
v850e_uart_stop_tx (port, stopped);
}
-static irqreturn_t v850e_uart_tx_irq(int irq, void *data
, struct pt_regs *regs
)
+static irqreturn_t v850e_uart_tx_irq(int irq, void *data)
{
struct uart_port *port = data;
v850e_uart_tx (port);
return IRQ_HANDLED;
}
{
struct uart_port *port = data;
v850e_uart_tx (port);
return IRQ_HANDLED;
}
-static irqreturn_t v850e_uart_rx_irq(int irq, void *data
, struct pt_regs *regs
)
+static irqreturn_t v850e_uart_rx_irq(int irq, void *data)
{
struct uart_port *port = data;
unsigned ch_stat = TTY_NORMAL;
{
struct uart_port *port = data;
unsigned ch_stat = TTY_NORMAL;
@@
-339,14
+339,14
@@
static unsigned v850e_uart_get_mctrl (struct uart_port *port)
return mctrl;
}
return mctrl;
}
-static void v850e_uart_start_tx (struct uart_port *port
, unsigned tty_start
)
+static void v850e_uart_start_tx (struct uart_port *port)
{
v850e_intc_disable_irq (V850E_UART_TX_IRQ (port->line));
v850e_uart_tx (port);
v850e_intc_enable_irq (V850E_UART_TX_IRQ (port->line));
}
{
v850e_intc_disable_irq (V850E_UART_TX_IRQ (port->line));
v850e_uart_tx (port);
v850e_intc_enable_irq (V850E_UART_TX_IRQ (port->line));
}
-static void v850e_uart_stop_tx (struct uart_port *port
, unsigned tty_stop
)
+static void v850e_uart_stop_tx (struct uart_port *port)
{
v850e_intc_disable_irq (V850E_UART_TX_IRQ (port->line));
}
{
v850e_intc_disable_irq (V850E_UART_TX_IRQ (port->line));
}
@@
-372,13
+372,13
@@
static int v850e_uart_startup (struct uart_port *port)
/* Alloc RX irq. */
err = request_irq (V850E_UART_RX_IRQ (port->line), v850e_uart_rx_irq,
/* Alloc RX irq. */
err = request_irq (V850E_UART_RX_IRQ (port->line), v850e_uart_rx_irq,
-
SA_INTERRUPT
, "v850e_uart", port);
+
IRQF_DISABLED
, "v850e_uart", port);
if (err)
return err;
/* Alloc TX irq. */
err = request_irq (V850E_UART_TX_IRQ (port->line), v850e_uart_tx_irq,
if (err)
return err;
/* Alloc TX irq. */
err = request_irq (V850E_UART_TX_IRQ (port->line), v850e_uart_tx_irq,
-
SA_INTERRUPT
, "v850e_uart", port);
+
IRQF_DISABLED
, "v850e_uart", port);
if (err) {
free_irq (V850E_UART_RX_IRQ (port->line), port);
return err;
if (err) {
free_irq (V850E_UART_RX_IRQ (port->line), port);
return err;
@@
-404,8
+404,8
@@
static void v850e_uart_shutdown (struct uart_port *port)
}
static void
}
static void
-v850e_uart_set_termios (struct uart_port *port, struct termios *termios,
- struct termios *old)
+v850e_uart_set_termios (struct uart_port *port, struct
k
termios *termios,
+ struct
k
termios *old)
{
unsigned cflags = termios->c_cflag;
{
unsigned cflags = termios->c_cflag;
@@
-468,7
+468,6
@@
static struct uart_ops v850e_uart_ops = {
static struct uart_driver v850e_uart_driver = {
.owner = THIS_MODULE,
.driver_name = "v850e_uart",
static struct uart_driver v850e_uart_driver = {
.owner = THIS_MODULE,
.driver_name = "v850e_uart",
- .devfs_name = "tts/",
.dev_name = "ttyS",
.major = TTY_MAJOR,
.minor = V850E_UART_MINOR_BASE,
.dev_name = "ttyS",
.major = TTY_MAJOR,
.minor = V850E_UART_MINOR_BASE,
@@
-496,7
+495,7
@@
static int __init v850e_uart_init (void)
port->ops = &v850e_uart_ops;
port->line = chan;
port->ops = &v850e_uart_ops;
port->line = chan;
- port->iotype =
SERIAL_
IO_MEM;
+ port->iotype =
UP
IO_MEM;
port->flags = UPF_BOOT_AUTOCONF;
/* We actually use multiple IRQs, but the serial
port->flags = UPF_BOOT_AUTOCONF;
/* We actually use multiple IRQs, but the serial