diff options
| author | Al Viro <viro@zeniv.linux.org.uk> | 2011-09-09 23:25:00 +0200 |
|---|---|---|
| committer | Richard Weinberger <richard@nod.at> | 2012-03-25 00:29:53 +0100 |
| commit | 43574c1afea4f798592c03cf4d4ecea4fd0a8416 (patch) | |
| tree | 0681a51541bd247fd7ea5a363182397383239a39 /arch/um/drivers/line.h | |
| parent | um: switch line_config() to setup_one_line() (diff) | |
| download | linux-43574c1afea4f798592c03cf4d4ecea4fd0a8416.tar.xz linux-43574c1afea4f798592c03cf4d4ecea4fd0a8416.zip | |
um: get rid of the init_prio mess
make line_setup() act on a separate array of conf strings + default conf,
have lines array initialized explicitly by that data, bury LINE_INIT()
macro from hell.
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Richard Weinberger <richard@nod.at>
Diffstat (limited to 'arch/um/drivers/line.h')
| -rw-r--r-- | arch/um/drivers/line.h | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/arch/um/drivers/line.h b/arch/um/drivers/line.h index 63df3ca02ac2..0c4dadf5e03e 100644 --- a/arch/um/drivers/line.h +++ b/arch/um/drivers/line.h @@ -37,7 +37,6 @@ struct line { int valid; char *init_str; - int init_pri; struct list_head chan_list; /*This lock is actually, mostly, local to*/ @@ -58,18 +57,10 @@ struct line { int have_irq; }; -#define LINE_INIT(str, d) \ - { .count_lock = __SPIN_LOCK_UNLOCKED((str).count_lock), \ - .init_str = str, \ - .init_pri = INIT_STATIC, \ - .valid = 1, \ - .lock = __SPIN_LOCK_UNLOCKED((str).lock), \ - .driver = d } - extern void line_close(struct tty_struct *tty, struct file * filp); extern int line_open(struct line *lines, struct tty_struct *tty); -extern int line_setup(struct line *lines, unsigned int sizeof_lines, - char *init, char **error_out); +extern int line_setup(char **conf, unsigned nlines, char **def, + char *init, char *name); extern int line_write(struct tty_struct *tty, const unsigned char *buf, int len); extern int line_put_char(struct tty_struct *tty, unsigned char ch); |