Messages in this thread Patch in this message | | | Date | Mon, 21 Mar 2005 12:48:45 -0800 (PST) | From | Patrick Mochel <> | Subject | [5/9] [RFC] Steps to fixing the driver model locking |
| |
ChangeSet@1.2234, 2005-03-21 11:09:40-08:00, mochel@digitalimplant.org [usb] Use driver_for_each_device() instead of manually walking list.
Signed-off-by: Patrick Mochel <mochel@digitalimplant.org>
diff -Nru a/drivers/usb/core/usb.c b/drivers/usb/core/usb.c --- a/drivers/usb/core/usb.c 2005-03-21 12:30:37 -08:00 +++ b/drivers/usb/core/usb.c 2005-03-21 12:30:37 -08:00 @@ -469,6 +469,25 @@ 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 @@ -480,26 +499,12 @@ */ struct usb_interface *usb_find_interface(struct usb_driver *drv, int minor) { - struct list_head *entry; - struct device *dev; - struct usb_interface *intf; - - list_for_each(entry, &drv->driver.devices) { - dev = container_of(entry, struct device, driver_list); - - /* 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; - } + struct usb_interface *intf = (struct usb_interface *)minor; + int ret; + + ret = driver_for_each_device(&drv->driver, NULL, &intf, __find_interface);
- /* no device found that matches */ - return NULL; + return ret ? intf : NULL; }
static int usb_device_match (struct device *dev, struct device_driver *drv) - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
| |