staging: comedi: rtd520: use auto_attach instead of attach_pci
authorIan Abbott <abbotti@mev.co.uk>
Wed, 31 Oct 2012 11:56:23 +0000 (11:56 +0000)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 31 Oct 2012 22:14:41 +0000 (15:14 -0700)
Change the rtd520 driver to use the new `auto_attach()` method in
`struct comedi_driver` instead of the `attach_pci()` method.  I plan to
remove the `attach_pci()` and `attach_usb()` methods once nothing is
using them.

Tag the new `rtd520_auto_attach()` function definition with `__devinit`
as it is only called during PCI probe.

Signed-off-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/comedi/drivers/rtd520.c

index e42bd6b1153c029fc4ac899532b508956d5d4cea..23b76d0b1a56e3eaf9989b0c471d9aaf842dbf6e 100644 (file)
@@ -1284,8 +1284,10 @@ static const void *rtd_find_boardinfo(struct comedi_device *dev,
        return NULL;
 }
 
-static int rtd_attach_pci(struct comedi_device *dev, struct pci_dev *pcidev)
+static int __devinit rtd_auto_attach(struct comedi_device *dev,
+                                    unsigned long context_unused)
 {
+       struct pci_dev *pcidev = comedi_to_pci_dev(dev);
        const struct rtdBoard *thisboard;
        struct rtdPrivate *devpriv;
        struct comedi_subdevice *s;
@@ -1420,7 +1422,7 @@ static void rtd_detach(struct comedi_device *dev)
 static struct comedi_driver rtd520_driver = {
        .driver_name    = "rtd520",
        .module         = THIS_MODULE,
-       .attach_pci     = rtd_attach_pci,
+       .auto_attach    = rtd_auto_attach,
        .detach         = rtd_detach,
 };