iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

staging: comedi: addi_apci_*: use auto_attach instead of attach_pci

Browse Source 
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@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
H Hartley Sweeten 2012-11-06 11:16:59 -07:00 committed by Greg Kroah-Hartman
parent 92cba8f3b4
commit 891e62c33d
3 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
drivers/staging/comedi/drivers/addi_apci_1032.c
View File

@ -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,
};

7
drivers/staging/comedi/drivers/addi_apci_1710.c
View File

@ -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,
};

7
drivers/staging/comedi/drivers/addi_apci_3120.c
View File

@ -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,
};