From: H Hartley Sweeten Date: Fri, 17 Aug 2012 02:42:30 +0000 (-0700) Subject: staging: comedi: adl_pci7x3x: remove manual legacy attach X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=180d7fc8ab7ace9b911196d6eba2c1e47c3cbe85;p=deliverable%2Flinux.git staging: comedi: adl_pci7x3x: 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_pci7x3x.c b/drivers/staging/comedi/drivers/adl_pci7x3x.c index 41963fba4fc2..48b3baa1b7a4 100644 --- a/drivers/staging/comedi/drivers/adl_pci7x3x.c +++ b/drivers/staging/comedi/drivers/adl_pci7x3x.c @@ -280,15 +280,6 @@ static int adl_pci7x3x_attach_pci(struct comedi_device *dev, return 0; } -static int adl_pci7x3x_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_pci7x3x_detach(struct comedi_device *dev) { struct pci_dev *pcidev = comedi_to_pci_dev(dev); @@ -302,7 +293,6 @@ static void adl_pci7x3x_detach(struct comedi_device *dev) static struct comedi_driver adl_pci7x3x_driver = { .driver_name = "adl_pci7x3x", .module = THIS_MODULE, - .attach = adl_pci7x3x_attach, .attach_pci = adl_pci7x3x_attach_pci, .detach = adl_pci7x3x_detach, };