From: Ian Abbott Date: Wed, 14 Nov 2012 13:10:35 +0000 (+0000) Subject: staging: comedi: don't call attach_pci handler X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=a692e9743a7b2085afbca2f7e50a449c3e205cc0;p=linux-beck.git staging: comedi: don't call attach_pci handler All the Comedi drivers that call `comedi_pci_auto_config()` have replaced the `attach_pci()` handler in their `struct comedi_driver` with a `auto_attach()` handler, so there is no need to check for the existence of the `attach_pci()` handler any more. Remove this check and the code that calls it. Signed-off-by: Ian Abbott Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/comedi/drivers.c b/drivers/staging/comedi/drivers.c index d8c3cd32f452..f780d38d6da0 100644 --- a/drivers/staging/comedi/drivers.c +++ b/drivers/staging/comedi/drivers.c @@ -947,26 +947,10 @@ void comedi_pci_disable(struct pci_dev *pdev) } EXPORT_SYMBOL_GPL(comedi_pci_disable); -static int comedi_pci_attach_wrapper(struct comedi_device *dev, - unsigned long context) -{ - return dev->driver->attach_pci(dev, (struct pci_dev *)context); -} - -static int comedi_new_pci_auto_config(struct pci_dev *pcidev, - struct comedi_driver *driver) -{ - return comedi_auto_config_helper(&pcidev->dev, driver, - comedi_pci_attach_wrapper, - (unsigned long)pcidev); -} - int comedi_pci_auto_config(struct pci_dev *pcidev, struct comedi_driver *driver) { - if (driver->attach_pci) - return comedi_new_pci_auto_config(pcidev, driver); - else if (driver->auto_attach) + if (driver->auto_attach) return comedi_auto_config(&pcidev->dev, driver, 0); else return -EINVAL;