From 5df395404b43cfd111c36822b2e691619a408024 Mon Sep 17 00:00:00 2001 From: Ian Abbott Date: Wed, 31 Oct 2012 11:56:23 +0000 Subject: [PATCH] staging: comedi: rtd520: use auto_attach instead of attach_pci 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 Signed-off-by: Greg Kroah-Hartman --- drivers/staging/comedi/drivers/rtd520.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/drivers/staging/comedi/drivers/rtd520.c b/drivers/staging/comedi/drivers/rtd520.c index e42bd6b1153c..23b76d0b1a56 100644 --- a/drivers/staging/comedi/drivers/rtd520.c +++ b/drivers/staging/comedi/drivers/rtd520.c @@ -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, }; -- 2.45.2