staging: comedi: don't call attach_usb handler

All the Comedi drivers that call `comedi_usb_auto_config()` have
replaced the `attach_usb()` handler in their `struct comedi_driver` with
a `auto_attach()` handler, so there is no need to check for the
existence of the `attach_usb()` handler any more.  Remove this check and
the code that calls it.

Signed-off-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/comedi/drivers.c b/drivers/staging/comedi/drivers.c
index f780d38d6da0b533e079186fcee2016736956c5a..047c1d911c8dfbabc0251dfa4cbec10a3d0cfd44 100644 (file)
--- a/drivers/staging/comedi/drivers.c
+++ b/drivers/staging/comedi/drivers.c
@@ -996,27 +996,11 @@ EXPORT_SYMBOL_GPL(comedi_pci_driver_unregister);
 
 #if IS_ENABLED(CONFIG_USB)
 
-static int comedi_usb_attach_wrapper(struct comedi_device *dev,
-                                    unsigned long context)
-{
-       return dev->driver->attach_usb(dev, (struct usb_interface *)context);
-}
-
-static int comedi_new_usb_auto_config(struct usb_interface *intf,
-                                     struct comedi_driver *driver)
-{
-       return comedi_auto_config_helper(&intf->dev, driver,
-                                        comedi_usb_attach_wrapper,
-                                        (unsigned long)intf);
-}
-
 int comedi_usb_auto_config(struct usb_interface *intf,
                           struct comedi_driver *driver)
 {
        BUG_ON(intf == NULL);
-       if (driver->attach_usb)
-               return comedi_new_usb_auto_config(intf, driver);
-       else if (driver->auto_attach)
+       if (driver->auto_attach)
                return comedi_auto_config(&intf->dev, driver, 0);
        else
                return -EINVAL;