From: H Hartley Sweeten Date: Fri, 17 Aug 2012 02:55:19 +0000 (-0700) Subject: staging: comedi: dyna_pci10xx: remove manual legacy attach X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=c3b52d465916acd02803e83e58d9440ec365ab72;p=deliverable%2Flinux.git staging: comedi: dyna_pci10xx: 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/dyna_pci10xx.c b/drivers/staging/comedi/drivers/dyna_pci10xx.c index e852808c6314..9d55aa912567 100644 --- a/drivers/staging/comedi/drivers/dyna_pci10xx.c +++ b/drivers/staging/comedi/drivers/dyna_pci10xx.c @@ -253,15 +253,6 @@ static int dyna_pci10xx_attach_pci(struct comedi_device *dev, return 0; } -static int dyna_pci10xx_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 dyna_pci10xx_detach(struct comedi_device *dev) { struct pci_dev *pcidev = comedi_to_pci_dev(dev); @@ -278,7 +269,6 @@ static void dyna_pci10xx_detach(struct comedi_device *dev) static struct comedi_driver dyna_pci10xx_driver = { .driver_name = "dyna_pci10xx", .module = THIS_MODULE, - .attach = dyna_pci10xx_attach, .attach_pci = dyna_pci10xx_attach_pci, .detach = dyna_pci10xx_detach, };