staging: comedi: usbdux: remove usbdux_attach

This driver originally used the 'attach' method in order to get
the firmware for the device from the comedi_config utility. It
now uses request_firmware_nowait() in the usb_driver probe to
get this firmware.

Since this driver has an 'attach_usb' method in the comedi_driver,
the 'attach' method can be removed because it is now optional.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

1 files changed, 3 insertions, 52 deletions

diff --git a/drivers/staging/comedi/drivers/usbdux.c b/drivers/staging/comedi/drivers/usbdux.c
index 7aac213fb6ab..bc5fc5cc4641 100644
--- a/drivers/staging/comedi/drivers/usbdux.c
+++ b/drivers/staging/comedi/drivers/usbdux.c
@@ -2293,10 +2293,8 @@ static void tidy_up(struct usbduxsub *usbduxsub_tmp)
         usbduxsub_tmp->pwm_cmd_running = 0;
 }
 
-/* common part of attach and attach_usb */
 static int usbdux_attach_common(struct comedi_device *dev,
-                                struct usbduxsub *udev,
-                                void *aux_data, int aux_len)
+                                struct usbduxsub *udev)
 {
         int ret;
         struct comedi_subdevice *s = NULL;
@@ -2306,10 +2304,6 @@ static int usbdux_attach_common(struct comedi_device *dev,
         /* pointer back to the corresponding comedi device */
         udev->comedidev = dev;
 
-        /* trying to upload the firmware into the chip */
-        if (aux_data)
-                firmwareUpload(udev, aux_data, aux_len);
-
         dev->board_name = "usbdux";
 
         /* set number of subdevices */
@@ -2429,48 +2423,6 @@ static int usbdux_attach_common(struct comedi_device *dev,
         return 0;
 }
 
-/* is called when comedi-config is called */
-static int usbdux_attach(struct comedi_device *dev, struct comedi_devconfig *it)
-{
-        int ret;
-        int index;
-        int i;
-        void *aux_data;
-        int aux_len;
-
-        dev->private = NULL;
-
-        aux_data = comedi_aux_data(it->options, 0);
-        aux_len = it->options[COMEDI_DEVCONF_AUX_DATA_LENGTH];
-        if (aux_data == NULL)
-                aux_len = 0;
-        else if (aux_len == 0)
-                aux_data = NULL;
-
-        down(&start_stop_sem);
-        /* find a valid device which has been detected by the probe function of
-         * the usb */
-        index = -1;
-        for (i = 0; i < NUMUSBDUX; i++) {
-                if ((usbduxsub[i].probed) && (!usbduxsub[i].attached)) {
-                        index = i;
-                        break;
-                }
-        }
-
-        if (index < 0) {
-                printk(KERN_ERR
-                       "comedi%d: usbdux: error: attach failed, no usbdux devs connected to the usb bus.\n",
-                       dev->minor);
-                ret = -ENODEV;
-        } else
-                ret = usbdux_attach_common(dev, &usbduxsub[index],
-                                           aux_data, aux_len);
-        up(&start_stop_sem);
-        return ret;
-}
-
-/* is called from comedi_usb_auto_config() */
 static int usbdux_attach_usb(struct comedi_device *dev,
                              struct usb_interface *uinterf)
 {
@@ -2492,7 +2444,7 @@ static int usbdux_attach_usb(struct comedi_device *dev,
                        dev->minor);
                 ret = -ENODEV;
         } else
-                ret = usbdux_attach_common(dev, this_usbduxsub, NULL, 0);
+                ret = usbdux_attach_common(dev, this_usbduxsub);
         up(&start_stop_sem);
         return ret;
 }
@@ -2513,9 +2465,8 @@ static void usbdux_detach(struct comedi_device *dev)
 static struct comedi_driver usbdux_driver = {
         .driver_name    = "usbdux",
         .module         = THIS_MODULE,
-        .attach         = usbdux_attach,
-        .detach         = usbdux_detach,
         .attach_usb     = usbdux_attach_usb,
+        .detach         = usbdux_detach,
 };
 
 static void usbdux_firmware_request_complete_handler(const struct firmware *fw,