[PATCH 01/49] staging: comedi: comedi_pci: change the comedi_pci_auto_config() 'context'
H Hartley Sweeten
hsweeten at visionengravers.com
Tue Mar 5 16:53:41 UTC 2013
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 at visionengravers.com>
Cc: Ian Abbott <abbotti at mev.co.uk>
Cc: Greg Kroah-Hartman <gregkh at linuxfoundation.org>
---
drivers/staging/comedi/comedi_pci.c | 6 ++++--
drivers/staging/comedi/comedidev.h | 3 ++-
drivers/staging/comedi/drivers/8255_pci.c | 4 ++--
drivers/staging/comedi/drivers/addi_apci_035.c | 4 ++--
drivers/staging/comedi/drivers/addi_apci_1032.c | 4 ++--
drivers/staging/comedi/drivers/addi_apci_1500.c | 4 ++--
drivers/staging/comedi/drivers/addi_apci_1516.c | 4 ++--
drivers/staging/comedi/drivers/addi_apci_1564.c | 4 ++--
drivers/staging/comedi/drivers/addi_apci_16xx.c | 4 ++--
drivers/staging/comedi/drivers/addi_apci_1710.c | 4 ++--
drivers/staging/comedi/drivers/addi_apci_2032.c | 4 ++--
drivers/staging/comedi/drivers/addi_apci_2200.c | 4 ++--
drivers/staging/comedi/drivers/addi_apci_3120.c | 4 ++--
drivers/staging/comedi/drivers/addi_apci_3200.c | 4 ++--
drivers/staging/comedi/drivers/addi_apci_3501.c | 4 ++--
drivers/staging/comedi/drivers/addi_apci_3xxx.c | 4 ++--
drivers/staging/comedi/drivers/adl_pci6208.c | 5 +++--
drivers/staging/comedi/drivers/adl_pci7x3x.c | 5 +++--
drivers/staging/comedi/drivers/adl_pci8164.c | 5 +++--
drivers/staging/comedi/drivers/adl_pci9111.c | 5 +++--
drivers/staging/comedi/drivers/adl_pci9118.c | 5 +++--
drivers/staging/comedi/drivers/adv_pci1710.c | 5 +++--
drivers/staging/comedi/drivers/adv_pci1723.c | 5 +++--
drivers/staging/comedi/drivers/adv_pci_dio.c | 5 +++--
drivers/staging/comedi/drivers/amplc_dio200.c | 6 +++---
drivers/staging/comedi/drivers/amplc_pc236.c | 5 +++--
drivers/staging/comedi/drivers/amplc_pc263.c | 6 +++---
drivers/staging/comedi/drivers/amplc_pci224.c | 6 +++---
drivers/staging/comedi/drivers/amplc_pci230.c | 5 +++--
drivers/staging/comedi/drivers/cb_pcidas.c | 5 +++--
drivers/staging/comedi/drivers/cb_pcidas64.c | 5 +++--
drivers/staging/comedi/drivers/cb_pcidda.c | 5 +++--
drivers/staging/comedi/drivers/cb_pcimdas.c | 5 +++--
drivers/staging/comedi/drivers/cb_pcimdda.c | 5 +++--
drivers/staging/comedi/drivers/contec_pci_dio.c | 5 +++--
drivers/staging/comedi/drivers/daqboard2000.c | 5 +++--
drivers/staging/comedi/drivers/das08_pci.c | 5 +++--
drivers/staging/comedi/drivers/dt3000.c | 4 ++--
drivers/staging/comedi/drivers/dyna_pci10xx.c | 5 +++--
drivers/staging/comedi/drivers/gsc_hpdi.c | 4 ++--
drivers/staging/comedi/drivers/icp_multi.c | 4 ++--
drivers/staging/comedi/drivers/jr3_pci.c | 4 ++--
drivers/staging/comedi/drivers/ke_counter.c | 5 +++--
drivers/staging/comedi/drivers/me4000.c | 4 ++--
drivers/staging/comedi/drivers/me_daq.c | 4 ++--
drivers/staging/comedi/drivers/ni_6527.c | 4 ++--
drivers/staging/comedi/drivers/ni_65xx.c | 4 ++--
drivers/staging/comedi/drivers/ni_660x.c | 4 ++--
drivers/staging/comedi/drivers/ni_670x.c | 4 ++--
drivers/staging/comedi/drivers/ni_labpc.c | 4 ++--
drivers/staging/comedi/drivers/ni_pcidio.c | 4 ++--
drivers/staging/comedi/drivers/ni_pcimio.c | 4 ++--
drivers/staging/comedi/drivers/rtd520.c | 4 ++--
drivers/staging/comedi/drivers/s626.c | 4 ++--
drivers/staging/comedi/drivers/skel.c | 4 ++--
55 files changed, 135 insertions(+), 112 deletions(-)
diff --git a/drivers/staging/comedi/comedi_pci.c b/drivers/staging/comedi/comedi_pci.c
index 37d2e46..bf50956 100644
--- 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 f3a990b..b8e5d09 100644
--- 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 0ae356a..fa144e3 100644
--- 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 5a53e58..ea6ddb3 100644
--- 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 c0d0429..fdd053c 100644
--- 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 9c2f8ee..c945a2a 100644
--- 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 69e3996..df8f8ea 100644
--- 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 ddea64d..b2b3bdb 100644
--- 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 e51f800..12ff76a 100644
--- 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 e83e829..f32a79a 100644
--- 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 9ce1d26..4a33b35 100644
--- 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 b1c4226..48afa23 100644
--- 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 917234d..6ecdaab 100644
--- 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 90ee4f8..a28bcbd 100644
--- 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 786fcaf..ecd54ea 100644
--- 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 09d4b21..96ec65b 100644
--- 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 7b3e3316..b8f0efc 100644
--- 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 f27f48e..b8dd161 100644
--- 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 d06b83f..4126f73 100644
--- 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 eeb10ec..8680cf1 100644
--- 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 4dbac74..a0277a8 100644
--- 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 3d788c7..7f04f8b 100644
--- 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 02ce55a..bd95b1d 100644
--- 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 338c43e..45e0b37 100644
--- 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 7c53dea..82f80d5 100644
--- 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, &lc_dio200_driver);
+ return comedi_pci_auto_config(dev, &lc_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 479e10f..b6bba4d 100644
--- 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, &lc_pc236_driver);
+ return comedi_pci_auto_config(dev, &lc_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 11c1f47..e61d556 100644
--- 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, &lc_pc263_driver);
+ return comedi_pci_auto_config(dev, &lc_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 c9da4cd..4a56468 100644
--- 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, &lc_pci224_driver);
+ return comedi_pci_auto_config(dev, &lc_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 e2244c6..70074b5 100644
--- 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, &lc_pci230_driver);
+ return comedi_pci_auto_config(dev, &lc_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 79c7211..425a5a1 100644
--- 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 9f3112c..c085e1d8 100644
--- 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 e2cadc7..f00d857 100644
--- 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 aae063c..7d456ad 100644
--- 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 63cfbaf..5db4f4a 100644
--- 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 182dea6..d659744 100644
--- 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 50b450f..42e13e3 100644
--- 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 c405876..ecab0c4 100644
--- 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 3ce499f..6862e7f 100644
--- 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 decc17f..58ff129 100644
--- 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 b60c975..a18d897 100644
--- 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 1e08f91..8722def 100644
--- 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 17ba75e..aea9401 100644
--- 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 8c09c02..ac40e35 100644
--- 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 b766bb9..9f09e19 100644
--- 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 06490eb..58ba9e3 100644
--- 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 bcd4df2..507c121 100644
--- 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 bfa790e..ded8d9e 100644
--- 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 e46dd7a..cf05d66 100644
--- 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 2faf86c..e60e1ba 100644
--- 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 f957b88..d386c3e 100644
--- 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 0a00260..f4d3fab 100644
--- 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 98b43f2..e626ac0 100644
--- 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 6a5c914..8b72edf 100644
--- 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 81a1fe6..4fec6d6 100644
--- 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 cb83f6a..8cedc4c 100644
--- 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 = {
--
1.8.1.4
More information about the devel
mailing list