lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

staging: comedi: don't check driver->auto_attach

Browse Source 
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@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Ian Abbott 2012-11-14 13:10:37 +00:00 committed by Greg Kroah-Hartman
parent 45d6f1965e
commit af448aca8f
1 changed files with 2 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
drivers/staging/comedi/drivers.c
View File

@ -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);