renegade-project/linux-next
2
0
Fork 0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-26 06:04:14 +08:00
Code

staging: comedi: amplc_dio200: remove dio200_common_detach()

Browse Source 
This exported function just does a free_irq() to release the interrupt
handler for the legacy and PCI dio200 drivers.

The legacy driver also calls comedi_legacy_detach() which would also
do the free_irq(). For that driver the just use comedi_legacy_detach()
directly for the (*detach).

For the PCI driver, add the free_irq() to the private (*datach) function.

Remove the, then unused, dio200_common_detach() function.

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-08-12 11:17:23 -07:00 committed by Greg Kroah-Hartman
parent 294de579db
commit bb83abed7d
4 changed files with 3 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/staging/comedi/drivers/amplc_dio200.c
View File

@ -257,17 +257,11 @@ static int dio200_attach(struct comedi_device *dev, struct comedi_devconfig *it)
return amplc_dio200_common_attach(dev, it->options[1], 0);
}
static void dio200_detach(struct comedi_device *dev)
{
amplc_dio200_common_detach(dev);
comedi_legacy_detach(dev);
}
static struct comedi_driver amplc_dio200_driver = {
.driver_name = "amplc_dio200",
.module = THIS_MODULE,
.attach = dio200_attach,
.detach = dio200_detach,
.detach = comedi_legacy_detach,
.board_name = &dio200_isa_boards[0].name,
.offset = sizeof(struct dio200_board),
.num_names = ARRAY_SIZE(dio200_isa_boards),

2
drivers/staging/comedi/drivers/amplc_dio200.h
View File

@ -45,8 +45,6 @@ struct dio200_board {
int amplc_dio200_common_attach(struct comedi_device *dev, unsigned int irq,
unsigned long req_irq_flags);
void amplc_dio200_common_detach(struct comedi_device *dev);
/* Used by initialization of PCIe boards. */
void amplc_dio200_set_enhance(struct comedi_device *dev, unsigned char val);

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

@ -1055,15 +1055,6 @@ int amplc_dio200_common_attach(struct comedi_device *dev, unsigned int irq,
}
EXPORT_SYMBOL_GPL(amplc_dio200_common_attach);
void amplc_dio200_common_detach(struct comedi_device *dev)
{
if (dev->irq) {
free_irq(dev->irq, dev);
dev->irq = 0;
}
}
EXPORT_SYMBOL_GPL(amplc_dio200_common_detach);
static int __init amplc_dio200_common_init(void)
{
return 0;

3
drivers/staging/comedi/drivers/amplc_dio200_pci.c
View File

@ -389,7 +389,8 @@ static int dio200_pci_auto_attach(struct comedi_device *dev,
static void dio200_pci_detach(struct comedi_device *dev)
{
amplc_dio200_common_detach(dev);
if (dev->irq)
free_irq(dev->irq, dev);
if (dev->mmio)
iounmap(dev->mmio);
comedi_pci_disable(dev);