static int delete_node(struct udevice *dev)
{
char filename[255];
+ char *symlinks;
+ char *linkname;
int retval;
strncpy(filename, udev_root, sizeof(filename));
delete_path(filename);
if (*dev->symlink) {
- strncpy(filename, udev_root, sizeof(filename));
- strncat(filename, dev->symlink, sizeof(filename));
- dbg("unlinking symlink '%s'", filename);
- retval = unlink(filename);
- if (retval) {
- dbg("unlink(%s) failed with error '%s'",
- filename, strerror(errno));
- return retval;
- }
- if (strchr(dev->symlink, '/')) {
- delete_path(filename);
+ symlinks = dev->symlink;
+ while (1) {
+ linkname = strsep(&symlinks, " ");
+ if (linkname == NULL)
+ break;
+
+ strncpy(filename, udev_root, sizeof(filename));
+ strncat(filename, linkname, sizeof(filename));
+
+ dbg("unlinking symlink '%s'", filename);
+ retval = unlink(filename);
+ if (retval) {
+ dbg("unlink(%s) failed with error '%s'",
+ filename, strerror(errno));
+ return retval;
+ }
+ if (strchr(dev->symlink, '/')) {
+ delete_path(filename);
+ }
}
}
*/
int udev_remove_device(char *path, char *subsystem)
{
- char name[100];
struct udevice *dev;
+ struct udevice device;
char *temp;
dev = udevdb_get_dev(path);
temp = strrchr(path, '/');
if (temp == NULL)
return -ENODEV;
- strncpy(name, &temp[1], sizeof(name));
+ memset(&device, 0, sizeof(device));
+ dev = &device;
+ strncpy(device.name, &temp[1], sizeof(device.name));
}
dbg("name is '%s'", dev->name);
udevdb_delete_dev(path);
- sysbus_send_remove(name, path);
+ sysbus_send_remove(dev->name, path);
return delete_node(dev);
}