From: H Hartley Sweeten Date: Fri, 17 Aug 2012 02:42:09 +0000 (-0700) Subject: staging: comedi: adl_pci7296: remove manual legacy attach X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=c1a54962537afe40351f390bbb0197c49f858b6d;p=deliverable%2Flinux.git staging: comedi: adl_pci7296: 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/adl_pci7296.c b/drivers/staging/comedi/drivers/adl_pci7296.c index 1b9ea543a822..67233be8c7d6 100644 --- a/drivers/staging/comedi/drivers/adl_pci7296.c +++ b/drivers/staging/comedi/drivers/adl_pci7296.c @@ -133,15 +133,6 @@ static int adl_pci7296_attach_pci(struct comedi_device *dev, return 0; } -static int adl_pci7296_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 adl_pci7296_detach(struct comedi_device *dev) { struct pci_dev *pcidev = comedi_to_pci_dev(dev); @@ -164,7 +155,6 @@ static void adl_pci7296_detach(struct comedi_device *dev) static struct comedi_driver adl_pci7296_driver = { .driver_name = "adl_pci7296", .module = THIS_MODULE, - .attach = adl_pci7296_attach, .attach_pci = adl_pci7296_attach_pci, .detach = adl_pci7296_detach, };