OpenE2K
/
linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

staging: comedi: addi_common.c: remove i_ADDI_Detach() 

The addi_apci_035 and addi_apci_1500 are the only drivers left that use
this function in addi_common.c. Remove the function an add a private
comedi_driver (*detach) function to those drivers.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Reviewed-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
H Hartley Sweeten 2014-10-14 10:44:17 -07:00 committed by Greg Kroah-Hartman
parent 8e89ba5b3d
commit 6a9c41990d
3 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
drivers/staging/comedi/drivers/addi-data/addi_common.c
View File

@ -265,10 +265,3 @@ static int addi_auto_attach(struct comedi_device *dev,
i_ADDI_Reset(dev);
return 0;
}
static void i_ADDI_Detach(struct comedi_device *dev)
{
if (dev->iobase)
i_ADDI_Reset(dev);
comedi_pci_detach(dev);
}

9
drivers/staging/comedi/drivers/addi_apci_035.c
View File

@ -45,11 +45,18 @@ static int apci035_auto_attach(struct comedi_device *dev,
return addi_auto_attach(dev, context);
}
static void apci035_detach(struct comedi_device *dev)
{
if (dev->iobase)
i_ADDI_Reset(dev);
comedi_pci_detach(dev);
}
static struct comedi_driver apci035_driver = {
.driver_name = "addi_apci_035",
.module = THIS_MODULE,
.auto_attach = apci035_auto_attach,
.detach = i_ADDI_Detach,
.detach = apci035_detach,
};
static int apci035_pci_probe(struct pci_dev *dev,

9
drivers/staging/comedi/drivers/addi_apci_1500.c
View File

@ -44,11 +44,18 @@ static int apci1500_auto_attach(struct comedi_device *dev,
return addi_auto_attach(dev, context);
}
static void apci1500_detach(struct comedi_device *dev)
{
if (dev->iobase)
i_ADDI_Reset(dev);
comedi_pci_detach(dev);
}
static struct comedi_driver apci1500_driver = {
.driver_name = "addi_apci_1500",
.module = THIS_MODULE,
.auto_attach = apci1500_auto_attach,
.detach = i_ADDI_Detach,
.detach = apci1500_detach,
};
static int apci1500_pci_probe(struct pci_dev *dev,