[PATCH] staging: comedi: pass through context for USB/PCI auto attach

Ian Abbott abbotti at mev.co.uk
Tue Dec 4 13:41:10 UTC 2012


Comedi PCI board drivers mostly support auto-attachment of PCI devices
as Comedi devices with a call to the static inline function
`comedi_pci_auto_config()` which should result in the driver's
`auto_attach` handler being called.  Similarly for Comedi USB board
drivers that call the static inline function `comedi_usb_auto_config()`.

The driver's `auto_attach` handler has an unsigned long context
parameter that is currently unused by any drivers, but
`comedi_pci_auto_config()` and `comedi_usb_auto_config()` currently set
the context parameter to 0.

Instead of forcing the context parameter to 0, change the prototypes of
`comedi_pci_auto_config()` and `comedi_pci_auto_config()` so that a
context value from the driver can be passed through to its `auto_attach`
handler.  A driver might set the context to the `driver_data` from a
`struct pci_device_id` or the `driver_info` from a `struct
usb_device_id` for example.

Signed-off-by: Ian Abbott <abbotti at mev.co.uk>
---
 drivers/staging/comedi/comedidev.h              | 10 ++++++----
 drivers/staging/comedi/drivers/8255_pci.c       |  2 +-
 drivers/staging/comedi/drivers/addi_apci_035.c  |  2 +-
 drivers/staging/comedi/drivers/addi_apci_1032.c |  2 +-
 drivers/staging/comedi/drivers/addi_apci_1500.c |  2 +-
 drivers/staging/comedi/drivers/addi_apci_1516.c |  2 +-
 drivers/staging/comedi/drivers/addi_apci_1564.c |  2 +-
 drivers/staging/comedi/drivers/addi_apci_16xx.c |  2 +-
 drivers/staging/comedi/drivers/addi_apci_1710.c |  2 +-
 drivers/staging/comedi/drivers/addi_apci_2032.c |  2 +-
 drivers/staging/comedi/drivers/addi_apci_2200.c |  2 +-
 drivers/staging/comedi/drivers/addi_apci_3120.c |  2 +-
 drivers/staging/comedi/drivers/addi_apci_3200.c |  2 +-
 drivers/staging/comedi/drivers/addi_apci_3501.c |  2 +-
 drivers/staging/comedi/drivers/addi_apci_3xxx.c |  2 +-
 drivers/staging/comedi/drivers/adl_pci6208.c    |  2 +-
 drivers/staging/comedi/drivers/adl_pci7x3x.c    |  2 +-
 drivers/staging/comedi/drivers/adl_pci8164.c    |  2 +-
 drivers/staging/comedi/drivers/adl_pci9111.c    |  2 +-
 drivers/staging/comedi/drivers/adl_pci9118.c    |  2 +-
 drivers/staging/comedi/drivers/adv_pci1710.c    |  2 +-
 drivers/staging/comedi/drivers/adv_pci1723.c    |  2 +-
 drivers/staging/comedi/drivers/adv_pci_dio.c    |  2 +-
 drivers/staging/comedi/drivers/amplc_dio200.c   |  2 +-
 drivers/staging/comedi/drivers/amplc_pc236.c    |  2 +-
 drivers/staging/comedi/drivers/amplc_pc263.c    |  2 +-
 drivers/staging/comedi/drivers/amplc_pci224.c   |  2 +-
 drivers/staging/comedi/drivers/amplc_pci230.c   |  2 +-
 drivers/staging/comedi/drivers/cb_pcidas.c      |  2 +-
 drivers/staging/comedi/drivers/cb_pcidas64.c    |  2 +-
 drivers/staging/comedi/drivers/cb_pcidda.c      |  2 +-
 drivers/staging/comedi/drivers/cb_pcimdas.c     |  2 +-
 drivers/staging/comedi/drivers/cb_pcimdda.c     |  2 +-
 drivers/staging/comedi/drivers/contec_pci_dio.c |  2 +-
 drivers/staging/comedi/drivers/daqboard2000.c   |  2 +-
 drivers/staging/comedi/drivers/das08.c          |  2 +-
 drivers/staging/comedi/drivers/dt3000.c         |  2 +-
 drivers/staging/comedi/drivers/dyna_pci10xx.c   |  2 +-
 drivers/staging/comedi/drivers/gsc_hpdi.c       |  2 +-
 drivers/staging/comedi/drivers/icp_multi.c      |  2 +-
 drivers/staging/comedi/drivers/jr3_pci.c        |  2 +-
 drivers/staging/comedi/drivers/ke_counter.c     |  2 +-
 drivers/staging/comedi/drivers/me4000.c         |  2 +-
 drivers/staging/comedi/drivers/me_daq.c         |  2 +-
 drivers/staging/comedi/drivers/ni_6527.c        |  2 +-
 drivers/staging/comedi/drivers/ni_65xx.c        |  2 +-
 drivers/staging/comedi/drivers/ni_660x.c        |  2 +-
 drivers/staging/comedi/drivers/ni_670x.c        |  2 +-
 drivers/staging/comedi/drivers/ni_labpc.c       |  2 +-
 drivers/staging/comedi/drivers/ni_pcidio.c      |  2 +-
 drivers/staging/comedi/drivers/ni_pcimio.c      |  2 +-
 drivers/staging/comedi/drivers/rtd520.c         |  2 +-
 drivers/staging/comedi/drivers/s626.c           |  2 +-
 drivers/staging/comedi/drivers/skel.c           |  2 +-
 drivers/staging/comedi/drivers/usbdux.c         |  2 +-
 drivers/staging/comedi/drivers/usbduxfast.c     |  2 +-
 drivers/staging/comedi/drivers/usbduxsigma.c    |  2 +-
 drivers/staging/comedi/drivers/vmk80xx.c        |  2 +-
 58 files changed, 63 insertions(+), 61 deletions(-)

diff --git a/drivers/staging/comedi/comedidev.h b/drivers/staging/comedi/comedidev.h
index 692e1e6..d2d32ab 100644
--- a/drivers/staging/comedi/comedidev.h
+++ b/drivers/staging/comedi/comedidev.h
@@ -519,9 +519,10 @@ int comedi_auto_config(struct device *hardware_device,
 void comedi_auto_unconfig(struct device *hardware_device);
 
 static inline int comedi_pci_auto_config(struct pci_dev *pcidev,
-					 struct comedi_driver *driver)
+					 struct comedi_driver *driver,
+					 unsigned long context)
 {
-	return comedi_auto_config(&pcidev->dev, driver, 0);
+	return comedi_auto_config(&pcidev->dev, driver, context);
 }
 
 static inline void comedi_pci_auto_unconfig(struct pci_dev *pcidev)
@@ -530,9 +531,10 @@ static inline void comedi_pci_auto_unconfig(struct pci_dev *pcidev)
 }
 
 static inline 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);
 }
 
 static inline void comedi_usb_auto_unconfig(struct usb_interface *intf)
diff --git a/drivers/staging/comedi/drivers/8255_pci.c b/drivers/staging/comedi/drivers/8255_pci.c
index e0a7952..98c7e05 100644
--- a/drivers/staging/comedi/drivers/8255_pci.c
+++ b/drivers/staging/comedi/drivers/8255_pci.c
@@ -311,7 +311,7 @@ static struct comedi_driver pci_8255_driver = {
 static int pci_8255_pci_probe(struct pci_dev *dev,
 					const struct pci_device_id *ent)
 {
-	return comedi_pci_auto_config(dev, &pci_8255_driver);
+	return comedi_pci_auto_config(dev, &pci_8255_driver, 0);
 }
 
 static void pci_8255_pci_remove(struct pci_dev *dev)
diff --git a/drivers/staging/comedi/drivers/addi_apci_035.c b/drivers/staging/comedi/drivers/addi_apci_035.c
index c981d4b..4002547 100644
--- a/drivers/staging/comedi/drivers/addi_apci_035.c
+++ b/drivers/staging/comedi/drivers/addi_apci_035.c
@@ -50,7 +50,7 @@ static struct comedi_driver apci035_driver = {
 static int apci035_pci_probe(struct pci_dev *dev,
 				       const struct pci_device_id *ent)
 {
-	return comedi_pci_auto_config(dev, &apci035_driver);
+	return comedi_pci_auto_config(dev, &apci035_driver, 0);
 }
 
 static void apci035_pci_remove(struct pci_dev *dev)
diff --git a/drivers/staging/comedi/drivers/addi_apci_1032.c b/drivers/staging/comedi/drivers/addi_apci_1032.c
index 7f94242..ba42197 100644
--- a/drivers/staging/comedi/drivers/addi_apci_1032.c
+++ b/drivers/staging/comedi/drivers/addi_apci_1032.c
@@ -372,7 +372,7 @@ static struct comedi_driver apci1032_driver = {
 static int apci1032_pci_probe(struct pci_dev *dev,
 					const struct pci_device_id *ent)
 {
-	return comedi_pci_auto_config(dev, &apci1032_driver);
+	return comedi_pci_auto_config(dev, &apci1032_driver, 0);
 }
 
 static void apci1032_pci_remove(struct pci_dev *dev)
diff --git a/drivers/staging/comedi/drivers/addi_apci_1500.c b/drivers/staging/comedi/drivers/addi_apci_1500.c
index 8e686a9..e145fad 100644
--- a/drivers/staging/comedi/drivers/addi_apci_1500.c
+++ b/drivers/staging/comedi/drivers/addi_apci_1500.c
@@ -50,7 +50,7 @@ static struct comedi_driver apci1500_driver = {
 static int apci1500_pci_probe(struct pci_dev *dev,
 					const struct pci_device_id *ent)
 {
-	return comedi_pci_auto_config(dev, &apci1500_driver);
+	return comedi_pci_auto_config(dev, &apci1500_driver, 0);
 }
 
 static void apci1500_pci_remove(struct pci_dev *dev)
diff --git a/drivers/staging/comedi/drivers/addi_apci_1516.c b/drivers/staging/comedi/drivers/addi_apci_1516.c
index 8fef04b..0d078c0 100644
--- a/drivers/staging/comedi/drivers/addi_apci_1516.c
+++ b/drivers/staging/comedi/drivers/addi_apci_1516.c
@@ -320,7 +320,7 @@ static struct comedi_driver apci1516_driver = {
 static int apci1516_pci_probe(struct pci_dev *dev,
 					const struct pci_device_id *ent)
 {
-	return comedi_pci_auto_config(dev, &apci1516_driver);
+	return comedi_pci_auto_config(dev, &apci1516_driver, 0);
 }
 
 static void apci1516_pci_remove(struct pci_dev *dev)
diff --git a/drivers/staging/comedi/drivers/addi_apci_1564.c b/drivers/staging/comedi/drivers/addi_apci_1564.c
index 513e536..0ad88ac 100644
--- a/drivers/staging/comedi/drivers/addi_apci_1564.c
+++ b/drivers/staging/comedi/drivers/addi_apci_1564.c
@@ -47,7 +47,7 @@ static struct comedi_driver apci1564_driver = {
 static int apci1564_pci_probe(struct pci_dev *dev,
 					const struct pci_device_id *ent)
 {
-	return comedi_pci_auto_config(dev, &apci1564_driver);
+	return comedi_pci_auto_config(dev, &apci1564_driver, 0);
 }
 
 static void apci1564_pci_remove(struct pci_dev *dev)
diff --git a/drivers/staging/comedi/drivers/addi_apci_16xx.c b/drivers/staging/comedi/drivers/addi_apci_16xx.c
index ab9a96a..be57ade 100644
--- a/drivers/staging/comedi/drivers/addi_apci_16xx.c
+++ b/drivers/staging/comedi/drivers/addi_apci_16xx.c
@@ -49,7 +49,7 @@ static struct comedi_driver apci16xx_driver = {
 static int apci16xx_pci_probe(struct pci_dev *dev,
 					const struct pci_device_id *ent)
 {
-	return comedi_pci_auto_config(dev, &apci16xx_driver);
+	return comedi_pci_auto_config(dev, &apci16xx_driver, 0);
 }
 
 static void apci16xx_pci_remove(struct pci_dev *dev)
diff --git a/drivers/staging/comedi/drivers/addi_apci_1710.c b/drivers/staging/comedi/drivers/addi_apci_1710.c
index 152e7ef..846b49c 100644
--- a/drivers/staging/comedi/drivers/addi_apci_1710.c
+++ b/drivers/staging/comedi/drivers/addi_apci_1710.c
@@ -125,7 +125,7 @@ static struct comedi_driver apci1710_driver = {
 static int apci1710_pci_probe(struct pci_dev *dev,
 					const struct pci_device_id *ent)
 {
-	return comedi_pci_auto_config(dev, &apci1710_driver);
+	return comedi_pci_auto_config(dev, &apci1710_driver, 0);
 }
 
 static void apci1710_pci_remove(struct pci_dev *dev)
diff --git a/drivers/staging/comedi/drivers/addi_apci_2032.c b/drivers/staging/comedi/drivers/addi_apci_2032.c
index 8f8d3e9..082a453 100644
--- a/drivers/staging/comedi/drivers/addi_apci_2032.c
+++ b/drivers/staging/comedi/drivers/addi_apci_2032.c
@@ -357,7 +357,7 @@ static struct comedi_driver apci2032_driver = {
 static int apci2032_pci_probe(struct pci_dev *dev,
 					const struct pci_device_id *ent)
 {
-	return comedi_pci_auto_config(dev, &apci2032_driver);
+	return comedi_pci_auto_config(dev, &apci2032_driver, 0);
 }
 
 static void apci2032_pci_remove(struct pci_dev *dev)
diff --git a/drivers/staging/comedi/drivers/addi_apci_2200.c b/drivers/staging/comedi/drivers/addi_apci_2200.c
index 7c2c5db..661077a 100644
--- a/drivers/staging/comedi/drivers/addi_apci_2200.c
+++ b/drivers/staging/comedi/drivers/addi_apci_2200.c
@@ -42,7 +42,7 @@ static struct comedi_driver apci2200_driver = {
 static int apci2200_pci_probe(struct pci_dev *dev,
 					const struct pci_device_id *ent)
 {
-	return comedi_pci_auto_config(dev, &apci2200_driver);
+	return comedi_pci_auto_config(dev, &apci2200_driver, 0);
 }
 
 static void apci2200_pci_remove(struct pci_dev *dev)
diff --git a/drivers/staging/comedi/drivers/addi_apci_3120.c b/drivers/staging/comedi/drivers/addi_apci_3120.c
index fec2962..3b36a35 100644
--- a/drivers/staging/comedi/drivers/addi_apci_3120.c
+++ b/drivers/staging/comedi/drivers/addi_apci_3120.c
@@ -248,7 +248,7 @@ static struct comedi_driver apci3120_driver = {
 static int apci3120_pci_probe(struct pci_dev *dev,
 					const struct pci_device_id *ent)
 {
-	return comedi_pci_auto_config(dev, &apci3120_driver);
+	return comedi_pci_auto_config(dev, &apci3120_driver, 0);
 }
 
 static void apci3120_pci_remove(struct pci_dev *dev)
diff --git a/drivers/staging/comedi/drivers/addi_apci_3200.c b/drivers/staging/comedi/drivers/addi_apci_3200.c
index 9085b77..c67565a 100644
--- a/drivers/staging/comedi/drivers/addi_apci_3200.c
+++ b/drivers/staging/comedi/drivers/addi_apci_3200.c
@@ -103,7 +103,7 @@ static struct comedi_driver apci3200_driver = {
 static int apci3200_pci_probe(struct pci_dev *dev,
 					const struct pci_device_id *ent)
 {
-	return comedi_pci_auto_config(dev, &apci3200_driver);
+	return comedi_pci_auto_config(dev, &apci3200_driver, 0);
 }
 
 static void apci3200_pci_remove(struct pci_dev *dev)
diff --git a/drivers/staging/comedi/drivers/addi_apci_3501.c b/drivers/staging/comedi/drivers/addi_apci_3501.c
index ed297de..58bb6f3 100644
--- a/drivers/staging/comedi/drivers/addi_apci_3501.c
+++ b/drivers/staging/comedi/drivers/addi_apci_3501.c
@@ -54,7 +54,7 @@ static struct comedi_driver apci3501_driver = {
 static int apci3501_pci_probe(struct pci_dev *dev,
 					const struct pci_device_id *ent)
 {
-	return comedi_pci_auto_config(dev, &apci3501_driver);
+	return comedi_pci_auto_config(dev, &apci3501_driver, 0);
 }
 
 static void apci3501_pci_remove(struct pci_dev *dev)
diff --git a/drivers/staging/comedi/drivers/addi_apci_3xxx.c b/drivers/staging/comedi/drivers/addi_apci_3xxx.c
index 1562347..3c84342 100644
--- a/drivers/staging/comedi/drivers/addi_apci_3xxx.c
+++ b/drivers/staging/comedi/drivers/addi_apci_3xxx.c
@@ -748,7 +748,7 @@ static struct comedi_driver apci3xxx_driver = {
 static int apci3xxx_pci_probe(struct pci_dev *dev,
 					const struct pci_device_id *ent)
 {
-	return comedi_pci_auto_config(dev, &apci3xxx_driver);
+	return comedi_pci_auto_config(dev, &apci3xxx_driver, 0);
 }
 
 static void apci3xxx_pci_remove(struct pci_dev *dev)
diff --git a/drivers/staging/comedi/drivers/adl_pci6208.c b/drivers/staging/comedi/drivers/adl_pci6208.c
index 9a56eed..143cf67 100644
--- a/drivers/staging/comedi/drivers/adl_pci6208.c
+++ b/drivers/staging/comedi/drivers/adl_pci6208.c
@@ -267,7 +267,7 @@ static struct comedi_driver adl_pci6208_driver = {
 static int adl_pci6208_pci_probe(struct pci_dev *dev,
 					   const struct pci_device_id *ent)
 {
-	return comedi_pci_auto_config(dev, &adl_pci6208_driver);
+	return comedi_pci_auto_config(dev, &adl_pci6208_driver, 0);
 }
 
 static void adl_pci6208_pci_remove(struct pci_dev *dev)
diff --git a/drivers/staging/comedi/drivers/adl_pci7x3x.c b/drivers/staging/comedi/drivers/adl_pci7x3x.c
index 772edc0..60e34b5 100644
--- a/drivers/staging/comedi/drivers/adl_pci7x3x.c
+++ b/drivers/staging/comedi/drivers/adl_pci7x3x.c
@@ -299,7 +299,7 @@ static struct comedi_driver adl_pci7x3x_driver = {
 static int adl_pci7x3x_pci_probe(struct pci_dev *dev,
 					   const struct pci_device_id *ent)
 {
-	return comedi_pci_auto_config(dev, &adl_pci7x3x_driver);
+	return comedi_pci_auto_config(dev, &adl_pci7x3x_driver, 0);
 }
 
 static void adl_pci7x3x_pci_remove(struct pci_dev *dev)
diff --git a/drivers/staging/comedi/drivers/adl_pci8164.c b/drivers/staging/comedi/drivers/adl_pci8164.c
index 4dd9d70..4304b99 100644
--- a/drivers/staging/comedi/drivers/adl_pci8164.c
+++ b/drivers/staging/comedi/drivers/adl_pci8164.c
@@ -295,7 +295,7 @@ static struct comedi_driver adl_pci8164_driver = {
 static int adl_pci8164_pci_probe(struct pci_dev *dev,
 					   const struct pci_device_id *ent)
 {
-	return comedi_pci_auto_config(dev, &adl_pci8164_driver);
+	return comedi_pci_auto_config(dev, &adl_pci8164_driver, 0);
 }
 
 static void adl_pci8164_pci_remove(struct pci_dev *dev)
diff --git a/drivers/staging/comedi/drivers/adl_pci9111.c b/drivers/staging/comedi/drivers/adl_pci9111.c
index a339b9d..7148d84 100644
--- a/drivers/staging/comedi/drivers/adl_pci9111.c
+++ b/drivers/staging/comedi/drivers/adl_pci9111.c
@@ -960,7 +960,7 @@ static struct comedi_driver adl_pci9111_driver = {
 static int pci9111_pci_probe(struct pci_dev *dev,
 				       const struct pci_device_id *ent)
 {
-	return comedi_pci_auto_config(dev, &adl_pci9111_driver);
+	return comedi_pci_auto_config(dev, &adl_pci9111_driver, 0);
 }
 
 static void pci9111_pci_remove(struct pci_dev *dev)
diff --git a/drivers/staging/comedi/drivers/adl_pci9118.c b/drivers/staging/comedi/drivers/adl_pci9118.c
index b6dda80..0fe056a 100644
--- a/drivers/staging/comedi/drivers/adl_pci9118.c
+++ b/drivers/staging/comedi/drivers/adl_pci9118.c
@@ -2222,7 +2222,7 @@ static struct comedi_driver adl_pci9118_driver = {
 static int adl_pci9118_pci_probe(struct pci_dev *dev,
 					   const struct pci_device_id *ent)
 {
-	return comedi_pci_auto_config(dev, &adl_pci9118_driver);
+	return comedi_pci_auto_config(dev, &adl_pci9118_driver, 0);
 }
 
 static void adl_pci9118_pci_remove(struct pci_dev *dev)
diff --git a/drivers/staging/comedi/drivers/adv_pci1710.c b/drivers/staging/comedi/drivers/adv_pci1710.c
index a6fd8c2..46399a3 100644
--- a/drivers/staging/comedi/drivers/adv_pci1710.c
+++ b/drivers/staging/comedi/drivers/adv_pci1710.c
@@ -1399,7 +1399,7 @@ static struct comedi_driver adv_pci1710_driver = {
 static int adv_pci1710_pci_probe(struct pci_dev *dev,
 					   const struct pci_device_id *ent)
 {
-	return comedi_pci_auto_config(dev, &adv_pci1710_driver);
+	return comedi_pci_auto_config(dev, &adv_pci1710_driver, 0);
 }
 
 static void adv_pci1710_pci_remove(struct pci_dev *dev)
diff --git a/drivers/staging/comedi/drivers/adv_pci1723.c b/drivers/staging/comedi/drivers/adv_pci1723.c
index 5af7314..c3bcd4f 100644
--- a/drivers/staging/comedi/drivers/adv_pci1723.c
+++ b/drivers/staging/comedi/drivers/adv_pci1723.c
@@ -324,7 +324,7 @@ static struct comedi_driver adv_pci1723_driver = {
 static int adv_pci1723_pci_probe(struct pci_dev *dev,
 					   const struct pci_device_id *ent)
 {
-	return comedi_pci_auto_config(dev, &adv_pci1723_driver);
+	return comedi_pci_auto_config(dev, &adv_pci1723_driver, 0);
 }
 
 static void adv_pci1723_pci_remove(struct pci_dev *dev)
diff --git a/drivers/staging/comedi/drivers/adv_pci_dio.c b/drivers/staging/comedi/drivers/adv_pci_dio.c
index 05a663e..7bbea2a 100644
--- a/drivers/staging/comedi/drivers/adv_pci_dio.c
+++ b/drivers/staging/comedi/drivers/adv_pci_dio.c
@@ -1203,7 +1203,7 @@ static struct comedi_driver adv_pci_dio_driver = {
 static int adv_pci_dio_pci_probe(struct pci_dev *dev,
 					   const struct pci_device_id *ent)
 {
-	return comedi_pci_auto_config(dev, &adv_pci_dio_driver);
+	return comedi_pci_auto_config(dev, &adv_pci_dio_driver, 0);
 }
 
 static void adv_pci_dio_pci_remove(struct pci_dev *dev)
diff --git a/drivers/staging/comedi/drivers/amplc_dio200.c b/drivers/staging/comedi/drivers/amplc_dio200.c
index 5f309ba..9d73b0f 100644
--- a/drivers/staging/comedi/drivers/amplc_dio200.c
+++ b/drivers/staging/comedi/drivers/amplc_dio200.c
@@ -2076,7 +2076,7 @@ static int amplc_dio200_pci_probe(struct pci_dev *dev,
 						   const struct pci_device_id
 						   *ent)
 {
-	return comedi_pci_auto_config(dev, &amplc_dio200_driver);
+	return comedi_pci_auto_config(dev, &amplc_dio200_driver, 0);
 }
 
 static void amplc_dio200_pci_remove(struct pci_dev *dev)
diff --git a/drivers/staging/comedi/drivers/amplc_pc236.c b/drivers/staging/comedi/drivers/amplc_pc236.c
index 2898354..48772bc 100644
--- a/drivers/staging/comedi/drivers/amplc_pc236.c
+++ b/drivers/staging/comedi/drivers/amplc_pc236.c
@@ -611,7 +611,7 @@ MODULE_DEVICE_TABLE(pci, pc236_pci_table);
 static int amplc_pc236_pci_probe(struct pci_dev *dev,
 					   const struct pci_device_id *ent)
 {
-	return comedi_pci_auto_config(dev, &amplc_pc236_driver);
+	return comedi_pci_auto_config(dev, &amplc_pc236_driver, 0);
 }
 
 static void amplc_pc236_pci_remove(struct pci_dev *dev)
diff --git a/drivers/staging/comedi/drivers/amplc_pc263.c b/drivers/staging/comedi/drivers/amplc_pc263.c
index dfbff77..c27e0da 100644
--- a/drivers/staging/comedi/drivers/amplc_pc263.c
+++ b/drivers/staging/comedi/drivers/amplc_pc263.c
@@ -369,7 +369,7 @@ static int amplc_pc263_pci_probe(struct pci_dev *dev,
 						  const struct pci_device_id
 						  *ent)
 {
-	return comedi_pci_auto_config(dev, &amplc_pc263_driver);
+	return comedi_pci_auto_config(dev, &amplc_pc263_driver, 0);
 }
 
 static void amplc_pc263_pci_remove(struct pci_dev *dev)
diff --git a/drivers/staging/comedi/drivers/amplc_pci224.c b/drivers/staging/comedi/drivers/amplc_pci224.c
index 6e2566a..f1c6955 100644
--- a/drivers/staging/comedi/drivers/amplc_pci224.c
+++ b/drivers/staging/comedi/drivers/amplc_pci224.c
@@ -1509,7 +1509,7 @@ static int amplc_pci224_pci_probe(struct pci_dev *dev,
 						   const struct pci_device_id
 						   *ent)
 {
-	return comedi_pci_auto_config(dev, &amplc_pci224_driver);
+	return comedi_pci_auto_config(dev, &amplc_pci224_driver, 0);
 }
 
 static void amplc_pci224_pci_remove(struct pci_dev *dev)
diff --git a/drivers/staging/comedi/drivers/amplc_pci230.c b/drivers/staging/comedi/drivers/amplc_pci230.c
index 366c68b..853e1cb 100644
--- a/drivers/staging/comedi/drivers/amplc_pci230.c
+++ b/drivers/staging/comedi/drivers/amplc_pci230.c
@@ -2860,7 +2860,7 @@ static struct comedi_driver amplc_pci230_driver = {
 static int amplc_pci230_pci_probe(struct pci_dev *dev,
 					    const struct pci_device_id *ent)
 {
-	return comedi_pci_auto_config(dev, &amplc_pci230_driver);
+	return comedi_pci_auto_config(dev, &amplc_pci230_driver, 0);
 }
 
 static void amplc_pci230_pci_remove(struct pci_dev *dev)
diff --git a/drivers/staging/comedi/drivers/cb_pcidas.c b/drivers/staging/comedi/drivers/cb_pcidas.c
index aed6863..a02b0a6 100644
--- a/drivers/staging/comedi/drivers/cb_pcidas.c
+++ b/drivers/staging/comedi/drivers/cb_pcidas.c
@@ -1629,7 +1629,7 @@ static struct comedi_driver cb_pcidas_driver = {
 static int cb_pcidas_pci_probe(struct pci_dev *dev,
 					 const struct pci_device_id *ent)
 {
-	return comedi_pci_auto_config(dev, &cb_pcidas_driver);
+	return comedi_pci_auto_config(dev, &cb_pcidas_driver, 0);
 }
 
 static void cb_pcidas_pci_remove(struct pci_dev *dev)
diff --git a/drivers/staging/comedi/drivers/cb_pcidas64.c b/drivers/staging/comedi/drivers/cb_pcidas64.c
index d72b46c..9683f76 100644
--- a/drivers/staging/comedi/drivers/cb_pcidas64.c
+++ b/drivers/staging/comedi/drivers/cb_pcidas64.c
@@ -4217,7 +4217,7 @@ static struct comedi_driver cb_pcidas64_driver = {
 static int cb_pcidas64_pci_probe(struct pci_dev *dev,
 					   const struct pci_device_id *ent)
 {
-	return comedi_pci_auto_config(dev, &cb_pcidas64_driver);
+	return comedi_pci_auto_config(dev, &cb_pcidas64_driver, 0);
 }
 
 static void cb_pcidas64_pci_remove(struct pci_dev *dev)
diff --git a/drivers/staging/comedi/drivers/cb_pcidda.c b/drivers/staging/comedi/drivers/cb_pcidda.c
index 7c6029a..5a71f3e 100644
--- a/drivers/staging/comedi/drivers/cb_pcidda.c
+++ b/drivers/staging/comedi/drivers/cb_pcidda.c
@@ -435,7 +435,7 @@ static struct comedi_driver cb_pcidda_driver = {
 static int cb_pcidda_pci_probe(struct pci_dev *dev,
 					 const struct pci_device_id *ent)
 {
-	return comedi_pci_auto_config(dev, &cb_pcidda_driver);
+	return comedi_pci_auto_config(dev, &cb_pcidda_driver, 0);
 }
 
 static void cb_pcidda_pci_remove(struct pci_dev *dev)
diff --git a/drivers/staging/comedi/drivers/cb_pcimdas.c b/drivers/staging/comedi/drivers/cb_pcimdas.c
index b43a5f8..d272437 100644
--- a/drivers/staging/comedi/drivers/cb_pcimdas.c
+++ b/drivers/staging/comedi/drivers/cb_pcimdas.c
@@ -296,7 +296,7 @@ static struct comedi_driver cb_pcimdas_driver = {
 static int cb_pcimdas_pci_probe(struct pci_dev *dev,
 					  const struct pci_device_id *ent)
 {
-	return comedi_pci_auto_config(dev, &cb_pcimdas_driver);
+	return comedi_pci_auto_config(dev, &cb_pcimdas_driver, 0);
 }
 
 static void cb_pcimdas_pci_remove(struct pci_dev *dev)
diff --git a/drivers/staging/comedi/drivers/cb_pcimdda.c b/drivers/staging/comedi/drivers/cb_pcimdda.c
index 699b84f..ad745ac 100644
--- a/drivers/staging/comedi/drivers/cb_pcimdda.c
+++ b/drivers/staging/comedi/drivers/cb_pcimdda.c
@@ -219,7 +219,7 @@ static struct comedi_driver cb_pcimdda_driver = {
 static int cb_pcimdda_pci_probe(struct pci_dev *dev,
 					  const struct pci_device_id *ent)
 {
-	return comedi_pci_auto_config(dev, &cb_pcimdda_driver);
+	return comedi_pci_auto_config(dev, &cb_pcimdda_driver, 0);
 }
 
 static void cb_pcimdda_pci_remove(struct pci_dev *dev)
diff --git a/drivers/staging/comedi/drivers/contec_pci_dio.c b/drivers/staging/comedi/drivers/contec_pci_dio.c
index 1a18fa3..04d3572 100644
--- a/drivers/staging/comedi/drivers/contec_pci_dio.c
+++ b/drivers/staging/comedi/drivers/contec_pci_dio.c
@@ -127,7 +127,7 @@ static struct comedi_driver contec_pci_dio_driver = {
 static int contec_pci_dio_pci_probe(struct pci_dev *dev,
 					      const struct pci_device_id *ent)
 {
-	return comedi_pci_auto_config(dev, &contec_pci_dio_driver);
+	return comedi_pci_auto_config(dev, &contec_pci_dio_driver, 0);
 }
 
 static void contec_pci_dio_pci_remove(struct pci_dev *dev)
diff --git a/drivers/staging/comedi/drivers/daqboard2000.c b/drivers/staging/comedi/drivers/daqboard2000.c
index 992e557..9c0e347 100644
--- a/drivers/staging/comedi/drivers/daqboard2000.c
+++ b/drivers/staging/comedi/drivers/daqboard2000.c
@@ -796,7 +796,7 @@ static struct comedi_driver daqboard2000_driver = {
 static int daqboard2000_pci_probe(struct pci_dev *dev,
 					    const struct pci_device_id *ent)
 {
-	return comedi_pci_auto_config(dev, &daqboard2000_driver);
+	return comedi_pci_auto_config(dev, &daqboard2000_driver, 0);
 }
 
 static void daqboard2000_pci_remove(struct pci_dev *dev)
diff --git a/drivers/staging/comedi/drivers/das08.c b/drivers/staging/comedi/drivers/das08.c
index b15e058..de9c649 100644
--- a/drivers/staging/comedi/drivers/das08.c
+++ b/drivers/staging/comedi/drivers/das08.c
@@ -888,7 +888,7 @@ MODULE_DEVICE_TABLE(pci, das08_pci_table);
 static int das08_pci_probe(struct pci_dev *dev,
 					    const struct pci_device_id *ent)
 {
-	return comedi_pci_auto_config(dev, &das08_driver);
+	return comedi_pci_auto_config(dev, &das08_driver, 0);
 }
 
 static void das08_pci_remove(struct pci_dev *dev)
diff --git a/drivers/staging/comedi/drivers/dt3000.c b/drivers/staging/comedi/drivers/dt3000.c
index 960da8d..b5bb7ad 100644
--- a/drivers/staging/comedi/drivers/dt3000.c
+++ b/drivers/staging/comedi/drivers/dt3000.c
@@ -853,7 +853,7 @@ static struct comedi_driver dt3000_driver = {
 static int dt3000_pci_probe(struct pci_dev *dev,
 				      const struct pci_device_id *ent)
 {
-	return comedi_pci_auto_config(dev, &dt3000_driver);
+	return comedi_pci_auto_config(dev, &dt3000_driver, 0);
 }
 
 static void dt3000_pci_remove(struct pci_dev *dev)
diff --git a/drivers/staging/comedi/drivers/dyna_pci10xx.c b/drivers/staging/comedi/drivers/dyna_pci10xx.c
index 8497a36..3f29099 100644
--- a/drivers/staging/comedi/drivers/dyna_pci10xx.c
+++ b/drivers/staging/comedi/drivers/dyna_pci10xx.c
@@ -273,7 +273,7 @@ static struct comedi_driver dyna_pci10xx_driver = {
 static int dyna_pci10xx_pci_probe(struct pci_dev *dev,
 					    const struct pci_device_id *ent)
 {
-	return comedi_pci_auto_config(dev, &dyna_pci10xx_driver);
+	return comedi_pci_auto_config(dev, &dyna_pci10xx_driver, 0);
 }
 
 static void dyna_pci10xx_pci_remove(struct pci_dev *dev)
diff --git a/drivers/staging/comedi/drivers/gsc_hpdi.c b/drivers/staging/comedi/drivers/gsc_hpdi.c
index 154598f..ce51442 100644
--- a/drivers/staging/comedi/drivers/gsc_hpdi.c
+++ b/drivers/staging/comedi/drivers/gsc_hpdi.c
@@ -943,7 +943,7 @@ static struct comedi_driver gsc_hpdi_driver = {
 static int gsc_hpdi_pci_probe(struct pci_dev *dev,
 					const struct pci_device_id *ent)
 {
-	return comedi_pci_auto_config(dev, &gsc_hpdi_driver);
+	return comedi_pci_auto_config(dev, &gsc_hpdi_driver, 0);
 }
 
 static void gsc_hpdi_pci_remove(struct pci_dev *dev)
diff --git a/drivers/staging/comedi/drivers/icp_multi.c b/drivers/staging/comedi/drivers/icp_multi.c
index a91a448..053a47d 100644
--- a/drivers/staging/comedi/drivers/icp_multi.c
+++ b/drivers/staging/comedi/drivers/icp_multi.c
@@ -620,7 +620,7 @@ static struct comedi_driver icp_multi_driver = {
 static int icp_multi_pci_probe(struct pci_dev *dev,
 					   const struct pci_device_id *ent)
 {
-	return comedi_pci_auto_config(dev, &icp_multi_driver);
+	return comedi_pci_auto_config(dev, &icp_multi_driver, 0);
 }
 
 static void icp_multi_pci_remove(struct pci_dev *dev)
diff --git a/drivers/staging/comedi/drivers/jr3_pci.c b/drivers/staging/comedi/drivers/jr3_pci.c
index c756a35..982d67e 100644
--- a/drivers/staging/comedi/drivers/jr3_pci.c
+++ b/drivers/staging/comedi/drivers/jr3_pci.c
@@ -841,7 +841,7 @@ static struct comedi_driver jr3_pci_driver = {
 static int jr3_pci_pci_probe(struct pci_dev *dev,
 				       const struct pci_device_id *ent)
 {
-	return comedi_pci_auto_config(dev, &jr3_pci_driver);
+	return comedi_pci_auto_config(dev, &jr3_pci_driver, 0);
 }
 
 static void jr3_pci_pci_remove(struct pci_dev *dev)
diff --git a/drivers/staging/comedi/drivers/ke_counter.c b/drivers/staging/comedi/drivers/ke_counter.c
index 19c9428..51df896 100644
--- a/drivers/staging/comedi/drivers/ke_counter.c
+++ b/drivers/staging/comedi/drivers/ke_counter.c
@@ -149,7 +149,7 @@ static struct comedi_driver ke_counter_driver = {
 static int ke_counter_pci_probe(struct pci_dev *dev,
 					  const struct pci_device_id *ent)
 {
-	return comedi_pci_auto_config(dev, &ke_counter_driver);
+	return comedi_pci_auto_config(dev, &ke_counter_driver, 0);
 }
 
 static void ke_counter_pci_remove(struct pci_dev *dev)
diff --git a/drivers/staging/comedi/drivers/me4000.c b/drivers/staging/comedi/drivers/me4000.c
index 3c4b022..c53a646 100644
--- a/drivers/staging/comedi/drivers/me4000.c
+++ b/drivers/staging/comedi/drivers/me4000.c
@@ -1731,7 +1731,7 @@ static struct comedi_driver me4000_driver = {
 static int me4000_pci_probe(struct pci_dev *dev,
 				      const struct pci_device_id *ent)
 {
-	return comedi_pci_auto_config(dev, &me4000_driver);
+	return comedi_pci_auto_config(dev, &me4000_driver, 0);
 }
 
 static void me4000_pci_remove(struct pci_dev *dev)
diff --git a/drivers/staging/comedi/drivers/me_daq.c b/drivers/staging/comedi/drivers/me_daq.c
index ce8e3d3..8314500 100644
--- a/drivers/staging/comedi/drivers/me_daq.c
+++ b/drivers/staging/comedi/drivers/me_daq.c
@@ -616,7 +616,7 @@ static struct comedi_driver me_daq_driver = {
 static int me_daq_pci_probe(struct pci_dev *dev,
 				      const struct pci_device_id *ent)
 {
-	return comedi_pci_auto_config(dev, &me_daq_driver);
+	return comedi_pci_auto_config(dev, &me_daq_driver, 0);
 }
 
 static void me_daq_pci_remove(struct pci_dev *dev)
diff --git a/drivers/staging/comedi/drivers/ni_6527.c b/drivers/staging/comedi/drivers/ni_6527.c
index 5196b460..8bb32e1 100644
--- a/drivers/staging/comedi/drivers/ni_6527.c
+++ b/drivers/staging/comedi/drivers/ni_6527.c
@@ -449,7 +449,7 @@ static struct comedi_driver ni6527_driver = {
 static int ni6527_pci_probe(struct pci_dev *dev,
 				      const struct pci_device_id *ent)
 {
-	return comedi_pci_auto_config(dev, &ni6527_driver);
+	return comedi_pci_auto_config(dev, &ni6527_driver, 0);
 }
 
 static void ni6527_pci_remove(struct pci_dev *dev)
diff --git a/drivers/staging/comedi/drivers/ni_65xx.c b/drivers/staging/comedi/drivers/ni_65xx.c
index 2fb4b77..2e06bee 100644
--- a/drivers/staging/comedi/drivers/ni_65xx.c
+++ b/drivers/staging/comedi/drivers/ni_65xx.c
@@ -784,7 +784,7 @@ static struct comedi_driver ni_65xx_driver = {
 static int ni_65xx_pci_probe(struct pci_dev *dev,
 				       const struct pci_device_id *ent)
 {
-	return comedi_pci_auto_config(dev, &ni_65xx_driver);
+	return comedi_pci_auto_config(dev, &ni_65xx_driver, 0);
 }
 
 static void ni_65xx_pci_remove(struct pci_dev *dev)
diff --git a/drivers/staging/comedi/drivers/ni_660x.c b/drivers/staging/comedi/drivers/ni_660x.c
index 26baf9c..46647b3 100644
--- a/drivers/staging/comedi/drivers/ni_660x.c
+++ b/drivers/staging/comedi/drivers/ni_660x.c
@@ -1324,7 +1324,7 @@ static struct comedi_driver ni_660x_driver = {
 static int ni_660x_pci_probe(struct pci_dev *dev,
 				       const struct pci_device_id *ent)
 {
-	return comedi_pci_auto_config(dev, &ni_660x_driver);
+	return comedi_pci_auto_config(dev, &ni_660x_driver, 0);
 }
 
 static void ni_660x_pci_remove(struct pci_dev *dev)
diff --git a/drivers/staging/comedi/drivers/ni_670x.c b/drivers/staging/comedi/drivers/ni_670x.c
index 272caeb..85fb91c 100644
--- a/drivers/staging/comedi/drivers/ni_670x.c
+++ b/drivers/staging/comedi/drivers/ni_670x.c
@@ -306,7 +306,7 @@ static struct comedi_driver ni_670x_driver = {
 static int ni_670x_pci_probe(struct pci_dev *dev,
 				       const struct pci_device_id *ent)
 {
-	return comedi_pci_auto_config(dev, &ni_670x_driver);
+	return comedi_pci_auto_config(dev, &ni_670x_driver, 0);
 }
 
 static void ni_670x_pci_remove(struct pci_dev *dev)
diff --git a/drivers/staging/comedi/drivers/ni_labpc.c b/drivers/staging/comedi/drivers/ni_labpc.c
index d29c4d7..547e2c4 100644
--- a/drivers/staging/comedi/drivers/ni_labpc.c
+++ b/drivers/staging/comedi/drivers/ni_labpc.c
@@ -2113,7 +2113,7 @@ MODULE_DEVICE_TABLE(pci, labpc_pci_table);
 static int labpc_pci_probe(struct pci_dev *dev,
 				     const struct pci_device_id *ent)
 {
-	return comedi_pci_auto_config(dev, &labpc_driver);
+	return comedi_pci_auto_config(dev, &labpc_driver, 0);
 }
 
 static void labpc_pci_remove(struct pci_dev *dev)
diff --git a/drivers/staging/comedi/drivers/ni_pcidio.c b/drivers/staging/comedi/drivers/ni_pcidio.c
index 084ebea..e5f7a59 100644
--- a/drivers/staging/comedi/drivers/ni_pcidio.c
+++ b/drivers/staging/comedi/drivers/ni_pcidio.c
@@ -1221,7 +1221,7 @@ static struct comedi_driver ni_pcidio_driver = {
 static int ni_pcidio_pci_probe(struct pci_dev *dev,
 					 const struct pci_device_id *ent)
 {
-	return comedi_pci_auto_config(dev, &ni_pcidio_driver);
+	return comedi_pci_auto_config(dev, &ni_pcidio_driver, 0);
 }
 
 static void ni_pcidio_pci_remove(struct pci_dev *dev)
diff --git a/drivers/staging/comedi/drivers/ni_pcimio.c b/drivers/staging/comedi/drivers/ni_pcimio.c
index aaac0b2..ab07622 100644
--- a/drivers/staging/comedi/drivers/ni_pcimio.c
+++ b/drivers/staging/comedi/drivers/ni_pcimio.c
@@ -1788,7 +1788,7 @@ static struct comedi_driver ni_pcimio_driver = {
 static int ni_pcimio_pci_probe(struct pci_dev *dev,
 					 const struct pci_device_id *ent)
 {
-	return comedi_pci_auto_config(dev, &ni_pcimio_driver);
+	return comedi_pci_auto_config(dev, &ni_pcimio_driver, 0);
 }
 
 static void ni_pcimio_pci_remove(struct pci_dev *dev)
diff --git a/drivers/staging/comedi/drivers/rtd520.c b/drivers/staging/comedi/drivers/rtd520.c
index 8d7c948..756311f3 100644
--- a/drivers/staging/comedi/drivers/rtd520.c
+++ b/drivers/staging/comedi/drivers/rtd520.c
@@ -1417,7 +1417,7 @@ static struct comedi_driver rtd520_driver = {
 static int rtd520_pci_probe(struct pci_dev *dev,
 				      const struct pci_device_id *ent)
 {
-	return comedi_pci_auto_config(dev, &rtd520_driver);
+	return comedi_pci_auto_config(dev, &rtd520_driver, 0);
 }
 
 static void rtd520_pci_remove(struct pci_dev *dev)
diff --git a/drivers/staging/comedi/drivers/s626.c b/drivers/staging/comedi/drivers/s626.c
index 6dc1d28..853eb1e 100644
--- a/drivers/staging/comedi/drivers/s626.c
+++ b/drivers/staging/comedi/drivers/s626.c
@@ -2833,7 +2833,7 @@ static struct comedi_driver s626_driver = {
 static int s626_pci_probe(struct pci_dev *dev,
 				    const struct pci_device_id *ent)
 {
-	return comedi_pci_auto_config(dev, &s626_driver);
+	return comedi_pci_auto_config(dev, &s626_driver, 0);
 }
 
 static void s626_pci_remove(struct pci_dev *dev)
diff --git a/drivers/staging/comedi/drivers/skel.c b/drivers/staging/comedi/drivers/skel.c
index e2d7970..436bb93 100644
--- a/drivers/staging/comedi/drivers/skel.c
+++ b/drivers/staging/comedi/drivers/skel.c
@@ -704,7 +704,7 @@ MODULE_DEVICE_TABLE(pci, skel_pci_table);
 static int skel_pci_probe(struct pci_dev *dev,
 					   const struct pci_device_id *ent)
 {
-	return comedi_pci_auto_config(dev, &skel_driver);
+	return comedi_pci_auto_config(dev, &skel_driver, 0);
 }
 
 static void skel_pci_remove(struct pci_dev *dev)
diff --git a/drivers/staging/comedi/drivers/usbdux.c b/drivers/staging/comedi/drivers/usbdux.c
index 78f3a2e..5d8de59 100644
--- 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 4e19f61..0f6187f 100644
--- 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 cdd279b..dc6b017 100644
--- 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 609dc69..f0beaf4 100644
--- a/drivers/staging/comedi/drivers/vmk80xx.c
+++ b/drivers/staging/comedi/drivers/vmk80xx.c
@@ -1392,7 +1392,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, 0);
 
 	return 0;
 error:
-- 
1.8.0




More information about the devel mailing list