From: H Hartley Sweeten Date: Fri, 17 Aug 2012 02:41:45 +0000 (-0700) Subject: staging: comedi: adl_pci6208: remove manual legacy attach X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=12a2dd66a259f2ae6bd26243f711383d710872b9;p=linux-beck.git 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 Cc: Ian Abbott Signed-off-by: Greg Kroah-Hartman --- 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, return 0; } -static int pci6208_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 pci6208_detach(struct comedi_device *dev) { struct pci_dev *pcidev = comedi_to_pci_dev(dev); @@ -270,7 +261,6 @@ static void pci6208_detach(struct comedi_device *dev) static struct comedi_driver adl_pci6208_driver = { .driver_name = "adl_pci6208", .module = THIS_MODULE, - .attach = pci6208_attach, .attach_pci = pci6208_attach_pci, .detach = pci6208_detach, };