diff options
author | Ian Abbott <abbotti@mev.co.uk> | 2012-03-30 12:14:56 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-04-10 14:17:27 -0400 |
commit | 4c093a6dc2240fd54d71a25b284e02d51509e430 (patch) | |
tree | 3afdf635f041b7faeedb635ca3bdb6afd7c87d8c /drivers/staging/comedi/drivers.c | |
parent | 2e3c024df12adf8a4c44d0d21d5c8edcdf083209 (diff) |
staging: comedi: pass 'struct comedi_driver *' to comedi_..._auto_config
The comedi_pci_auto_config() and comedi_usb_auto_config() functions
currently take a board name parameter which is actually a driver name
parameter. Replace it with a pointer to the struct comedi_driver. This
will allow comedi_pci_auto_config() and comedi_usb_auto_config() to call
bus-type-specific auto-configuration hooks in the struct comedi_driver
if they exist (they don't yet). The idea is that these
bus-type-specific auto-configuration hooks won't have to search the bus
for the device being auto-configured like 'attach()' hook has to.
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 | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/drivers/staging/comedi/drivers.c b/drivers/staging/comedi/drivers.c index bf185e2807d..9dd2da1e97a 100644 --- a/drivers/staging/comedi/drivers.c +++ b/drivers/staging/comedi/drivers.c | |||
@@ -874,7 +874,7 @@ static void comedi_auto_unconfig(struct device *hardware_device) | |||
874 | kfree(minor); | 874 | kfree(minor); |
875 | } | 875 | } |
876 | 876 | ||
877 | int comedi_pci_auto_config(struct pci_dev *pcidev, const char *board_name) | 877 | int comedi_pci_auto_config(struct pci_dev *pcidev, struct comedi_driver *driver) |
878 | { | 878 | { |
879 | int options[2]; | 879 | int options[2]; |
880 | 880 | ||
@@ -883,7 +883,7 @@ int comedi_pci_auto_config(struct pci_dev *pcidev, const char *board_name) | |||
883 | /* pci slot */ | 883 | /* pci slot */ |
884 | options[1] = PCI_SLOT(pcidev->devfn); | 884 | options[1] = PCI_SLOT(pcidev->devfn); |
885 | 885 | ||
886 | return comedi_auto_config(&pcidev->dev, board_name, | 886 | return comedi_auto_config(&pcidev->dev, driver->driver_name, |
887 | options, ARRAY_SIZE(options)); | 887 | options, ARRAY_SIZE(options)); |
888 | } | 888 | } |
889 | EXPORT_SYMBOL_GPL(comedi_pci_auto_config); | 889 | EXPORT_SYMBOL_GPL(comedi_pci_auto_config); |
@@ -894,10 +894,11 @@ void comedi_pci_auto_unconfig(struct pci_dev *pcidev) | |||
894 | } | 894 | } |
895 | EXPORT_SYMBOL_GPL(comedi_pci_auto_unconfig); | 895 | EXPORT_SYMBOL_GPL(comedi_pci_auto_unconfig); |
896 | 896 | ||
897 | int comedi_usb_auto_config(struct usb_device *usbdev, const char *board_name) | 897 | int comedi_usb_auto_config(struct usb_device *usbdev, |
898 | struct comedi_driver *driver) | ||
898 | { | 899 | { |
899 | BUG_ON(usbdev == NULL); | 900 | BUG_ON(usbdev == NULL); |
900 | return comedi_auto_config(&usbdev->dev, board_name, NULL, 0); | 901 | return comedi_auto_config(&usbdev->dev, driver->driver_name, NULL, 0); |
901 | } | 902 | } |
902 | EXPORT_SYMBOL_GPL(comedi_usb_auto_config); | 903 | EXPORT_SYMBOL_GPL(comedi_usb_auto_config); |
903 | 904 | ||