dect
/
linux-2.6
Archived
13
0
Fork 0
Code Releases Activity

[PATCH] Use driver_for_each_device() instead of manually walking list. 

Signed-off-by: Patrick Mochel <mochel@digitalimplant.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

Index: gregkh-2.6/drivers/usb/core/usb.c
===================================================================
This commit is contained in:
mochel@digitalimplant.org 2005-03-21 11:09:40 -08:00 committed by Greg Kroah-Hartman
parent 8d618afdd6
commit 6034a080f9
1 changed files with 23 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
drivers/usb/core/usb.c
View File

@ -462,6 +462,25 @@ usb_match_id(struct usb_interface *interface, const struct usb_device_id *id)
return NULL;
}
static int __find_interface(struct device * dev, void * data)
{
struct usb_interface ** ret = (struct usb_interface **)data;
struct usb_interface * intf = *ret;
int *minor = (int *)data;
/* can't look at usb devices, only interfaces */
if (dev->driver == &usb_generic_driver)
return 0;
intf = to_usb_interface(dev);
if (intf->minor != -1 && intf->minor == *minor) {
*ret = intf;
return 1;
}
return 0;
}
/**
* usb_find_interface - find usb_interface pointer for driver and device
* @drv: the driver whose current configuration is considered
@ -473,26 +492,12 @@ usb_match_id(struct usb_interface *interface, const struct usb_device_id *id)
*/
struct usb_interface *usb_find_interface(struct usb_driver *drv, int minor)
{
struct list_head *entry;
struct device *dev;
struct usb_interface *intf;
struct usb_interface *intf = (struct usb_interface *)minor;
int ret;
list_for_each(entry, &drv->driver.devices) {
dev = container_of(entry, struct device, driver_list);
ret = driver_for_each_device(&drv->driver, NULL, &intf, __find_interface);
/* can't look at usb devices, only interfaces */
if (dev->driver == &usb_generic_driver)
continue;
intf = to_usb_interface(dev);
if (intf->minor == -1)
continue;
if (intf->minor == minor)
return intf;
}
/* no device found that matches */
return NULL;
return ret ? intf : NULL;
}
static int usb_device_match (struct device *dev, struct device_driver *drv)