staging: comedi: comedi_usb: allow comedi usb drivers to pass a 'context'

Allow the comedi usb drivers to pass a 'context' from their (*probe)
functions to the comedi core's comedi_usb_auto_config(). This 'context'
is then passed to comedi_auto_config() and then to the comedi_driver's
(*auto_attach).

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>

diff --git a/drivers/staging/comedi/comedi_usb.c b/drivers/staging/comedi/comedi_usb.c
index cd6abba8a2a8b92038e5c7e9a2bdb60ca7769342..9d9716a248f15f7f0816d84e35582bba0ffa91ce 100644 (file)
--- a/drivers/staging/comedi/comedi_usb.c
+++ b/drivers/staging/comedi/comedi_usb.c
@@ -38,13 +38,15 @@ EXPORT_SYMBOL_GPL(comedi_to_usb_interface);
  * comedi_usb_auto_config() - Configure/probe a comedi USB driver.
  * @intf: usb_interface struct
  * @driver: comedi_driver struct
+ * @context: driver specific data, passed to comedi_auto_config()
  *
  * Typically called from the usb_driver (*probe) function.
  */
 int comedi_usb_auto_config(struct usb_interface *intf,
-                          struct comedi_driver *driver)
+                          struct comedi_driver *driver,
+                          unsigned long context)
 {
-       return comedi_auto_config(&intf->dev, driver, 0);
+       return comedi_auto_config(&intf->dev, driver, context);
 }
 EXPORT_SYMBOL_GPL(comedi_usb_auto_config);
 

diff --git a/drivers/staging/comedi/comedidev.h b/drivers/staging/comedi/comedidev.h
index 4836fe6dfb356aa83843192c23ccbc8576906b3f..d921cd784b0086582e7dfb1ef93de26a26085ca8 100644 (file)
--- a/drivers/staging/comedi/comedidev.h
+++ b/drivers/staging/comedi/comedidev.h
@@ -476,7 +476,8 @@ struct usb_interface;
 
 struct usb_interface *comedi_to_usb_interface(struct comedi_device *);
 
-int comedi_usb_auto_config(struct usb_interface *, struct comedi_driver *);
+int comedi_usb_auto_config(struct usb_interface *, struct comedi_driver *,
+                          unsigned long context);
 void comedi_usb_auto_unconfig(struct usb_interface *);
 
 int comedi_usb_driver_register(struct comedi_driver *, struct usb_driver *);

diff --git a/drivers/staging/comedi/drivers/usbdux.c b/drivers/staging/comedi/drivers/usbdux.c
index 17b45ebb0553aeabb4ac0facf47d7a4b029719e4..7c2f8568ebb3e933a68db492c01d925a0c3f6084 100644 (file)
--- a/drivers/staging/comedi/drivers/usbdux.c
+++ b/drivers/staging/comedi/drivers/usbdux.c
@@ -2388,7 +2388,7 @@ static void usbdux_firmware_request_complete_handler(const struct firmware *fw,
                        "Could not upload firmware (err=%d)\n", ret);
                goto out;
        }
-       comedi_usb_auto_config(uinterf, &usbdux_driver);
+       comedi_usb_auto_config(uinterf, &usbdux_driver, 0);
  out:
        release_firmware(fw);
 }

diff --git a/drivers/staging/comedi/drivers/usbduxfast.c b/drivers/staging/comedi/drivers/usbduxfast.c
index 4e19f6186f281248d67c7f75d3fdd8a760d05618..0f6187f96caa8028757632d3bb27379b66405ccc 100644 (file)
--- a/drivers/staging/comedi/drivers/usbduxfast.c
+++ b/drivers/staging/comedi/drivers/usbduxfast.c
@@ -1490,7 +1490,7 @@ static void usbduxfast_firmware_request_complete_handler(const struct firmware
                goto out;
        }
 
-       comedi_usb_auto_config(uinterf, &usbduxfast_driver);
+       comedi_usb_auto_config(uinterf, &usbduxfast_driver, 0);
  out:
        release_firmware(fw);
 }

diff --git a/drivers/staging/comedi/drivers/usbduxsigma.c b/drivers/staging/comedi/drivers/usbduxsigma.c
index cdd279b1f61e12bcddd5c2dea6673592e28c3c42..dc6b0174ad71b4e827ce20499462fa827c516a81 100644 (file)
--- a/drivers/staging/comedi/drivers/usbduxsigma.c
+++ b/drivers/staging/comedi/drivers/usbduxsigma.c
@@ -2374,7 +2374,7 @@ static void usbdux_firmware_request_complete_handler(const struct firmware *fw,
                        "Could not upload firmware (err=%d)\n", ret);
                goto out;
        }
-       comedi_usb_auto_config(uinterf, &usbduxsigma_driver);
+       comedi_usb_auto_config(uinterf, &usbduxsigma_driver, 0);
 out:
        release_firmware(fw);
 }

diff --git a/drivers/staging/comedi/drivers/vmk80xx.c b/drivers/staging/comedi/drivers/vmk80xx.c
index 00a115d988dc5f46cef32239a2ea6587dcb56cf0..c20202c5cb77477dfa275df01d376e49ace101ef 100644 (file)
--- a/drivers/staging/comedi/drivers/vmk80xx.c
+++ b/drivers/staging/comedi/drivers/vmk80xx.c
@@ -1401,7 +1401,7 @@ static int vmk80xx_usb_probe(struct usb_interface *intf,
 
        mutex_unlock(&glb_mutex);
 
-       comedi_usb_auto_config(intf, &vmk80xx_driver);
+       comedi_usb_auto_config(intf, &vmk80xx_driver, id->driver_info);
 
        return 0;