Change the remaining addi-data drivers so they attach using the generic
'auto_attach' method instead the pci specific 'attach_pci' method. The
'attach_pci' is deprecated and is going to be removed.
Signed-off-by: H Hartley Sweeten <hsweeten@xxxxxxxxxxxxxxxxxxx>
Cc: Ian Abbott <abbotti@xxxxxxxxx>
Cc: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
drivers/staging/comedi/drivers/addi_apci_1032.c | 7 ++++---
drivers/staging/comedi/drivers/addi_apci_1710.c | 7 ++++---
drivers/staging/comedi/drivers/addi_apci_3120.c | 7 ++++---
3 files changed, 12 insertions(+), 9 deletions(-)
diff --git a/drivers/staging/comedi/drivers/addi_apci_1032.c b/drivers/staging/comedi/drivers/addi_apci_1032.c
index 2f23a17..14b5989 100644
--- a/drivers/staging/comedi/drivers/addi_apci_1032.c
+++ b/drivers/staging/comedi/drivers/addi_apci_1032.c
@@ -246,9 +246,10 @@ static int apci1032_di_insn_bits(struct comedi_device *dev,
return insn->n;
}
-static int apci1032_attach_pci(struct comedi_device *dev,
- struct pci_dev *pcidev)
+static int __devinit apci1032_auto_attach(struct comedi_device *dev,
+ unsigned long context_unused)
{
+ struct pci_dev *pcidev = comedi_to_pci_dev(dev);
struct apci1032_private *devpriv;
struct comedi_subdevice *s;
int ret;
@@ -325,7 +326,7 @@ static void apci1032_detach(struct comedi_device *dev)
static struct comedi_driver apci1032_driver = {
.driver_name = "addi_apci_1032",
.module = THIS_MODULE,
- .attach_pci = apci1032_attach_pci,
+ .auto_attach = apci1032_auto_attach,
.detach = apci1032_detach,
};
diff --git a/drivers/staging/comedi/drivers/addi_apci_1710.c b/drivers/staging/comedi/drivers/addi_apci_1710.c
index 66dd94c..485f821 100644
--- a/drivers/staging/comedi/drivers/addi_apci_1710.c
+++ b/drivers/staging/comedi/drivers/addi_apci_1710.c
@@ -52,9 +52,10 @@ static const void *apci1710_find_boardinfo(struct comedi_device *dev,
return NULL;
}
-static int apci1710_attach_pci(struct comedi_device *dev,
- struct pci_dev *pcidev)
+static int __devinit apci1710_auto_attach(struct comedi_device *dev,
+ unsigned long context_unused)
{
+ struct pci_dev *pcidev = comedi_to_pci_dev(dev);
const struct addi_board *this_board;
struct addi_private *devpriv;
struct comedi_subdevice *s;
@@ -117,7 +118,7 @@ static void apci1710_detach(struct comedi_device *dev)
static struct comedi_driver apci1710_driver = {
.driver_name = "addi_apci_1710",
.module = THIS_MODULE,
- .attach_pci = apci1710_attach_pci,
+ .auto_attach = apci1710_auto_attach,
.detach = apci1710_detach,
};
diff --git a/drivers/staging/comedi/drivers/addi_apci_3120.c b/drivers/staging/comedi/drivers/addi_apci_3120.c
index f65f827..34aab50 100644
--- a/drivers/staging/comedi/drivers/addi_apci_3120.c
+++ b/drivers/staging/comedi/drivers/addi_apci_3120.c
@@ -60,9 +60,10 @@ static const void *apci3120_find_boardinfo(struct comedi_device *dev,
return NULL;
}
-static int apci3120_attach_pci(struct comedi_device *dev,
- struct pci_dev *pcidev)
+static int __devinit apci3120_auto_attach(struct comedi_device *dev,
+ unsigned long context_unused)
{
+ struct pci_dev *pcidev = comedi_to_pci_dev(dev);
const struct addi_board *this_board;
struct addi_private *devpriv;
struct comedi_subdevice *s;
@@ -240,7 +241,7 @@ static void apci3120_detach(struct comedi_device *dev)
static struct comedi_driver apci3120_driver = {
.driver_name = "addi_apci_3120",
.module = THIS_MODULE,
- .attach_pci = apci3120_attach_pci,
+ .auto_attach = apci3120_auto_attach,
.detach = apci3120_detach,
};
--
1.7.11
_______________________________________________
devel mailing list
devel@xxxxxxxxxxxxxxxxxxxxxx
http://driverdev.linuxdriverproject.org/mailman/listinfo/devel
