diff options
| author |   Ian Abbott <abbotti@mev.co.uk> | 2014-07-28 13:09:31 +0100 |
|---|---|---|
| committer |   Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-07-30 16:48:42 -0700 |
| commit | 42b241c04e9b0cb655124fd61f729756afd21cc5 (patch) | |
| tree | 39f9dc46f3fb8bb0f4eb842d40940170a9e35edf /drivers/staging/comedi/drivers/amplc_pc236.c | |
| parent | staging: comedi: amplc_pc236: don't disable h/w interrupt on detach() (diff) | |
| download | linux-dev-42b241c04e9b0cb655124fd61f729756afd21cc5.tar.xz linux-dev-42b241c04e9b0cb655124fd61f729756afd21cc5.zip | |
staging: comedi: amplc_pc236: add callback to enable/disable interrupt
Add an optional callback function pointer to the board data to be called
when interrupts are logically enabled or disabled to update the hardware
registers.
Signed-off-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/comedi/drivers/amplc_pc236.c')
| -rw-r--r-- | drivers/staging/comedi/drivers/amplc_pc236.c | 18 |
1 files changed, 14 insertions, 4 deletions
diff --git a/drivers/staging/comedi/drivers/amplc_pc236.c b/drivers/staging/comedi/drivers/amplc_pc236.c index 32275a5ff169..7b78d57cd67b 100644 --- a/drivers/staging/comedi/drivers/amplc_pc236.c +++ b/drivers/staging/comedi/drivers/amplc_pc236.c @@ -82,6 +82,7 @@ enum pc236_bustype { isa_bustype, pci_bustype }; struct pc236_board { const char *name; enum pc236_bustype bustype; + void (*intr_update_cb)(struct comedi_device *dev, bool enable); }; struct pc236_private { @@ -114,8 +115,8 @@ static void pc236_intr_disable(struct comedi_device *dev) spin_lock_irqsave(&dev->spinlock, flags); devpriv->enable_irq = 0; - if (is_pci_board(thisboard)) - outl(PCI236_INTR_DISABLE, devpriv->lcr_iobase + PLX9052_INTCSR); + if (thisboard->intr_update_cb) + thisboard->intr_update_cb(dev, false); spin_unlock_irqrestore(&dev->spinlock, flags); } @@ -132,8 +133,8 @@ static void pc236_intr_enable(struct comedi_device *dev) spin_lock_irqsave(&dev->spinlock, flags); devpriv->enable_irq = 1; - if (is_pci_board(thisboard)) - outl(PCI236_INTR_ENABLE, devpriv->lcr_iobase + PLX9052_INTCSR); + if (thisboard->intr_update_cb) + thisboard->intr_update_cb(dev, true); spin_unlock_irqrestore(&dev->spinlock, flags); } @@ -330,8 +331,17 @@ static int pc236_attach(struct comedi_device *dev, struct comedi_devconfig *it) return pc236_common_attach(dev, dev->iobase, it->options[1], 0); } +static void pci236_intr_update_cb(struct comedi_device *dev, bool enable) +{ + struct pc236_private *devpriv = dev->private; + + outl(enable ? PCI236_INTR_ENABLE : PCI236_INTR_DISABLE, + devpriv->lcr_iobase + PLX9052_INTCSR); +} + static const struct pc236_board pc236_pci_board = { .name = "pci236", + .intr_update_cb = pci236_intr_update_cb, .bustype = pci_bustype, }; |