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:/home/rmk/linux-2.6-arm
[powerpc.git]
/
arch
/
um
/
drivers
/
ssl.c
diff --git
a/arch/um/drivers/ssl.c
b/arch/um/drivers/ssl.c
index
8564784
..
a4d6415
100644
(file)
--- a/
arch/um/drivers/ssl.c
+++ b/
arch/um/drivers/ssl.c
@@
-33,7
+33,7
@@
static struct tty_driver *ssl_driver;
#define NR_PORTS 64
#define NR_PORTS 64
-void ssl_announce(char *dev_name, int dev)
+
static
void ssl_announce(char *dev_name, int dev)
{
printk(KERN_INFO "Serial line %d assigned device '%s'\n", dev,
dev_name);
{
printk(KERN_INFO "Serial line %d assigned device '%s'\n", dev,
dev_name);
@@
-84,7
+84,7
@@
static struct lines lines = LINES_INIT(NR_PORTS);
static int ssl_config(char *str)
{
static int ssl_config(char *str)
{
- return line_config(serial_lines, ARRAY_SIZE(serial_lines), str);
+ return line_config(serial_lines, ARRAY_SIZE(serial_lines), str
, &opts
);
}
static int ssl_get_config(char *dev, char *str, int size, char **error_out)
}
static int ssl_get_config(char *dev, char *str, int size, char **error_out)
@@
-98,9
+98,9
@@
static int ssl_remove(int n)
return line_remove(serial_lines, ARRAY_SIZE(serial_lines), n);
}
return line_remove(serial_lines, ARRAY_SIZE(serial_lines), n);
}
-int ssl_open(struct tty_struct *tty, struct file *filp)
+
static
int ssl_open(struct tty_struct *tty, struct file *filp)
{
{
- return line_open(serial_lines, tty
, &opts
);
+ return line_open(serial_lines, tty);
}
#if 0
}
#if 0
@@
-109,16
+109,6
@@
static void ssl_flush_buffer(struct tty_struct *tty)
return;
}
return;
}
-static void ssl_throttle(struct tty_struct * tty)
-{
- printk(KERN_ERR "Someone should implement ssl_throttle\n");
-}
-
-static void ssl_unthrottle(struct tty_struct * tty)
-{
- printk(KERN_ERR "Someone should implement ssl_unthrottle\n");
-}
-
static void ssl_stop(struct tty_struct *tty)
{
printk(KERN_ERR "Someone should implement ssl_stop\n");
static void ssl_stop(struct tty_struct *tty)
{
printk(KERN_ERR "Someone should implement ssl_stop\n");
@@
-145,9
+135,9
@@
static struct tty_operations ssl_ops = {
.flush_chars = line_flush_chars,
.set_termios = line_set_termios,
.ioctl = line_ioctl,
.flush_chars = line_flush_chars,
.set_termios = line_set_termios,
.ioctl = line_ioctl,
+ .throttle = line_throttle,
+ .unthrottle = line_unthrottle,
#if 0
#if 0
- .throttle = ssl_throttle,
- .unthrottle = ssl_unthrottle,
.stop = ssl_stop,
.start = ssl_start,
.hangup = ssl_hangup,
.stop = ssl_stop,
.start = ssl_start,
.hangup = ssl_hangup,
@@
-192,7
+182,7
@@
static struct console ssl_cons = {
.index = -1,
};
.index = -1,
};
-int ssl_init(void)
+
static
int ssl_init(void)
{
char *new_title;
{
char *new_title;
@@
-202,7
+192,7
@@
int ssl_init(void)
serial_lines,
ARRAY_SIZE(serial_lines));
serial_lines,
ARRAY_SIZE(serial_lines));
- lines_init(serial_lines, ARRAY_SIZE(serial_lines));
+ lines_init(serial_lines, ARRAY_SIZE(serial_lines)
, &opts
);
new_title = add_xterm_umid(opts.xterm_title);
if (new_title != NULL)
new_title = add_xterm_umid(opts.xterm_title);
if (new_title != NULL)
@@
-224,7
+214,7
@@
__uml_exitcall(ssl_exit);
static int ssl_chan_setup(char *str)
{
static int ssl_chan_setup(char *str)
{
- return line_setup(serial_lines, ARRAY_SIZE(serial_lines), str
, 1
);
+ return line_setup(serial_lines, ARRAY_SIZE(serial_lines), str);
}
__setup("ssl", ssl_chan_setup);
}
__setup("ssl", ssl_chan_setup);