diff options
author | Al Viro <viro@zeniv.linux.org.uk> | 2011-09-09 17:25:00 -0400 |
---|---|---|
committer | Richard Weinberger <richard@nod.at> | 2012-03-25 00:29:53 +0100 |
commit | 43574c1afea4f798592c03cf4d4ecea4fd0a8416 (patch) | |
tree | 0681a51541bd247fd7ea5a363182397383239a39 /arch/um/drivers/line.c | |
parent | fe9a6b002988372406baf5aeefc046677782365e (diff) |
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.c')
-rw-r--r-- | arch/um/drivers/line.c | 69 |
1 files changed, 28 insertions, 41 deletions
diff --git a/arch/um/drivers/line.c b/arch/um/drivers/line.c index b0022cf4efb..3eea99e98a1 100644 --- a/arch/um/drivers/line.c +++ b/arch/um/drivers/line.c @@ -489,7 +489,7 @@ void close_lines(struct line *lines, int nlines) close_chan(&lines[i].chan_list, 0); } -static int setup_one_line(struct line *lines, int n, char *init, int init_prio, +static int setup_one_line(struct line *lines, int n, char *init, char **error_out) { struct line *line = &lines[n]; @@ -502,14 +502,11 @@ static int setup_one_line(struct line *lines, int n, char *init, int init_prio, goto out; } - if (line->init_pri <= init_prio) { - line->init_pri = init_prio; - if (!strcmp(init, "none")) - line->valid = 0; - else { - line->init_str = init; - line->valid = 1; - } + if (!strcmp(init, "none")) + line->valid = 0; + else { + line->init_str = init; + line->valid = 1; } err = 0; out: @@ -524,47 +521,37 @@ out: * @error_out is an error string in the case of failure; */ -int line_setup(struct line *lines, unsigned int num, char *init, - char **error_out) +int line_setup(char **conf, unsigned int num, char **def, + char *init, char *name) { - int i, n, err; - char *end; + char *error; if (*init == '=') { /* * We said con=/ssl= instead of con#=, so we are configuring all * consoles at once. */ - n = -1; - } - else { - n = simple_strtoul(init, &end, 0); + *def = init + 1; + } else { + char *end; + unsigned n = simple_strtoul(init, &end, 0); + if (*end != '=') { - *error_out = "Couldn't parse device number"; - return -EINVAL; + error = "Couldn't parse device number"; + goto out; } - init = end; - } - init++; - - if (n >= (signed int) num) { - *error_out = "Device number out of range"; - return -EINVAL; - } - else if (n >= 0) { - err = setup_one_line(lines, n, init, INIT_ONE, error_out); - if (err) - return err; - } - else { - for(i = 0; i < num; i++) { - err = setup_one_line(lines, i, init, INIT_ALL, - error_out); - if (err) - return err; + if (n >= num) { + error = "Device number out of range"; + goto out; } + conf[n] = end + 1; } - return n == -1 ? num : n; + return 0; + +out: + printk(KERN_ERR "Failed to set up %s with " + "configuration string \"%s\" : %s\n", name, init, error); + return -EINVAL; } int line_config(struct line *lines, unsigned int num, char *str, @@ -595,7 +582,7 @@ int line_config(struct line *lines, unsigned int num, char *str, *error_out = "Failed to allocate memory"; return -ENOMEM; } - err = setup_one_line(lines, n, new, INIT_ONE, error_out); + err = setup_one_line(lines, n, new, error_out); if (err) return err; line = &lines[n]; @@ -654,7 +641,7 @@ int line_remove(struct line *lines, unsigned int num, int n, char **error_out) *error_out = "Device number out of range"; return -EINVAL; } - return setup_one_line(lines, n, "none", INIT_ONE, error_out); + return setup_one_line(lines, n, "none", error_out); } struct tty_driver *register_lines(struct line_driver *line_driver, |