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
/
sa1100.c
diff --git
a/drivers/serial/sa1100.c
b/drivers/serial/sa1100.c
index
c2d9068
..
58a83c2
100644
(file)
--- a/
drivers/serial/sa1100.c
+++ b/
drivers/serial/sa1100.c
@@
-24,7
+24,6
@@
* $Id: sa1100.c,v 1.50 2002/07/29 14:41:04 rmk Exp $
*
*/
* $Id: sa1100.c,v 1.50 2002/07/29 14:41:04 rmk Exp $
*
*/
-#include <linux/config.h>
#if defined(CONFIG_SERIAL_SA1100_CONSOLE) && defined(CONFIG_MAGIC_SYSRQ)
#define SUPPORT_SYSRQ
#if defined(CONFIG_SERIAL_SA1100_CONSOLE) && defined(CONFIG_MAGIC_SYSRQ)
#define SUPPORT_SYSRQ
@@
-191,7
+190,7
@@
static void sa1100_enable_ms(struct uart_port *port)
}
static void
}
static void
-sa1100_rx_chars(struct sa1100_port *sport
, struct pt_regs *regs
)
+sa1100_rx_chars(struct sa1100_port *sport)
{
struct tty_struct *tty = sport->port.info->tty;
unsigned int status, ch, flg;
{
struct tty_struct *tty = sport->port.info->tty;
unsigned int status, ch, flg;
@@
-229,7
+228,7
@@
sa1100_rx_chars(struct sa1100_port *sport, struct pt_regs *regs)
#endif
}
#endif
}
- if (uart_handle_sysrq_char(&sport->port, ch
, regs
))
+ if (uart_handle_sysrq_char(&sport->port, ch))
goto ignore_char;
uart_insert_char(&sport->port, status, UTSR1_TO_SM(UTSR1_ROR), ch, flg);
goto ignore_char;
uart_insert_char(&sport->port, status, UTSR1_TO_SM(UTSR1_ROR), ch, flg);
@@
-282,7
+281,7
@@
static void sa1100_tx_chars(struct sa1100_port *sport)
sa1100_stop_tx(&sport->port);
}
sa1100_stop_tx(&sport->port);
}
-static irqreturn_t sa1100_int(int irq, void *dev_id
, struct pt_regs *regs
)
+static irqreturn_t sa1100_int(int irq, void *dev_id)
{
struct sa1100_port *sport = dev_id;
unsigned int status, pass_counter = 0;
{
struct sa1100_port *sport = dev_id;
unsigned int status, pass_counter = 0;
@@
-295,7
+294,7
@@
static irqreturn_t sa1100_int(int irq, void *dev_id, struct pt_regs *regs)
/* Clear the receiver idle bit, if set */
if (status & UTSR0_RID)
UART_PUT_UTSR0(sport, UTSR0_RID);
/* Clear the receiver idle bit, if set */
if (status & UTSR0_RID)
UART_PUT_UTSR0(sport, UTSR0_RID);
- sa1100_rx_chars(sport
, regs
);
+ sa1100_rx_chars(sport);
}
/* Clear the relevant break bits */
}
/* Clear the relevant break bits */
@@
-409,8
+408,8
@@
static void sa1100_shutdown(struct uart_port *port)
}
static void
}
static void
-sa1100_set_termios(struct uart_port *port, struct termios *termios,
- struct termios *old)
+sa1100_set_termios(struct uart_port *port, struct
k
termios *termios,
+ struct
k
termios *old)
{
struct sa1100_port *sport = (struct sa1100_port *)port;
unsigned long flags;
{
struct sa1100_port *sport = (struct sa1100_port *)port;
unsigned long flags;
@@
-816,7
+815,6
@@
static struct uart_driver sa1100_reg = {
.owner = THIS_MODULE,
.driver_name = "ttySA",
.dev_name = "ttySA",
.owner = THIS_MODULE,
.driver_name = "ttySA",
.dev_name = "ttySA",
- .devfs_name = "ttySA",
.major = SERIAL_SA1100_MAJOR,
.minor = MINOR_START,
.nr = NR_PORTS,
.major = SERIAL_SA1100_MAJOR,
.minor = MINOR_START,
.nr = NR_PORTS,