From: Chase Southwood <chase.southwood@gmail.com>
To: gregkh@linuxfoundation.org
Cc: abbotti@mev.co.uk, hsweeten@visionengravers.com,
devel@driverdev.osuosl.org, linux-kernel@vger.kernel.org,
Chase Southwood <chase.southwood@gmail.com>
Subject: [PATCH 4/4] staging: comedi: addi_apci_1564: call apci1564_interrupt() directly
Date: Sat, 3 May 2014 02:57:41 -0500 [thread overview]
Message-ID: <1399103861-16342-1-git-send-email-chase.southwood@gmail.com> (raw)
In-Reply-To: <1399103661-14853-1-git-send-email-chase.southwood@gmail.com>
Remove the boardinfo about the interrupt function and just call it
directly.
Signed-off-by: Chase Southwood <chase.southwood@gmail.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Cc: H Hartley Sweeten <hsweeten@visionengravers.com>
---
drivers/staging/comedi/drivers/addi_apci_1564.c | 6 +-----
1 file changed, 1 insertion(+), 5 deletions(-)
diff --git a/drivers/staging/comedi/drivers/addi_apci_1564.c b/drivers/staging/comedi/drivers/addi_apci_1564.c
index 254889a..df1a16e 100644
--- a/drivers/staging/comedi/drivers/addi_apci_1564.c
+++ b/drivers/staging/comedi/drivers/addi_apci_1564.c
@@ -15,7 +15,6 @@ static const struct addi_board apci1564_boardtypes[] = {
.i_NbrDoChannel = 32,
.i_DoMaxdata = 0xffffffff,
.i_Timer = 1,
- .interrupt = apci1564_interrupt,
.timer_config = apci1564_timer_config,
.timer_write = apci1564_timer_write,
.timer_read = apci1564_timer_read,
@@ -24,10 +23,7 @@ static const struct addi_board apci1564_boardtypes[] = {
static irqreturn_t v_ADDI_Interrupt(int irq, void *d)
{
- struct comedi_device *dev = d;
- const struct addi_board *this_board = comedi_board(dev);
-
- this_board->interrupt(irq, d);
+ apci1564_interrupt(irq, d);
return IRQ_RETVAL(1);
}
--
1.9.0
next prev parent reply other threads:[~2014-05-03 7:57 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-05-03 7:54 [PATCH 0/4] staging: comedi: addi_apci_1564: Further cleanups Chase Southwood
2014-05-03 7:55 ` [PATCH 1/4] staging: comedi: addi_apci_1564: board has 32 digital outputs Chase Southwood
2014-05-03 7:56 ` [PATCH 2/4] staging: comedi: addi_apci_1564: don't allocate unused subdevices Chase Southwood
2014-05-03 7:57 ` [PATCH 3/4] staging: comedi: addi_apci_1564: absorb apci1564_reset() Chase Southwood
2014-05-03 7:57 ` Chase Southwood [this message]
2014-05-05 16:46 ` [PATCH 0/4] staging: comedi: addi_apci_1564: Further cleanups Hartley Sweeten
2014-05-06 9:19 ` 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=1399103861-16342-1-git-send-email-chase.southwood@gmail.com \
--to=chase.southwood@gmail.com \
--cc=abbotti@mev.co.uk \
--cc=devel@driverdev.osuosl.org \
--cc=gregkh@linuxfoundation.org \
--cc=hsweeten@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;
as well as URLs for NNTP newsgroup(s).