lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[PATCH] uml: hot-unplug code cleanup

Browse Source 
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:
Jeff Dike
2005-06-25 14:55:25 -07:00
committed by Linus Torvalds
parent fc47a0d18a
commit 29d56cfe3c
11 changed files with 116 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
arch/um/drivers/net_kern.c
View File

@@ -612,25 +612,35 @@ static int net_config(char *str)
return(err);
}
static int net_remove(char *str)
static int net_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;
*start_out = n;
*end_out = n;
*str = end;
return n;
}
static int net_remove(int n)
{
struct uml_net *device;
struct net_device *dev;
struct uml_net_private *lp;
char *end;
int n;
n = simple_strtoul(str, &end, 0);
if((*end != '\0') || (end == str))
return(-1);
device = find_device(n);
if(device == NULL)
return(0);
return -ENODEV;
dev = device->dev;
lp = dev->priv;
if(lp->fd > 0) return(-1);
if(lp->fd > 0)
return -EBUSY;
if(lp->remove != NULL) (*lp->remove)(&lp->user);
unregister_netdev(dev);
platform_device_unregister(&device->pdev);
@@ -638,13 +648,14 @@ static int net_remove(char *str)
list_del(&device->list);
kfree(device);
free_netdev(dev);
return(0);
return 0;
}
static struct mc_device net_mc = {
.name = "eth",
.config = net_config,
.get_config = NULL,
.id = net_id,
.remove = net_remove,
};