diff options
author | Ian Abbott <abbotti@mev.co.uk> | 2012-03-30 12:14:59 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-04-10 14:21:10 -0400 |
commit | d8b6ca0850c558f21989d468801ad1414b1372c4 (patch) | |
tree | c61811ced9f5305d1a36203b58ee1367c405db7e /drivers/staging/comedi/drivers.c | |
parent | c43435d7722134ed1fda58ce1025f41029bd58ad (diff) |
staging: comedi: pass usb interface to comedi_usb_auto_config
The comedi_usb_auto_config() and comedi_usb_auto_unconfig() functions
currently take a 'struct usb_device *'. It makes more sense to pass a
'struct usb_interface *' to allow for composite USB devices.
Signed-off-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/comedi/drivers.c')
-rw-r--r-- | drivers/staging/comedi/drivers.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/staging/comedi/drivers.c b/drivers/staging/comedi/drivers.c index 417aed2ab73..feb33f86023 100644 --- a/drivers/staging/comedi/drivers.c +++ b/drivers/staging/comedi/drivers.c | |||
@@ -880,17 +880,17 @@ void comedi_pci_auto_unconfig(struct pci_dev *pcidev) | |||
880 | } | 880 | } |
881 | EXPORT_SYMBOL_GPL(comedi_pci_auto_unconfig); | 881 | EXPORT_SYMBOL_GPL(comedi_pci_auto_unconfig); |
882 | 882 | ||
883 | int comedi_usb_auto_config(struct usb_device *usbdev, | 883 | int comedi_usb_auto_config(struct usb_interface *intf, |
884 | struct comedi_driver *driver) | 884 | struct comedi_driver *driver) |
885 | { | 885 | { |
886 | BUG_ON(usbdev == NULL); | 886 | BUG_ON(intf == NULL); |
887 | return comedi_auto_config(&usbdev->dev, driver->driver_name, NULL, 0); | 887 | return comedi_auto_config(&intf->dev, driver->driver_name, NULL, 0); |
888 | } | 888 | } |
889 | EXPORT_SYMBOL_GPL(comedi_usb_auto_config); | 889 | EXPORT_SYMBOL_GPL(comedi_usb_auto_config); |
890 | 890 | ||
891 | void comedi_usb_auto_unconfig(struct usb_device *usbdev) | 891 | void comedi_usb_auto_unconfig(struct usb_interface *intf) |
892 | { | 892 | { |
893 | BUG_ON(usbdev == NULL); | 893 | BUG_ON(intf == NULL); |
894 | comedi_auto_unconfig(&usbdev->dev); | 894 | comedi_auto_unconfig(&intf->dev); |
895 | } | 895 | } |
896 | EXPORT_SYMBOL_GPL(comedi_usb_auto_unconfig); | 896 | EXPORT_SYMBOL_GPL(comedi_usb_auto_unconfig); |