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]
/
arch
/
ppc
/
4xx_io
/
serial_sicc.c
diff --git
a/arch/ppc/4xx_io/serial_sicc.c
b/arch/ppc/4xx_io/serial_sicc.c
index
8ace2a1
..
e354839
100644
(file)
--- a/
arch/ppc/4xx_io/serial_sicc.c
+++ b/
arch/ppc/4xx_io/serial_sicc.c
@@
-1,6
+1,4
@@
/*
/*
- * arch/ppc/4xx_io/serial_sicc.c
- *
* Driver for IBM STB3xxx SICC serial port
*
* Based on drivers/char/serial_amba.c, by ARM Ltd.
* Driver for IBM STB3xxx SICC serial port
*
* Based on drivers/char/serial_amba.c, by ARM Ltd.
@@
-30,7
+28,6
@@
* is compatible with normal ttyS* devices.
*/
* is compatible with normal ttyS* devices.
*/
-#include <linux/config.h>
#include <linux/module.h>
#include <linux/kernel.h>
#include <linux/errno.h>
#include <linux/module.h>
#include <linux/kernel.h>
#include <linux/errno.h>
@@
-417,7
+414,7
@@
static void siccuart_event(struct SICC_info *info, int event)
}
static void
}
static void
-siccuart_rx_chars(struct SICC_info *info
, struct pt_regs *regs
)
+siccuart_rx_chars(struct SICC_info *info)
{
struct tty_struct *tty = info->tty;
unsigned int status, ch, rsr, flg, ignored = 0;
{
struct tty_struct *tty = info->tty;
unsigned int status, ch, rsr, flg, ignored = 0;
@@
-444,7
+441,7
@@
siccuart_rx_chars(struct SICC_info *info, struct pt_regs *regs)
#ifdef SUPPORT_SYSRQ
if (info->sysrq) {
if (ch && time_before(jiffies, info->sysrq)) {
#ifdef SUPPORT_SYSRQ
if (info->sysrq) {
if (ch && time_before(jiffies, info->sysrq)) {
- handle_sysrq(ch,
regs,
NULL);
+ handle_sysrq(ch, NULL);
info->sysrq = 0;
goto ignore_char;
}
info->sysrq = 0;
goto ignore_char;
}
@@
-556,15
+553,15
@@
static void siccuart_tx_chars(struct SICC_info *info)
}
}
-static irqreturn_t siccuart_int_rx(int irq, void *dev_id
, struct pt_regs *regs
)
+static irqreturn_t siccuart_int_rx(int irq, void *dev_id)
{
struct SICC_info *info = dev_id;
{
struct SICC_info *info = dev_id;
- siccuart_rx_chars(info
, regs);
+ siccuart_rx_chars(info
)
return IRQ_HANDLED;
}
return IRQ_HANDLED;
}
-static irqreturn_t siccuart_int_tx(int irq, void *dev_id
, struct pt_regs *regs
)
+static irqreturn_t siccuart_int_tx(int irq, void *dev_id)
{
struct SICC_info *info = dev_id;
siccuart_tx_chars(info);
{
struct SICC_info *info = dev_id;
siccuart_tx_chars(info);
@@
-1639,9
+1636,8
@@
static struct SICC_info *siccuart_get(int line)
state->count++;
if (state->info)
return state->info;
state->count++;
if (state->info)
return state->info;
- info = k
m
alloc(sizeof(struct SICC_info), GFP_KERNEL);
+ info = k
z
alloc(sizeof(struct SICC_info), GFP_KERNEL);
if (info) {
if (info) {
- memset(info, 0, sizeof(struct SICC_info));
init_waitqueue_head(&info->open_wait);
init_waitqueue_head(&info->close_wait);
init_waitqueue_head(&info->delta_msr_wait);
init_waitqueue_head(&info->open_wait);
init_waitqueue_head(&info->close_wait);
init_waitqueue_head(&info->delta_msr_wait);
@@
-1724,7
+1720,7
@@
static int siccuart_open(struct tty_struct *tty, struct file *filp)
return 0;
}
return 0;
}
-static struct tty_operations sicc_ops = {
+static
const
struct tty_operations sicc_ops = {
.open = siccuart_open,
.close = siccuart_close,
.write = siccuart_write,
.open = siccuart_open,
.close = siccuart_close,
.write = siccuart_write,
@@
-1761,7
+1757,7
@@
int __init siccuart_init(void)
siccnormal_driver->subtype = SERIAL_TYPE_NORMAL;
siccnormal_driver->init_termios = tty_std_termios;
siccnormal_driver->init_termios.c_cflag = B9600 | CS8 | CREAD | HUPCL | CLOCAL;
siccnormal_driver->subtype = SERIAL_TYPE_NORMAL;
siccnormal_driver->init_termios = tty_std_termios;
siccnormal_driver->init_termios.c_cflag = B9600 | CS8 | CREAD | HUPCL | CLOCAL;
- siccnormal_driver->flags = TTY_DRIVER_REAL_RAW | TTY_DRIVER_
NO_DEVFS
;
+ siccnormal_driver->flags = TTY_DRIVER_REAL_RAW | TTY_DRIVER_
DYNAMIC_DEV
;
tty_set_operations(siccnormal_driver, &sicc_ops);
if (tty_register_driver(siccnormal_driver))
tty_set_operations(siccnormal_driver, &sicc_ops);
if (tty_register_driver(siccnormal_driver))