Skip to content

Commit

Permalink
staging: comedi: rtd520: use auto_attach instead of attach_pci
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Ian Abbott authored and Greg Kroah-Hartman committed Oct 31, 2012
1 parent 01e14a4 commit 5df3954
Showing 1 changed file with 4 additions and 2 deletions.
6 changes: 4 additions & 2 deletions drivers/staging/comedi/drivers/rtd520.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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,
};

Expand Down

0 comments on commit 5df3954

Please sign in to comment.