aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorH Hartley Sweeten <hartleys@visionengravers.com>2012-08-16 22:41:45 -0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-08-17 11:10:28 -0400
commit12a2dd66a259f2ae6bd26243f711383d710872b9 (patch)
tree3f15657bd22afdae73ccb705737496fe66b8bc6a
parent424d56ec3ca0ea5a4cc4caad885d8e49a3cfafc8 (diff)
staging: comedi: adl_pci6208: remove manual legacy attach
This driver uses the 'attach_pci' callback to attach the pci device to the comedi subsystem. Since the 'attach' callback is now optional it can be removed from the driver. 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>
-rw-r--r--drivers/staging/comedi/drivers/adl_pci6208.c10
1 files changed, 0 insertions, 10 deletions
diff --git a/drivers/staging/comedi/drivers/adl_pci6208.c b/drivers/staging/comedi/drivers/adl_pci6208.c
index 3abff556b846..99fbd9485181 100644
--- a/drivers/staging/comedi/drivers/adl_pci6208.c
+++ b/drivers/staging/comedi/drivers/adl_pci6208.c
@@ -248,15 +248,6 @@ static int pci6208_attach_pci(struct comedi_device *dev,
248 return 0; 248 return 0;
249} 249}
250 250
251static int pci6208_attach(struct comedi_device *dev,
252 struct comedi_devconfig *it)
253{
254 dev_warn(dev->class_dev,
255 "This driver does not support attach using comedi_config\n");
256
257 return -ENOSYS;
258}
259
260static void pci6208_detach(struct comedi_device *dev) 251static void pci6208_detach(struct comedi_device *dev)
261{ 252{
262 struct pci_dev *pcidev = comedi_to_pci_dev(dev); 253 struct pci_dev *pcidev = comedi_to_pci_dev(dev);
@@ -270,7 +261,6 @@ static void pci6208_detach(struct comedi_device *dev)
270static struct comedi_driver adl_pci6208_driver = { 261static struct comedi_driver adl_pci6208_driver = {
271 .driver_name = "adl_pci6208", 262 .driver_name = "adl_pci6208",
272 .module = THIS_MODULE, 263 .module = THIS_MODULE,
273 .attach = pci6208_attach,
274 .attach_pci = pci6208_attach_pci, 264 .attach_pci = pci6208_attach_pci,
275 .detach = pci6208_detach, 265 .detach = pci6208_detach,
276}; 266};