V3s_Allwinner
/
uboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

dm: usb: Rename usb_find_child to usb_find_emul_child 

Now that we unbind usb devices from usb_stop() usb_find_child() is
only necessary to deal with emulated usb devices.

Rename it to make this clear and add a #ifdef to make it a nop in
other cases.

Note the #ifdef turns usb_find_emul_child() into a nop, rather then not
building it and adding another #ifdef to the caller, this is done this way
because adding a #ifdef to the caller is somewhat hairy.

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Acked-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
Hans de Goede 2015-07-01 20:53:01 +02:00 committed by Simon Glass
parent 6cda369509
commit 9b510df703
1 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
drivers/usb/host/usb-uclass.c
View File

@ -485,15 +485,14 @@ error:
} }
/** /**
* usb_find_child() - Find an existing device which matches our needs * usb_find_emul_child() - Find an existing device for emulated devices
*
*
*/ */
static int usb_find_child(struct udevice *parent, static int usb_find_emul_child(struct udevice *parent,
struct usb_device_descriptor *desc, struct usb_device_descriptor *desc,
struct usb_interface_descriptor *iface, struct usb_interface_descriptor *iface,
struct udevice **devp) struct udevice **devp)
{ {
#ifdef CONFIG_SANDBOX
struct udevice *dev; struct udevice *dev;
*devp = NULL; *devp = NULL;
@ -512,7 +511,7 @@ static int usb_find_child(struct udevice *parent,
return 0; return 0;
} }
} }
#endif
return -ENOENT; return -ENOENT;
} }
@ -572,8 +571,8 @@ int usb_scan_device(struct udevice *parent, int port,
debug("read_descriptor for '%s': ret=%d\n", parent->name, ret); debug("read_descriptor for '%s': ret=%d\n", parent->name, ret);
if (ret) if (ret)
return ret; return ret;
ret = usb_find_child(parent, &udev->descriptor, iface, &dev); ret = usb_find_emul_child(parent, &udev->descriptor, iface, &dev);
debug("** usb_find_child returns %d\n", ret); debug("** usb_find_emul_child returns %d\n", ret);
if (ret) { if (ret) {
if (ret != -ENOENT) if (ret != -ENOENT)
return ret; return ret;