projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
[powerpc.git]
/
drivers
/
s390
/
char
/
tty3270.c
diff --git
a/drivers/s390/char/tty3270.c
b/drivers/s390/char/tty3270.c
index
06e2eee
..
bc33068
100644
(file)
--- a/
drivers/s390/char/tty3270.c
+++ b/
drivers/s390/char/tty3270.c
@@
-36,7
+36,7
@@
struct tty_driver *tty3270_driver;
static int tty3270_max_index;
struct tty_driver *tty3270_driver;
static int tty3270_max_index;
-struct raw3270_fn tty3270_fn;
+st
atic st
ruct raw3270_fn tty3270_fn;
struct tty3270_cell {
unsigned char character;
struct tty3270_cell {
unsigned char character;
@@
-119,8
+119,7
@@
static void tty3270_update(struct tty3270 *);
/*
* Setup timeout for a device. On timeout trigger an update.
*/
/*
* Setup timeout for a device. On timeout trigger an update.
*/
-void
-tty3270_set_timer(struct tty3270 *tp, int expires)
+static void tty3270_set_timer(struct tty3270 *tp, int expires)
{
if (expires == 0) {
if (timer_pending(&tp->timer) && del_timer(&tp->timer))
{
if (expires == 0) {
if (timer_pending(&tp->timer) && del_timer(&tp->timer))
@@
-841,7
+840,7
@@
tty3270_del_views(void)
}
}
}
}
-struct raw3270_fn tty3270_fn = {
+st
atic st
ruct raw3270_fn tty3270_fn = {
.activate = tty3270_activate,
.deactivate = tty3270_deactivate,
.intv = (void *) tty3270_irq,
.activate = tty3270_activate,
.deactivate = tty3270_deactivate,
.intv = (void *) tty3270_irq,
@@
-1659,7
+1658,7
@@
tty3270_flush_buffer(struct tty_struct *tty)
* Check for visible/invisible input switches
*/
static void
* Check for visible/invisible input switches
*/
static void
-tty3270_set_termios(struct tty_struct *tty, struct termios *old)
+tty3270_set_termios(struct tty_struct *tty, struct
k
termios *old)
{
struct tty3270 *tp;
int new;
{
struct tty3270 *tp;
int new;
@@
-1737,7
+1736,7
@@
tty3270_ioctl(struct tty_struct *tty, struct file *file,
return kbd_ioctl(tp->kbd, file, cmd, arg);
}
return kbd_ioctl(tp->kbd, file, cmd, arg);
}
-static struct tty_operations tty3270_ops = {
+static
const
struct tty_operations tty3270_ops = {
.open = tty3270_open,
.close = tty3270_close,
.write = tty3270_write,
.open = tty3270_open,
.close = tty3270_close,
.write = tty3270_write,
@@
-1754,8
+1753,7
@@
static struct tty_operations tty3270_ops = {
.set_termios = tty3270_set_termios
};
.set_termios = tty3270_set_termios
};
-void
-tty3270_notifier(int index, int active)
+static void tty3270_notifier(int index, int active)
{
if (active)
tty_register_device(tty3270_driver, index, NULL);
{
if (active)
tty_register_device(tty3270_driver, index, NULL);
@@
-1767,8
+1765,7
@@
tty3270_notifier(int index, int active)
* 3270 tty registration code called from tty_init().
* Most kernel services (incl. kmalloc) are available at this poimt.
*/
* 3270 tty registration code called from tty_init().
* Most kernel services (incl. kmalloc) are available at this poimt.
*/
-int __init
-tty3270_init(void)
+static int __init tty3270_init(void)
{
struct tty_driver *driver;
int ret;
{
struct tty_driver *driver;
int ret;