staging: comedi: comedi_pci: change the comedi_pci_auto_config() 'context'

The comedi_pci_auto_config() function is used to allow the PCI driver
(*probe) function to automatically call the comedi driver (*auto_attach).
This allows the comedi driver to be part of the PnP process when the
PCI device is detected.

Currently the comedi_pci_auto_config() always passes a 'context' of '0'
to comedi_auto_config(). This makes the 'context' a bit useless.

Modify comedi_pci_auto_config() to allow the comedi pci drivers to pass
a 'context' from the PCI driver.

Make all the comedi pci drivers pass the pci_device_id 'driver_data' as
the 'context'. Since none of the comedi pci drivers currently set the
'driver_data' the 'context' will still be '0'.

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_pci.c b/drivers/staging/comedi/comedi_pci.c
index 37d2e467736038e3a9be94d58e141321da74e59e..bf5095601e0021658c227df2f7130352327bac10 100644 (file)
--- a/drivers/staging/comedi/comedi_pci.c
+++ b/drivers/staging/comedi/comedi_pci.c
@@ -72,13 +72,15 @@ EXPORT_SYMBOL_GPL(comedi_pci_disable);
  * comedi_pci_auto_config() - Configure/probe a comedi PCI driver.
  * @pcidev: pci_dev struct
  * @driver: comedi_driver struct
+ * @context: driver specific data, passed to comedi_auto_config()
  *
  * Typically called from the pci_driver (*probe) function.
  */
 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);
 }
 EXPORT_SYMBOL_GPL(comedi_pci_auto_config);
 

diff --git a/drivers/staging/comedi/comedidev.h b/drivers/staging/comedi/comedidev.h
index f3a990b45df5f9dce3f564c4f475016af87f44d1..b8e5d091fff881ca6a56d52be13d8ce79c218635 100644 (file)
--- a/drivers/staging/comedi/comedidev.h
+++ b/drivers/staging/comedi/comedidev.h
@@ -387,7 +387,8 @@ struct pci_dev *comedi_to_pci_dev(struct comedi_device *);
 int comedi_pci_enable(struct pci_dev *, const char *);
 void comedi_pci_disable(struct pci_dev *);
 
-int comedi_pci_auto_config(struct pci_dev *, struct comedi_driver *);
+int comedi_pci_auto_config(struct pci_dev *, struct comedi_driver *,
+                          unsigned long context);
 void comedi_pci_auto_unconfig(struct pci_dev *);
 
 int comedi_pci_driver_register(struct comedi_driver *, struct pci_driver *);

diff --git a/drivers/staging/comedi/drivers/8255_pci.c b/drivers/staging/comedi/drivers/8255_pci.c
index 0ae356ae56ea3b3937e1ee3599063b2790c2460c..fa144e304f06c770c5e2f74d28cd3d3169ad3685 100644 (file)
--- a/drivers/staging/comedi/drivers/8255_pci.c
+++ b/drivers/staging/comedi/drivers/8255_pci.c
@@ -311,9 +311,9 @@ static struct comedi_driver pci_8255_driver = {
 };
 
 static int pci_8255_pci_probe(struct pci_dev *dev,
-                                       const struct pci_device_id *ent)
+                             const struct pci_device_id *id)
 {
-       return comedi_pci_auto_config(dev, &pci_8255_driver);
+       return comedi_pci_auto_config(dev, &pci_8255_driver, id->driver_data);
 }
 
 static DEFINE_PCI_DEVICE_TABLE(pci_8255_pci_table) = {

diff --git a/drivers/staging/comedi/drivers/addi_apci_035.c b/drivers/staging/comedi/drivers/addi_apci_035.c
index 5a53e58258a08616aafc1962aa9519f22be06752..ea6ddb3d06a3012718e83f5ecea993b7e11bd49b 100644 (file)
--- a/drivers/staging/comedi/drivers/addi_apci_035.c
+++ b/drivers/staging/comedi/drivers/addi_apci_035.c
@@ -50,9 +50,9 @@ static struct comedi_driver apci035_driver = {
 };
 
 static int apci035_pci_probe(struct pci_dev *dev,
-                                      const struct pci_device_id *ent)
+                            const struct pci_device_id *id)
 {
-       return comedi_pci_auto_config(dev, &apci035_driver);
+       return comedi_pci_auto_config(dev, &apci035_driver, id->driver_data);
 }
 
 static DEFINE_PCI_DEVICE_TABLE(apci035_pci_table) = {

diff --git a/drivers/staging/comedi/drivers/addi_apci_1032.c b/drivers/staging/comedi/drivers/addi_apci_1032.c
index c0d0429c35c8faac7e8b1a9616dac49a8554cf80..fdd053c61a63b1b83f827b6e761bc06cb2049a10 100644 (file)
--- a/drivers/staging/comedi/drivers/addi_apci_1032.c
+++ b/drivers/staging/comedi/drivers/addi_apci_1032.c
@@ -373,9 +373,9 @@ static struct comedi_driver apci1032_driver = {
 };
 
 static int apci1032_pci_probe(struct pci_dev *dev,
-                                       const struct pci_device_id *ent)
+                             const struct pci_device_id *id)
 {
-       return comedi_pci_auto_config(dev, &apci1032_driver);
+       return comedi_pci_auto_config(dev, &apci1032_driver, id->driver_data);
 }
 
 static DEFINE_PCI_DEVICE_TABLE(apci1032_pci_table) = {

diff --git a/drivers/staging/comedi/drivers/addi_apci_1500.c b/drivers/staging/comedi/drivers/addi_apci_1500.c
index 9c2f8eeb7977b1e62628a7e1058b14507a5df9d2..c945a2aef9e3f92a6c577b2e67e98ef8190c9613 100644 (file)
--- a/drivers/staging/comedi/drivers/addi_apci_1500.c
+++ b/drivers/staging/comedi/drivers/addi_apci_1500.c
@@ -50,9 +50,9 @@ static struct comedi_driver apci1500_driver = {
 };
 
 static int apci1500_pci_probe(struct pci_dev *dev,
-                                       const struct pci_device_id *ent)
+                             const struct pci_device_id *id)
 {
-       return comedi_pci_auto_config(dev, &apci1500_driver);
+       return comedi_pci_auto_config(dev, &apci1500_driver, id->driver_data);
 }
 
 static DEFINE_PCI_DEVICE_TABLE(apci1500_pci_table) = {

diff --git a/drivers/staging/comedi/drivers/addi_apci_1516.c b/drivers/staging/comedi/drivers/addi_apci_1516.c
index 69e3996384196669bc5c057e51f3dd1ad87544c8..df8f8ea243ffb306f55bf0675c0025253f4bd6e3 100644 (file)
--- a/drivers/staging/comedi/drivers/addi_apci_1516.c
+++ b/drivers/staging/comedi/drivers/addi_apci_1516.c
@@ -235,9 +235,9 @@ static struct comedi_driver apci1516_driver = {
 };
 
 static int apci1516_pci_probe(struct pci_dev *dev,
-                                       const struct pci_device_id *ent)
+                             const struct pci_device_id *id)
 {
-       return comedi_pci_auto_config(dev, &apci1516_driver);
+       return comedi_pci_auto_config(dev, &apci1516_driver, id->driver_data);
 }
 
 static DEFINE_PCI_DEVICE_TABLE(apci1516_pci_table) = {

diff --git a/drivers/staging/comedi/drivers/addi_apci_1564.c b/drivers/staging/comedi/drivers/addi_apci_1564.c
index ddea64df9180cc6934de9303f91bc24843d64925..b2b3bdbb9f30d3ff2238b0538258fbb530bcb309 100644 (file)
--- a/drivers/staging/comedi/drivers/addi_apci_1564.c
+++ b/drivers/staging/comedi/drivers/addi_apci_1564.c
@@ -47,9 +47,9 @@ static struct comedi_driver apci1564_driver = {
 };
 
 static int apci1564_pci_probe(struct pci_dev *dev,
-                                       const struct pci_device_id *ent)
+                             const struct pci_device_id *id)
 {
-       return comedi_pci_auto_config(dev, &apci1564_driver);
+       return comedi_pci_auto_config(dev, &apci1564_driver, id->driver_data);
 }
 
 static DEFINE_PCI_DEVICE_TABLE(apci1564_pci_table) = {

diff --git a/drivers/staging/comedi/drivers/addi_apci_16xx.c b/drivers/staging/comedi/drivers/addi_apci_16xx.c
index e51f80001363dff438adaae4d0c9262f0cb50e11..12ff76a73d8a2030e398df3564fd0c66fe92efdc 100644 (file)
--- a/drivers/staging/comedi/drivers/addi_apci_16xx.c
+++ b/drivers/staging/comedi/drivers/addi_apci_16xx.c
@@ -225,9 +225,9 @@ static struct comedi_driver apci16xx_driver = {
 };
 
 static int apci16xx_pci_probe(struct pci_dev *dev,
-                                       const struct pci_device_id *ent)
+                             const struct pci_device_id *id)
 {
-       return comedi_pci_auto_config(dev, &apci16xx_driver);
+       return comedi_pci_auto_config(dev, &apci16xx_driver, id->driver_data);
 }
 
 static DEFINE_PCI_DEVICE_TABLE(apci16xx_pci_table) = {

diff --git a/drivers/staging/comedi/drivers/addi_apci_1710.c b/drivers/staging/comedi/drivers/addi_apci_1710.c
index e83e829831b006316fab913db848c9199f4f9c04..f32a79a2afcacecbeb861183ea7accca317f15d0 100644 (file)
--- a/drivers/staging/comedi/drivers/addi_apci_1710.c
+++ b/drivers/staging/comedi/drivers/addi_apci_1710.c
@@ -125,9 +125,9 @@ static struct comedi_driver apci1710_driver = {
 };
 
 static int apci1710_pci_probe(struct pci_dev *dev,
-                                       const struct pci_device_id *ent)
+                             const struct pci_device_id *id)
 {
-       return comedi_pci_auto_config(dev, &apci1710_driver);
+       return comedi_pci_auto_config(dev, &apci1710_driver, id->driver_data);
 }
 
 static DEFINE_PCI_DEVICE_TABLE(apci1710_pci_table) = {

diff --git a/drivers/staging/comedi/drivers/addi_apci_2032.c b/drivers/staging/comedi/drivers/addi_apci_2032.c
index 9ce1d26aff2fd67fabc147862c57e47f568a2469..4a33b3502f401ef0b09d816d2d731129556dd8d6 100644 (file)
--- a/drivers/staging/comedi/drivers/addi_apci_2032.c
+++ b/drivers/staging/comedi/drivers/addi_apci_2032.c
@@ -374,9 +374,9 @@ static struct comedi_driver apci2032_driver = {
 };
 
 static int apci2032_pci_probe(struct pci_dev *dev,
-                                       const struct pci_device_id *ent)
+                             const struct pci_device_id *id)
 {
-       return comedi_pci_auto_config(dev, &apci2032_driver);
+       return comedi_pci_auto_config(dev, &apci2032_driver, id->driver_data);
 }
 
 static DEFINE_PCI_DEVICE_TABLE(apci2032_pci_table) = {

diff --git a/drivers/staging/comedi/drivers/addi_apci_2200.c b/drivers/staging/comedi/drivers/addi_apci_2200.c
index b1c4226902e14c4376ae467b83982a67d1b4086a..48afa2316497edc88682ebfec4fdd75e2e72e1e1 100644 (file)
--- a/drivers/staging/comedi/drivers/addi_apci_2200.c
+++ b/drivers/staging/comedi/drivers/addi_apci_2200.c
@@ -150,9 +150,9 @@ static struct comedi_driver apci2200_driver = {
 };
 
 static int apci2200_pci_probe(struct pci_dev *dev,
-                                       const struct pci_device_id *ent)
+                             const struct pci_device_id *id)
 {
-       return comedi_pci_auto_config(dev, &apci2200_driver);
+       return comedi_pci_auto_config(dev, &apci2200_driver, id->driver_data);
 }
 
 static DEFINE_PCI_DEVICE_TABLE(apci2200_pci_table) = {

diff --git a/drivers/staging/comedi/drivers/addi_apci_3120.c b/drivers/staging/comedi/drivers/addi_apci_3120.c
index 917234d24e9929c7c9c055cf896288d770152111..6ecdaab7758512787fcfb5a36a0ff7c592153146 100644 (file)
--- a/drivers/staging/comedi/drivers/addi_apci_3120.c
+++ b/drivers/staging/comedi/drivers/addi_apci_3120.c
@@ -248,9 +248,9 @@ static struct comedi_driver apci3120_driver = {
 };
 
 static int apci3120_pci_probe(struct pci_dev *dev,
-                                       const struct pci_device_id *ent)
+                             const struct pci_device_id *id)
 {
-       return comedi_pci_auto_config(dev, &apci3120_driver);
+       return comedi_pci_auto_config(dev, &apci3120_driver, id->driver_data);
 }
 
 static DEFINE_PCI_DEVICE_TABLE(apci3120_pci_table) = {

diff --git a/drivers/staging/comedi/drivers/addi_apci_3200.c b/drivers/staging/comedi/drivers/addi_apci_3200.c
index 90ee4f844f914a2884520ca209b174bf4a886054..a28bcbdffe079f967140a888d67b08266e7b47b0 100644 (file)
--- a/drivers/staging/comedi/drivers/addi_apci_3200.c
+++ b/drivers/staging/comedi/drivers/addi_apci_3200.c
@@ -103,9 +103,9 @@ static struct comedi_driver apci3200_driver = {
 };
 
 static int apci3200_pci_probe(struct pci_dev *dev,
-                                       const struct pci_device_id *ent)
+                             const struct pci_device_id *id)
 {
-       return comedi_pci_auto_config(dev, &apci3200_driver);
+       return comedi_pci_auto_config(dev, &apci3200_driver, id->driver_data);
 }
 
 static struct pci_driver apci3200_pci_driver = {

diff --git a/drivers/staging/comedi/drivers/addi_apci_3501.c b/drivers/staging/comedi/drivers/addi_apci_3501.c
index 786fcaf82c324ef428e5721ce34348df9885b22f..ecd54ea6f8de0e353054e7ce6c299d077d10d344 100644 (file)
--- a/drivers/staging/comedi/drivers/addi_apci_3501.c
+++ b/drivers/staging/comedi/drivers/addi_apci_3501.c
@@ -443,9 +443,9 @@ static struct comedi_driver apci3501_driver = {
 };
 
 static int apci3501_pci_probe(struct pci_dev *dev,
-                                       const struct pci_device_id *ent)
+                             const struct pci_device_id *id)
 {
-       return comedi_pci_auto_config(dev, &apci3501_driver);
+       return comedi_pci_auto_config(dev, &apci3501_driver, id->driver_data);
 }
 
 static DEFINE_PCI_DEVICE_TABLE(apci3501_pci_table) = {

diff --git a/drivers/staging/comedi/drivers/addi_apci_3xxx.c b/drivers/staging/comedi/drivers/addi_apci_3xxx.c
index 09d4b21fce23703f034be264404cfa1f8ca583ec..96ec65b2678edd49ad3882977327bf9d1ce3ed8b 100644 (file)
--- a/drivers/staging/comedi/drivers/addi_apci_3xxx.c
+++ b/drivers/staging/comedi/drivers/addi_apci_3xxx.c
@@ -748,9 +748,9 @@ static struct comedi_driver apci3xxx_driver = {
 };
 
 static int apci3xxx_pci_probe(struct pci_dev *dev,
-                                       const struct pci_device_id *ent)
+                             const struct pci_device_id *id)
 {
-       return comedi_pci_auto_config(dev, &apci3xxx_driver);
+       return comedi_pci_auto_config(dev, &apci3xxx_driver, id->driver_data);
 }
 
 static DEFINE_PCI_DEVICE_TABLE(apci3xxx_pci_table) = {

diff --git a/drivers/staging/comedi/drivers/adl_pci6208.c b/drivers/staging/comedi/drivers/adl_pci6208.c
index 7b3e331616ed13866cb7f3af5a7573fcf156369a..b8f0efcec0f708b66f388611ff1d8cc692d4b088 100644 (file)
--- a/drivers/staging/comedi/drivers/adl_pci6208.c
+++ b/drivers/staging/comedi/drivers/adl_pci6208.c
@@ -267,9 +267,10 @@ static struct comedi_driver adl_pci6208_driver = {
 };
 
 static int adl_pci6208_pci_probe(struct pci_dev *dev,
-                                          const struct pci_device_id *ent)
+                                const struct pci_device_id *id)
 {
-       return comedi_pci_auto_config(dev, &adl_pci6208_driver);
+       return comedi_pci_auto_config(dev, &adl_pci6208_driver,
+                                     id->driver_data);
 }
 
 static DEFINE_PCI_DEVICE_TABLE(adl_pci6208_pci_table) = {

diff --git a/drivers/staging/comedi/drivers/adl_pci7x3x.c b/drivers/staging/comedi/drivers/adl_pci7x3x.c
index f27f48e6e70231cdff244a51c98e7fb7e62e52c6..b8dd161136aaa941fac9963a6c2ea69de07375ff 100644 (file)
--- a/drivers/staging/comedi/drivers/adl_pci7x3x.c
+++ b/drivers/staging/comedi/drivers/adl_pci7x3x.c
@@ -293,9 +293,10 @@ static struct comedi_driver adl_pci7x3x_driver = {
 };
 
 static int adl_pci7x3x_pci_probe(struct pci_dev *dev,
-                                          const struct pci_device_id *ent)
+                                const struct pci_device_id *id)
 {
-       return comedi_pci_auto_config(dev, &adl_pci7x3x_driver);
+       return comedi_pci_auto_config(dev, &adl_pci7x3x_driver,
+                                     id->driver_data);
 }
 
 static DEFINE_PCI_DEVICE_TABLE(adl_pci7x3x_pci_table) = {

diff --git a/drivers/staging/comedi/drivers/adl_pci8164.c b/drivers/staging/comedi/drivers/adl_pci8164.c
index d06b83f38653ba3a981559c98977be386acc027b..4126f733d34d7ab156528b5d3d6ae59050fe5af3 100644 (file)
--- a/drivers/staging/comedi/drivers/adl_pci8164.c
+++ b/drivers/staging/comedi/drivers/adl_pci8164.c
@@ -295,9 +295,10 @@ static struct comedi_driver adl_pci8164_driver = {
 };
 
 static int adl_pci8164_pci_probe(struct pci_dev *dev,
-                                          const struct pci_device_id *ent)
+                                const struct pci_device_id *id)
 {
-       return comedi_pci_auto_config(dev, &adl_pci8164_driver);
+       return comedi_pci_auto_config(dev, &adl_pci8164_driver,
+                                     id->driver_data);
 }
 
 static DEFINE_PCI_DEVICE_TABLE(adl_pci8164_pci_table) = {

diff --git a/drivers/staging/comedi/drivers/adl_pci9111.c b/drivers/staging/comedi/drivers/adl_pci9111.c
index eeb10ec7f178ed02728bc3f75403cb17dfe59829..8680cf18b7def34c749c4060143dece72a58dddf 100644 (file)
--- a/drivers/staging/comedi/drivers/adl_pci9111.c
+++ b/drivers/staging/comedi/drivers/adl_pci9111.c
@@ -959,9 +959,10 @@ static struct comedi_driver adl_pci9111_driver = {
 };
 
 static int pci9111_pci_probe(struct pci_dev *dev,
-                                      const struct pci_device_id *ent)
+                            const struct pci_device_id *id)
 {
-       return comedi_pci_auto_config(dev, &adl_pci9111_driver);
+       return comedi_pci_auto_config(dev, &adl_pci9111_driver,
+                                     id->driver_data);
 }
 
 static DEFINE_PCI_DEVICE_TABLE(pci9111_pci_table) = {

diff --git a/drivers/staging/comedi/drivers/adl_pci9118.c b/drivers/staging/comedi/drivers/adl_pci9118.c
index 4dbac7459a4890b6c75350bac4943d30b848855c..a0277a83115d07879dcf99dca0cd6445abf77d33 100644 (file)
--- a/drivers/staging/comedi/drivers/adl_pci9118.c
+++ b/drivers/staging/comedi/drivers/adl_pci9118.c
@@ -2222,9 +2222,10 @@ static struct comedi_driver adl_pci9118_driver = {
 };
 
 static int adl_pci9118_pci_probe(struct pci_dev *dev,
-                                          const struct pci_device_id *ent)
+                                const struct pci_device_id *id)
 {
-       return comedi_pci_auto_config(dev, &adl_pci9118_driver);
+       return comedi_pci_auto_config(dev, &adl_pci9118_driver,
+                                     id->driver_data);
 }
 
 static DEFINE_PCI_DEVICE_TABLE(adl_pci9118_pci_table) = {

diff --git a/drivers/staging/comedi/drivers/adv_pci1710.c b/drivers/staging/comedi/drivers/adv_pci1710.c
index 3d788c76d6484964af503e9e96788c1b8590efc9..7f04f8bae9871003d55f6ab3fc62ffa1e1a662aa 100644 (file)
--- a/drivers/staging/comedi/drivers/adv_pci1710.c
+++ b/drivers/staging/comedi/drivers/adv_pci1710.c
@@ -1398,9 +1398,10 @@ static struct comedi_driver adv_pci1710_driver = {
 };
 
 static int adv_pci1710_pci_probe(struct pci_dev *dev,
-                                          const struct pci_device_id *ent)
+                                const struct pci_device_id *id)
 {
-       return comedi_pci_auto_config(dev, &adv_pci1710_driver);
+       return comedi_pci_auto_config(dev, &adv_pci1710_driver,
+                                     id->driver_data);
 }
 
 static DEFINE_PCI_DEVICE_TABLE(adv_pci1710_pci_table) = {

diff --git a/drivers/staging/comedi/drivers/adv_pci1723.c b/drivers/staging/comedi/drivers/adv_pci1723.c
index 02ce55a01d2a502b52fde17464fa682f79920303..bd95b1d4338a392f2d1088a03d96b295b75df796 100644 (file)
--- a/drivers/staging/comedi/drivers/adv_pci1723.c
+++ b/drivers/staging/comedi/drivers/adv_pci1723.c
@@ -324,9 +324,10 @@ static struct comedi_driver adv_pci1723_driver = {
 };
 
 static int adv_pci1723_pci_probe(struct pci_dev *dev,
-                                          const struct pci_device_id *ent)
+                                const struct pci_device_id *id)
 {
-       return comedi_pci_auto_config(dev, &adv_pci1723_driver);
+       return comedi_pci_auto_config(dev, &adv_pci1723_driver,
+                                     id->driver_data);
 }
 
 static DEFINE_PCI_DEVICE_TABLE(adv_pci1723_pci_table) = {

diff --git a/drivers/staging/comedi/drivers/adv_pci_dio.c b/drivers/staging/comedi/drivers/adv_pci_dio.c
index 338c43e716bae1fc7d504b7e86ee598974e9e11d..45e0b3719b8e90e5b206af4d2ac05cdbf28f688f 100644 (file)
--- a/drivers/staging/comedi/drivers/adv_pci_dio.c
+++ b/drivers/staging/comedi/drivers/adv_pci_dio.c
@@ -1202,9 +1202,10 @@ 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)
+                                const struct pci_device_id *id)
 {
-       return comedi_pci_auto_config(dev, &adv_pci_dio_driver);
+       return comedi_pci_auto_config(dev, &adv_pci_dio_driver,
+                                     id->driver_data);
 }
 
 static DEFINE_PCI_DEVICE_TABLE(adv_pci_dio_pci_table) = {

diff --git a/drivers/staging/comedi/drivers/amplc_dio200.c b/drivers/staging/comedi/drivers/amplc_dio200.c
index 7c53dea12c7670fa015b0bf2b5ff1782606b5c3e..82f80d563fbe308fa94a541f39c7c795b18d793c 100644 (file)
--- a/drivers/staging/comedi/drivers/amplc_dio200.c
+++ b/drivers/staging/comedi/drivers/amplc_dio200.c
@@ -2070,10 +2070,10 @@ static DEFINE_PCI_DEVICE_TABLE(dio200_pci_table) = {
 MODULE_DEVICE_TABLE(pci, dio200_pci_table);
 
 static int amplc_dio200_pci_probe(struct pci_dev *dev,
-                                                  const struct pci_device_id
-                                                  *ent)
+                                 const struct pci_device_id *id)
 {
-       return comedi_pci_auto_config(dev, &amplc_dio200_driver);
+       return comedi_pci_auto_config(dev, &amplc_dio200_driver,
+                                     id->driver_data);
 }
 
 static struct pci_driver amplc_dio200_pci_driver = {

diff --git a/drivers/staging/comedi/drivers/amplc_pc236.c b/drivers/staging/comedi/drivers/amplc_pc236.c
index 479e10fddd22e128115f1a5afdf24126c40cbb34..b6bba4d15a5ab5533ab60fb153a7a0fd52186710 100644 (file)
--- a/drivers/staging/comedi/drivers/amplc_pc236.c
+++ b/drivers/staging/comedi/drivers/amplc_pc236.c
@@ -610,9 +610,10 @@ static DEFINE_PCI_DEVICE_TABLE(pc236_pci_table) = {
 MODULE_DEVICE_TABLE(pci, pc236_pci_table);
 
 static int amplc_pc236_pci_probe(struct pci_dev *dev,
-                                          const struct pci_device_id *ent)
+                                const struct pci_device_id *id)
 {
-       return comedi_pci_auto_config(dev, &amplc_pc236_driver);
+       return comedi_pci_auto_config(dev, &amplc_pc236_driver,
+                                     id->driver_data);
 }
 
 static struct pci_driver amplc_pc236_pci_driver = {

diff --git a/drivers/staging/comedi/drivers/amplc_pc263.c b/drivers/staging/comedi/drivers/amplc_pc263.c
index 11c1f4764eacde047a9241755583541675a18575..e61d55679a77991004d27176440192392ae4f1e3 100644 (file)
--- a/drivers/staging/comedi/drivers/amplc_pc263.c
+++ b/drivers/staging/comedi/drivers/amplc_pc263.c
@@ -368,10 +368,10 @@ static DEFINE_PCI_DEVICE_TABLE(pc263_pci_table) = {
 MODULE_DEVICE_TABLE(pci, pc263_pci_table);
 
 static int amplc_pc263_pci_probe(struct pci_dev *dev,
-                                                 const struct pci_device_id
-                                                 *ent)
+                                const struct pci_device_id *id)
 {
-       return comedi_pci_auto_config(dev, &amplc_pc263_driver);
+       return comedi_pci_auto_config(dev, &amplc_pc263_driver,
+                                     id->driver_data);
 }
 
 static struct pci_driver amplc_pc263_pci_driver = {

diff --git a/drivers/staging/comedi/drivers/amplc_pci224.c b/drivers/staging/comedi/drivers/amplc_pci224.c
index c9da4cd74baac16aaec58d6213851157ec9f51e1..4a56468cb7baf3256bf04d4ed96a06fa4e4262de 100644 (file)
--- a/drivers/staging/comedi/drivers/amplc_pci224.c
+++ b/drivers/staging/comedi/drivers/amplc_pci224.c
@@ -1507,10 +1507,10 @@ static struct comedi_driver amplc_pci224_driver = {
 };
 
 static int amplc_pci224_pci_probe(struct pci_dev *dev,
-                                                  const struct pci_device_id
-                                                  *ent)
+                                 const struct pci_device_id *id)
 {
-       return comedi_pci_auto_config(dev, &amplc_pci224_driver);
+       return comedi_pci_auto_config(dev, &amplc_pci224_driver,
+                                     id->driver_data);
 }
 
 static DEFINE_PCI_DEVICE_TABLE(amplc_pci224_pci_table) = {

diff --git a/drivers/staging/comedi/drivers/amplc_pci230.c b/drivers/staging/comedi/drivers/amplc_pci230.c
index e2244c6e536bc27a65d95016f11da3411a576d57..70074b5121305bb6c24cbdc82e30616582055752 100644 (file)
--- a/drivers/staging/comedi/drivers/amplc_pci230.c
+++ b/drivers/staging/comedi/drivers/amplc_pci230.c
@@ -2859,9 +2859,10 @@ static struct comedi_driver amplc_pci230_driver = {
 };
 
 static int amplc_pci230_pci_probe(struct pci_dev *dev,
-                                           const struct pci_device_id *ent)
+                                 const struct pci_device_id *id)
 {
-       return comedi_pci_auto_config(dev, &amplc_pci230_driver);
+       return comedi_pci_auto_config(dev, &amplc_pci230_driver,
+                                     id->driver_data);
 }
 
 static DEFINE_PCI_DEVICE_TABLE(amplc_pci230_pci_table) = {

diff --git a/drivers/staging/comedi/drivers/cb_pcidas.c b/drivers/staging/comedi/drivers/cb_pcidas.c
index 79c72118a090bee6f9c96441eb204792e1f40bd0..425a5a18a787f5f1549f24f6a0566fcae7b67897 100644 (file)
--- a/drivers/staging/comedi/drivers/cb_pcidas.c
+++ b/drivers/staging/comedi/drivers/cb_pcidas.c
@@ -1629,9 +1629,10 @@ static struct comedi_driver cb_pcidas_driver = {
 };
 
 static int cb_pcidas_pci_probe(struct pci_dev *dev,
-                                        const struct pci_device_id *ent)
+                              const struct pci_device_id *id)
 {
-       return comedi_pci_auto_config(dev, &cb_pcidas_driver);
+       return comedi_pci_auto_config(dev, &cb_pcidas_driver,
+                                     id->driver_data);
 }
 
 static DEFINE_PCI_DEVICE_TABLE(cb_pcidas_pci_table) = {

diff --git a/drivers/staging/comedi/drivers/cb_pcidas64.c b/drivers/staging/comedi/drivers/cb_pcidas64.c
index 9f3112cb7a21108ad6c18ca2babd0045b491ecb3..c085e1d80d469ddf05d903c479d237b50bd318c8 100644 (file)
--- a/drivers/staging/comedi/drivers/cb_pcidas64.c
+++ b/drivers/staging/comedi/drivers/cb_pcidas64.c
@@ -4216,9 +4216,10 @@ static struct comedi_driver cb_pcidas64_driver = {
 };
 
 static int cb_pcidas64_pci_probe(struct pci_dev *dev,
-                                          const struct pci_device_id *ent)
+                                const struct pci_device_id *id)
 {
-       return comedi_pci_auto_config(dev, &cb_pcidas64_driver);
+       return comedi_pci_auto_config(dev, &cb_pcidas64_driver,
+                                     id->driver_data);
 }
 
 static DEFINE_PCI_DEVICE_TABLE(cb_pcidas64_pci_table) = {

diff --git a/drivers/staging/comedi/drivers/cb_pcidda.c b/drivers/staging/comedi/drivers/cb_pcidda.c
index e2cadc728455def81c67ed5cbf717d04d85ae29d..f00d85732d0d5d0ea6236caec6cdd115bb52ba72 100644 (file)
--- a/drivers/staging/comedi/drivers/cb_pcidda.c
+++ b/drivers/staging/comedi/drivers/cb_pcidda.c
@@ -435,9 +435,10 @@ static struct comedi_driver cb_pcidda_driver = {
 };
 
 static int cb_pcidda_pci_probe(struct pci_dev *dev,
-                                        const struct pci_device_id *ent)
+                              const struct pci_device_id *id)
 {
-       return comedi_pci_auto_config(dev, &cb_pcidda_driver);
+       return comedi_pci_auto_config(dev, &cb_pcidda_driver,
+                                     id->driver_data);
 }
 
 static DEFINE_PCI_DEVICE_TABLE(cb_pcidda_pci_table) = {

diff --git a/drivers/staging/comedi/drivers/cb_pcimdas.c b/drivers/staging/comedi/drivers/cb_pcimdas.c
index aae063ca85a0d6e93c7489a4e48ff91dc4a6a865..7d456ad2aad42e2218c05efb7680edd0d8c211b3 100644 (file)
--- a/drivers/staging/comedi/drivers/cb_pcimdas.c
+++ b/drivers/staging/comedi/drivers/cb_pcimdas.c
@@ -295,9 +295,10 @@ static struct comedi_driver cb_pcimdas_driver = {
 };
 
 static int cb_pcimdas_pci_probe(struct pci_dev *dev,
-                                         const struct pci_device_id *ent)
+                               const struct pci_device_id *id)
 {
-       return comedi_pci_auto_config(dev, &cb_pcimdas_driver);
+       return comedi_pci_auto_config(dev, &cb_pcimdas_driver,
+                                     id->driver_data);
 }
 
 static DEFINE_PCI_DEVICE_TABLE(cb_pcimdas_pci_table) = {

diff --git a/drivers/staging/comedi/drivers/cb_pcimdda.c b/drivers/staging/comedi/drivers/cb_pcimdda.c
index 63cfbaf3a3fe7086992776f3ddb4c83060dc4fae..5db4f4ada4631b4980b22ca8a53abfa57f764709 100644 (file)
--- a/drivers/staging/comedi/drivers/cb_pcimdda.c
+++ b/drivers/staging/comedi/drivers/cb_pcimdda.c
@@ -219,9 +219,10 @@ static struct comedi_driver cb_pcimdda_driver = {
 };
 
 static int cb_pcimdda_pci_probe(struct pci_dev *dev,
-                                         const struct pci_device_id *ent)
+                               const struct pci_device_id *id)
 {
-       return comedi_pci_auto_config(dev, &cb_pcimdda_driver);
+       return comedi_pci_auto_config(dev, &cb_pcimdda_driver,
+                                     id->driver_data);
 }
 
 static DEFINE_PCI_DEVICE_TABLE(cb_pcimdda_pci_table) = {

diff --git a/drivers/staging/comedi/drivers/contec_pci_dio.c b/drivers/staging/comedi/drivers/contec_pci_dio.c
index 182dea669ef2a9e15ab394cd4628577410bf60c7..d6597445aae896f192b9958452e16f058da10a95 100644 (file)
--- a/drivers/staging/comedi/drivers/contec_pci_dio.c
+++ b/drivers/staging/comedi/drivers/contec_pci_dio.c
@@ -127,9 +127,10 @@ 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)
+                                   const struct pci_device_id *id)
 {
-       return comedi_pci_auto_config(dev, &contec_pci_dio_driver);
+       return comedi_pci_auto_config(dev, &contec_pci_dio_driver,
+                                     id->driver_data);
 }
 
 static DEFINE_PCI_DEVICE_TABLE(contec_pci_dio_pci_table) = {

diff --git a/drivers/staging/comedi/drivers/daqboard2000.c b/drivers/staging/comedi/drivers/daqboard2000.c
index 50b450f09c65af41008f4dd2485cada668371010..42e13e30d5027de3c69d8b2e9fde440c41c1cf8e 100644 (file)
--- a/drivers/staging/comedi/drivers/daqboard2000.c
+++ b/drivers/staging/comedi/drivers/daqboard2000.c
@@ -795,9 +795,10 @@ static struct comedi_driver daqboard2000_driver = {
 };
 
 static int daqboard2000_pci_probe(struct pci_dev *dev,
-                                           const struct pci_device_id *ent)
+                                 const struct pci_device_id *id)
 {
-       return comedi_pci_auto_config(dev, &daqboard2000_driver);
+       return comedi_pci_auto_config(dev, &daqboard2000_driver,
+                                     id->driver_data);
 }
 
 static DEFINE_PCI_DEVICE_TABLE(daqboard2000_pci_table) = {

diff --git a/drivers/staging/comedi/drivers/das08_pci.c b/drivers/staging/comedi/drivers/das08_pci.c
index c405876ddcf7e21d25d93c6de196592261e099e8..ecab0c4f70f2adc94675709d97a8b71b6b2121df 100644 (file)
--- a/drivers/staging/comedi/drivers/das08_pci.c
+++ b/drivers/staging/comedi/drivers/das08_pci.c
@@ -97,9 +97,10 @@ static struct comedi_driver das08_pci_comedi_driver = {
 };
 
 static int das08_pci_probe(struct pci_dev *dev,
-                          const struct pci_device_id *ent)
+                          const struct pci_device_id *id)
 {
-       return comedi_pci_auto_config(dev, &das08_pci_comedi_driver);
+       return comedi_pci_auto_config(dev, &das08_pci_comedi_driver,
+                                     id->driver_data);
 }
 
 static DEFINE_PCI_DEVICE_TABLE(das08_pci_table) = {

diff --git a/drivers/staging/comedi/drivers/dt3000.c b/drivers/staging/comedi/drivers/dt3000.c
index 3ce499fa5dbf775d8962e29efdd3e4bc9e5f5dc2..6862e7f8ed0481bf2971c71d67b835820e844c5c 100644 (file)
--- a/drivers/staging/comedi/drivers/dt3000.c
+++ b/drivers/staging/comedi/drivers/dt3000.c
@@ -853,9 +853,9 @@ static struct comedi_driver dt3000_driver = {
 };
 
 static int dt3000_pci_probe(struct pci_dev *dev,
-                                     const struct pci_device_id *ent)
+                           const struct pci_device_id *id)
 {
-       return comedi_pci_auto_config(dev, &dt3000_driver);
+       return comedi_pci_auto_config(dev, &dt3000_driver, id->driver_data);
 }
 
 static DEFINE_PCI_DEVICE_TABLE(dt3000_pci_table) = {

diff --git a/drivers/staging/comedi/drivers/dyna_pci10xx.c b/drivers/staging/comedi/drivers/dyna_pci10xx.c
index decc17f1867e495fe254f4c24b7c06e76a6314fe..58ff129a833904b811477ee3157f2d5c9e92fae2 100644 (file)
--- a/drivers/staging/comedi/drivers/dyna_pci10xx.c
+++ b/drivers/staging/comedi/drivers/dyna_pci10xx.c
@@ -273,9 +273,10 @@ static struct comedi_driver dyna_pci10xx_driver = {
 };
 
 static int dyna_pci10xx_pci_probe(struct pci_dev *dev,
-                                           const struct pci_device_id *ent)
+                                 const struct pci_device_id *id)
 {
-       return comedi_pci_auto_config(dev, &dyna_pci10xx_driver);
+       return comedi_pci_auto_config(dev, &dyna_pci10xx_driver,
+                                     id->driver_data);
 }
 
 static DEFINE_PCI_DEVICE_TABLE(dyna_pci10xx_pci_table) = {

diff --git a/drivers/staging/comedi/drivers/gsc_hpdi.c b/drivers/staging/comedi/drivers/gsc_hpdi.c
index b60c975626760d97a1cb5cd0bdace78f47ed63e7..a18d897606f8f48614d35ea5ccc6ff727246be8e 100644 (file)
--- a/drivers/staging/comedi/drivers/gsc_hpdi.c
+++ b/drivers/staging/comedi/drivers/gsc_hpdi.c
@@ -943,9 +943,9 @@ static struct comedi_driver gsc_hpdi_driver = {
 };
 
 static int gsc_hpdi_pci_probe(struct pci_dev *dev,
-                                       const struct pci_device_id *ent)
+                             const struct pci_device_id *id)
 {
-       return comedi_pci_auto_config(dev, &gsc_hpdi_driver);
+       return comedi_pci_auto_config(dev, &gsc_hpdi_driver, id->driver_data);
 }
 
 static DEFINE_PCI_DEVICE_TABLE(gsc_hpdi_pci_table) = {

diff --git a/drivers/staging/comedi/drivers/icp_multi.c b/drivers/staging/comedi/drivers/icp_multi.c
index 1e08f9141fadd09980f51d0f6b7e7aac533cb973..8722defde22f4af21ec1867857c0c705126a8247 100644 (file)
--- a/drivers/staging/comedi/drivers/icp_multi.c
+++ b/drivers/staging/comedi/drivers/icp_multi.c
@@ -618,9 +618,9 @@ static struct comedi_driver icp_multi_driver = {
 };
 
 static int icp_multi_pci_probe(struct pci_dev *dev,
-                                          const struct pci_device_id *ent)
+                              const struct pci_device_id *id)
 {
-       return comedi_pci_auto_config(dev, &icp_multi_driver);
+       return comedi_pci_auto_config(dev, &icp_multi_driver, id->driver_data);
 }
 
 static DEFINE_PCI_DEVICE_TABLE(icp_multi_pci_table) = {

diff --git a/drivers/staging/comedi/drivers/jr3_pci.c b/drivers/staging/comedi/drivers/jr3_pci.c
index 17ba75e0ab89260cdc9545843452a915b1579e85..aea940121c58aa622a25e04c96d77590530b3eb5 100644 (file)
--- a/drivers/staging/comedi/drivers/jr3_pci.c
+++ b/drivers/staging/comedi/drivers/jr3_pci.c
@@ -841,9 +841,9 @@ static struct comedi_driver jr3_pci_driver = {
 };
 
 static int jr3_pci_pci_probe(struct pci_dev *dev,
-                                      const struct pci_device_id *ent)
+                            const struct pci_device_id *id)
 {
-       return comedi_pci_auto_config(dev, &jr3_pci_driver);
+       return comedi_pci_auto_config(dev, &jr3_pci_driver, id->driver_data);
 }
 
 static DEFINE_PCI_DEVICE_TABLE(jr3_pci_pci_table) = {

diff --git a/drivers/staging/comedi/drivers/ke_counter.c b/drivers/staging/comedi/drivers/ke_counter.c
index 8c09c026508a228930576e58e3eeba4de9ba5d69..ac40e355dff2d5f69851ac35cd39a5b390c569c2 100644 (file)
--- a/drivers/staging/comedi/drivers/ke_counter.c
+++ b/drivers/staging/comedi/drivers/ke_counter.c
@@ -149,9 +149,10 @@ static struct comedi_driver ke_counter_driver = {
 };
 
 static int ke_counter_pci_probe(struct pci_dev *dev,
-                                         const struct pci_device_id *ent)
+                               const struct pci_device_id *id)
 {
-       return comedi_pci_auto_config(dev, &ke_counter_driver);
+       return comedi_pci_auto_config(dev, &ke_counter_driver,
+                                     id->driver_data);
 }
 
 static DEFINE_PCI_DEVICE_TABLE(ke_counter_pci_table) = {

diff --git a/drivers/staging/comedi/drivers/me4000.c b/drivers/staging/comedi/drivers/me4000.c
index b766bb93efd6f599f5ebc3c52ff375f0df9270c1..9f09e1969911f269cf55b00666ffb8889284f632 100644 (file)
--- a/drivers/staging/comedi/drivers/me4000.c
+++ b/drivers/staging/comedi/drivers/me4000.c
@@ -1730,9 +1730,9 @@ static struct comedi_driver me4000_driver = {
 };
 
 static int me4000_pci_probe(struct pci_dev *dev,
-                                     const struct pci_device_id *ent)
+                           const struct pci_device_id *id)
 {
-       return comedi_pci_auto_config(dev, &me4000_driver);
+       return comedi_pci_auto_config(dev, &me4000_driver, id->driver_data);
 }
 
 static DEFINE_PCI_DEVICE_TABLE(me4000_pci_table) = {

diff --git a/drivers/staging/comedi/drivers/me_daq.c b/drivers/staging/comedi/drivers/me_daq.c
index 06490ebc8cc802ea94574fcd0c53e2b496716db8..58ba9e322624e113c0286c9b066d7d46f7cbced4 100644 (file)
--- a/drivers/staging/comedi/drivers/me_daq.c
+++ b/drivers/staging/comedi/drivers/me_daq.c
@@ -616,9 +616,9 @@ static struct comedi_driver me_daq_driver = {
 };
 
 static int me_daq_pci_probe(struct pci_dev *dev,
-                                     const struct pci_device_id *ent)
+                           const struct pci_device_id *id)
 {
-       return comedi_pci_auto_config(dev, &me_daq_driver);
+       return comedi_pci_auto_config(dev, &me_daq_driver, id->driver_data);
 }
 
 static DEFINE_PCI_DEVICE_TABLE(me_daq_pci_table) = {

diff --git a/drivers/staging/comedi/drivers/ni_6527.c b/drivers/staging/comedi/drivers/ni_6527.c
index bcd4df290ec47913e422780972b261bac71300ab..507c1216461bd8e1cf500e9f76557f40c4e7b737 100644 (file)
--- a/drivers/staging/comedi/drivers/ni_6527.c
+++ b/drivers/staging/comedi/drivers/ni_6527.c
@@ -449,9 +449,9 @@ static struct comedi_driver ni6527_driver = {
 };
 
 static int ni6527_pci_probe(struct pci_dev *dev,
-                                     const struct pci_device_id *ent)
+                           const struct pci_device_id *id)
 {
-       return comedi_pci_auto_config(dev, &ni6527_driver);
+       return comedi_pci_auto_config(dev, &ni6527_driver, id->driver_data);
 }
 
 static struct pci_driver ni6527_pci_driver = {

diff --git a/drivers/staging/comedi/drivers/ni_65xx.c b/drivers/staging/comedi/drivers/ni_65xx.c
index bfa790ecf41d9fe7fbcab2b0797b5a6ef96c30ca..ded8d9e5d9ba215ab14dcee72f113fe5e5302b0d 100644 (file)
--- a/drivers/staging/comedi/drivers/ni_65xx.c
+++ b/drivers/staging/comedi/drivers/ni_65xx.c
@@ -785,9 +785,9 @@ static struct comedi_driver ni_65xx_driver = {
 };
 
 static int ni_65xx_pci_probe(struct pci_dev *dev,
-                                      const struct pci_device_id *ent)
+                            const struct pci_device_id *id)
 {
-       return comedi_pci_auto_config(dev, &ni_65xx_driver);
+       return comedi_pci_auto_config(dev, &ni_65xx_driver, id->driver_data);
 }
 
 static struct pci_driver ni_65xx_pci_driver = {

diff --git a/drivers/staging/comedi/drivers/ni_660x.c b/drivers/staging/comedi/drivers/ni_660x.c
index e46dd7a1a72453068b1883fd78b32e44124c7a6e..cf05d665ba9e264b8c25034adc14cd8d66412d19 100644 (file)
--- a/drivers/staging/comedi/drivers/ni_660x.c
+++ b/drivers/staging/comedi/drivers/ni_660x.c
@@ -1325,9 +1325,9 @@ static struct comedi_driver ni_660x_driver = {
 };
 
 static int ni_660x_pci_probe(struct pci_dev *dev,
-                                      const struct pci_device_id *ent)
+                            const struct pci_device_id *id)
 {
-       return comedi_pci_auto_config(dev, &ni_660x_driver);
+       return comedi_pci_auto_config(dev, &ni_660x_driver, id->driver_data);
 }
 
 static DEFINE_PCI_DEVICE_TABLE(ni_660x_pci_table) = {

diff --git a/drivers/staging/comedi/drivers/ni_670x.c b/drivers/staging/comedi/drivers/ni_670x.c
index 2faf86c83dc5be3190df82a04d50e738a5e5e557..e60e1ba358d6b4a7e09e3fbfbbdd4cc5abe27188 100644 (file)
--- a/drivers/staging/comedi/drivers/ni_670x.c
+++ b/drivers/staging/comedi/drivers/ni_670x.c
@@ -306,9 +306,9 @@ static struct comedi_driver ni_670x_driver = {
 };
 
 static int ni_670x_pci_probe(struct pci_dev *dev,
-                                      const struct pci_device_id *ent)
+                            const struct pci_device_id *id)
 {
-       return comedi_pci_auto_config(dev, &ni_670x_driver);
+       return comedi_pci_auto_config(dev, &ni_670x_driver, id->driver_data);
 }
 
 static DEFINE_PCI_DEVICE_TABLE(ni_670x_pci_table) = {

diff --git a/drivers/staging/comedi/drivers/ni_labpc.c b/drivers/staging/comedi/drivers/ni_labpc.c
index f957b8859b3d05873305e053a25cce3f8ed3aed7..d386c3e2b976f2fc585a6a498340e14d9d8f3599 100644 (file)
--- a/drivers/staging/comedi/drivers/ni_labpc.c
+++ b/drivers/staging/comedi/drivers/ni_labpc.c
@@ -2113,9 +2113,9 @@ static DEFINE_PCI_DEVICE_TABLE(labpc_pci_table) = {
 MODULE_DEVICE_TABLE(pci, labpc_pci_table);
 
 static int labpc_pci_probe(struct pci_dev *dev,
-                                    const struct pci_device_id *ent)
+                          const struct pci_device_id *id)
 {
-       return comedi_pci_auto_config(dev, &labpc_driver);
+       return comedi_pci_auto_config(dev, &labpc_driver, id->driver_data);
 }
 
 static struct pci_driver labpc_pci_driver = {

diff --git a/drivers/staging/comedi/drivers/ni_pcidio.c b/drivers/staging/comedi/drivers/ni_pcidio.c
index 0a00260d11f317a18ce85ef0e66bb7759b40bc7f..f4d3fab6f2d5aa19a7c5759755651451e1243f7d 100644 (file)
--- a/drivers/staging/comedi/drivers/ni_pcidio.c
+++ b/drivers/staging/comedi/drivers/ni_pcidio.c
@@ -1221,9 +1221,9 @@ static struct comedi_driver ni_pcidio_driver = {
 };
 
 static int ni_pcidio_pci_probe(struct pci_dev *dev,
-                                        const struct pci_device_id *ent)
+                              const struct pci_device_id *id)
 {
-       return comedi_pci_auto_config(dev, &ni_pcidio_driver);
+       return comedi_pci_auto_config(dev, &ni_pcidio_driver, id->driver_data);
 }
 
 static DEFINE_PCI_DEVICE_TABLE(ni_pcidio_pci_table) = {

diff --git a/drivers/staging/comedi/drivers/ni_pcimio.c b/drivers/staging/comedi/drivers/ni_pcimio.c
index 98b43f2fc65d4dae5511b8cee4490668d5922e71..e626ac046b7f9029d143f0d726160c16cf2770c6 100644 (file)
--- a/drivers/staging/comedi/drivers/ni_pcimio.c
+++ b/drivers/staging/comedi/drivers/ni_pcimio.c
@@ -1788,9 +1788,9 @@ static struct comedi_driver ni_pcimio_driver = {
 };
 
 static int ni_pcimio_pci_probe(struct pci_dev *dev,
-                                        const struct pci_device_id *ent)
+                              const struct pci_device_id *id)
 {
-       return comedi_pci_auto_config(dev, &ni_pcimio_driver);
+       return comedi_pci_auto_config(dev, &ni_pcimio_driver, id->driver_data);
 }
 
 static DEFINE_PCI_DEVICE_TABLE(ni_pcimio_pci_table) = {

diff --git a/drivers/staging/comedi/drivers/rtd520.c b/drivers/staging/comedi/drivers/rtd520.c
index 6a5c914fa50183be2a66ee00cd52dbbf3cdc36cb..8b72edf3cad15e862fe981ffe3aa90faea308595 100644 (file)
--- a/drivers/staging/comedi/drivers/rtd520.c
+++ b/drivers/staging/comedi/drivers/rtd520.c
@@ -1416,9 +1416,9 @@ static struct comedi_driver rtd520_driver = {
 };
 
 static int rtd520_pci_probe(struct pci_dev *dev,
-                                     const struct pci_device_id *ent)
+                           const struct pci_device_id *id)
 {
-       return comedi_pci_auto_config(dev, &rtd520_driver);
+       return comedi_pci_auto_config(dev, &rtd520_driver, id->driver_data);
 }
 
 static DEFINE_PCI_DEVICE_TABLE(rtd520_pci_table) = {

diff --git a/drivers/staging/comedi/drivers/s626.c b/drivers/staging/comedi/drivers/s626.c
index 81a1fe661579d365ff82dfac8c0de06b53045110..4fec6d6a04abbb96fb3031e1b240f386e50c3918 100644 (file)
--- a/drivers/staging/comedi/drivers/s626.c
+++ b/drivers/staging/comedi/drivers/s626.c
@@ -2832,9 +2832,9 @@ static struct comedi_driver s626_driver = {
 };
 
 static int s626_pci_probe(struct pci_dev *dev,
-                                   const struct pci_device_id *ent)
+                         const struct pci_device_id *id)
 {
-       return comedi_pci_auto_config(dev, &s626_driver);
+       return comedi_pci_auto_config(dev, &s626_driver, id->driver_data);
 }
 
 /*

diff --git a/drivers/staging/comedi/drivers/skel.c b/drivers/staging/comedi/drivers/skel.c
index cb83f6ae48b9630ecd0ec6793f259ed54506d0ae..8cedc4cf020cf55b50f2c34ac6d15baff5be6ae7 100644 (file)
--- a/drivers/staging/comedi/drivers/skel.c
+++ b/drivers/staging/comedi/drivers/skel.c
@@ -702,9 +702,9 @@ static DEFINE_PCI_DEVICE_TABLE(skel_pci_table) = {
 MODULE_DEVICE_TABLE(pci, skel_pci_table);
 
 static int skel_pci_probe(struct pci_dev *dev,
-                                          const struct pci_device_id *ent)
+                         const struct pci_device_id *id)
 {
-       return comedi_pci_auto_config(dev, &skel_driver);
+       return comedi_pci_auto_config(dev, &skel_driver, id->driver_data);
 }
 
 static struct pci_driver skel_pci_driver = {