From: Ian Abbott <abbotti@mev.co.uk>
To: driverdev-devel@linuxdriverproject.org
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
Ian Abbott <abbotti@mev.co.uk>,
H Hartley Sweeten <hartleys@visionengravers.com>,
linux-kernel@vger.kernel.org
Subject: [PATCH 3/7] staging: comedi: amplc_pc236: add callback to enable/disable interrupt
Date: Mon, 28 Jul 2014 13:09:31 +0100 [thread overview]
Message-ID: <1406549375-1864-4-git-send-email-abbotti@mev.co.uk> (raw)
In-Reply-To: <1406549375-1864-1-git-send-email-abbotti@mev.co.uk>
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>
---
drivers/staging/comedi/drivers/amplc_pc236.c | 18 ++++++++++++++----
1 file changed, 14 insertions(+), 4 deletions(-)
diff --git a/drivers/staging/comedi/drivers/amplc_pc236.c b/drivers/staging/comedi/drivers/amplc_pc236.c
index 32275a5..7b78d57 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,
};
--
2.0.0
next prev parent reply other threads:[~2014-07-28 12:09 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-07-28 12:09 [PATCH 0/7] staging: comedi: amplc_pc236: split into separate ISA and PCI drivers Ian Abbott
2014-07-28 12:09 ` [PATCH 1/7] staging: comedi: amplc_pc236: move static board data Ian Abbott
2014-07-28 12:09 ` [PATCH 2/7] staging: comedi: amplc_pc236: don't disable h/w interrupt on detach() Ian Abbott
2014-07-28 12:09 ` Ian Abbott [this message]
2014-07-28 12:09 ` [PATCH 4/7] staging: comedi: amplc_pc236: combine interrupt enable/disable functions Ian Abbott
2014-07-28 12:09 ` [PATCH 5/7] staging: comedi: amplc_pc236: add callback to check and clear interrupt Ian Abbott
2014-07-28 12:09 ` [PATCH 6/7] staging: comedi: amplc_pc236: split into ISA, PCI and common module Ian Abbott
2014-07-28 12:09 ` [PATCH 7/7] staging: comedi: amplc_pc236, amplc_pci236: get rid of bustype Ian Abbott
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1406549375-1864-4-git-send-email-abbotti@mev.co.uk \
--to=abbotti@mev.co.uk \
--cc=driverdev-devel@linuxdriverproject.org \
--cc=gregkh@linuxfoundation.org \
--cc=hartleys@visionengravers.com \
--cc=linux-kernel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®