[PATCH] uml: hot-unplug code cleanup
Clean up the hot-unplugging code. There is now an id procedure which is called to figure out what device we're talking to. The error messages from that are now done from mconsole_remove instead of the driver. remove is now called with the device number, after it has been checked, so doesn't need to do sanity checking on it. Signed-off-by: Jeff Dike <jdike@addtoit.com> Cc: Paolo Giarrusso <blaisorblade@yahoo.it> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
committed by
Linus Torvalds
parent
fc47a0d18a
commit
29d56cfe3c
@ -602,11 +602,26 @@ int line_get_config(char *name, struct line *lines, unsigned int num, char *str,
|
||||
return n;
|
||||
}
|
||||
|
||||
int line_remove(struct line *lines, unsigned int num, char *str)
|
||||
int line_id(char **str, int *start_out, int *end_out)
|
||||
{
|
||||
char *end;
|
||||
int n;
|
||||
|
||||
n = simple_strtoul(*str, &end, 0);
|
||||
if((*end != '\0') || (end == *str))
|
||||
return -1;
|
||||
|
||||
*str = end;
|
||||
*start_out = n;
|
||||
*end_out = n;
|
||||
return n;
|
||||
}
|
||||
|
||||
int line_remove(struct line *lines, unsigned int num, int n)
|
||||
{
|
||||
char config[sizeof("conxxxx=none\0")];
|
||||
|
||||
sprintf(config, "%s=none", str);
|
||||
sprintf(config, "%d=none", n);
|
||||
return !line_setup(lines, num, config, 0);
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user