There is no need for `comedi_pci_auto_config()` and
`comedi_usb_auto_config()` to check that `driver->auto_attach` is
non-null before calling `comedi_auto_attach()` as this check is done by
`comedi_auto_config()` itself (actually by
`comedi_auto_config_wrapper()`). Remove the unnecessary checks.
Signed-off-by: Ian Abbott <abbotti@xxxxxxxxx>
---
drivers/staging/comedi/drivers.c | 11 ++---------
1 file changed, 2 insertions(+), 9 deletions(-)
diff --git a/drivers/staging/comedi/drivers.c b/drivers/staging/comedi/drivers.c
index 047c1d9..d27425e 100644
--- a/drivers/staging/comedi/drivers.c
+++ b/drivers/staging/comedi/drivers.c
@@ -949,11 +949,7 @@ EXPORT_SYMBOL_GPL(comedi_pci_disable);
int comedi_pci_auto_config(struct pci_dev *pcidev, struct comedi_driver *driver)
{
-
- if (driver->auto_attach)
- return comedi_auto_config(&pcidev->dev, driver, 0);
- else
- return -EINVAL;
+ return comedi_auto_config(&pcidev->dev, driver, 0);
}
EXPORT_SYMBOL_GPL(comedi_pci_auto_config);
@@ -1000,10 +996,7 @@ int comedi_usb_auto_config(struct usb_interface *intf,
struct comedi_driver *driver)
{
BUG_ON(intf == NULL);
- if (driver->auto_attach)
- return comedi_auto_config(&intf->dev, driver, 0);
- else
- return -EINVAL;
+ return comedi_auto_config(&intf->dev, driver, 0);
}
EXPORT_SYMBOL_GPL(comedi_usb_auto_config);
--
1.7.12.4
_______________________________________________
devel mailing list
devel@xxxxxxxxxxxxxxxxxxxxxx
http://driverdev.linuxdriverproject.org/mailman/listinfo/devel
