From: H Hartley Sweeten Date: Fri, 17 Aug 2012 16:34:52 +0000 (-0700) Subject: staging: comedi: contec_pci: remove manual legacy attach X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=d602a064f9818819d6c99d99f101bc6b1ae1540d;p=GitHub%2Fmt8127%2Fandroid_kernel_alcatel_ttab.git staging: comedi: contec_pci: 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 Cc: Ian Abbott Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/comedi/drivers/contec_pci_dio.c b/drivers/staging/comedi/drivers/contec_pci_dio.c index 12ad9fa32f56..def3e7d6789d 100644 --- a/drivers/staging/comedi/drivers/contec_pci_dio.c +++ b/drivers/staging/comedi/drivers/contec_pci_dio.c @@ -108,15 +108,6 @@ static int contec_attach_pci(struct comedi_device *dev, return 0; } -static int contec_attach(struct comedi_device *dev, - struct comedi_devconfig *it) -{ - dev_warn(dev->class_dev, - "This driver does not support attach using comedi_config\n"); - - return -ENOSYS; -} - static void contec_detach(struct comedi_device *dev) { struct pci_dev *pcidev = comedi_to_pci_dev(dev); @@ -130,7 +121,6 @@ static void contec_detach(struct comedi_device *dev) static struct comedi_driver contec_pci_dio_driver = { .driver_name = "contec_pci_dio", .module = THIS_MODULE, - .attach = contec_attach, .attach_pci = contec_attach_pci, .detach = contec_detach, };