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 04/48] staging: comedi: addi_apci_3120: replace comedi_board() calls
Date: Tue, 9 Sep 2014 11:26:13 +0100 [thread overview]
Message-ID: <1410258417-28230-5-git-send-email-abbotti@mev.co.uk> (raw)
In-Reply-To: <1410258417-28230-1-git-send-email-abbotti@mev.co.uk>
The `comedi_board(dev)` inline function calls just return
`dev->board_ptr`. Expand the inline function calls.
Signed-off-by: Ian Abbott <abbotti@mev.co.uk>
---
drivers/staging/comedi/drivers/addi-data/hwdrv_apci3120.c | 10 +++++-----
drivers/staging/comedi/drivers/addi_apci_3120.c | 2 +-
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3120.c b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3120.c
index 87dff80..a83e2ae 100644
--- a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3120.c
+++ b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3120.c
@@ -253,7 +253,7 @@ static int apci3120_ai_insn_config(struct comedi_device *dev,
struct comedi_insn *insn,
unsigned int *data)
{
- const struct addi_board *this_board = comedi_board(dev);
+ const struct addi_board *this_board = dev->board_ptr;
struct addi_private *devpriv = dev->private;
unsigned int i;
@@ -359,7 +359,7 @@ static int apci3120_ai_insn_read(struct comedi_device *dev,
struct comedi_insn *insn,
unsigned int *data)
{
- const struct addi_board *this_board = comedi_board(dev);
+ const struct addi_board *this_board = dev->board_ptr;
struct addi_private *devpriv = dev->private;
unsigned short us_ConvertTiming, us_TmpValue, i;
unsigned char b_Tmp;
@@ -802,7 +802,7 @@ static int apci3120_cyclic_ai(int mode,
struct comedi_device *dev,
struct comedi_subdevice *s)
{
- const struct addi_board *this_board = comedi_board(dev);
+ const struct addi_board *this_board = dev->board_ptr;
struct addi_private *devpriv = dev->private;
struct comedi_cmd *cmd = &s->async->cmd;
unsigned char b_Tmp;
@@ -1728,7 +1728,7 @@ static int apci3120_config_insn_timer(struct comedi_device *dev,
struct comedi_insn *insn,
unsigned int *data)
{
- const struct addi_board *this_board = comedi_board(dev);
+ const struct addi_board *this_board = dev->board_ptr;
struct addi_private *devpriv = dev->private;
unsigned int ui_Timervalue2;
unsigned short us_TmpValue;
@@ -1873,7 +1873,7 @@ static int apci3120_write_insn_timer(struct comedi_device *dev,
struct comedi_insn *insn,
unsigned int *data)
{
- const struct addi_board *this_board = comedi_board(dev);
+ const struct addi_board *this_board = dev->board_ptr;
struct addi_private *devpriv = dev->private;
unsigned int ui_Timervalue2 = 0;
unsigned short us_TmpValue;
diff --git a/drivers/staging/comedi/drivers/addi_apci_3120.c b/drivers/staging/comedi/drivers/addi_apci_3120.c
index 050c724..84501a3 100644
--- a/drivers/staging/comedi/drivers/addi_apci_3120.c
+++ b/drivers/staging/comedi/drivers/addi_apci_3120.c
@@ -44,7 +44,7 @@ static const struct addi_board apci3120_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);
+ const struct addi_board *this_board = dev->board_ptr;
this_board->interrupt(irq, d);
return IRQ_RETVAL(1);
--
2.1.0
next prev parent reply other threads:[~2014-09-09 10:27 UTC|newest]
Thread overview: 53+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-09-09 10:26 [PATCH 00/48] staging: comedi: avoid using comedi_board() Ian Abbott
2014-09-09 10:26 ` [PATCH 01/48] staging: comedi: addi_common: replace comedi_board() calls Ian Abbott
2014-09-09 10:26 ` [PATCH 02/48] staging: comedi: addi_eeprom: " Ian Abbott
2014-09-09 10:26 ` [PATCH 03/48] staging: comedi: addi_apci_1516: " Ian Abbott
2014-09-09 10:26 ` Ian Abbott [this message]
2014-09-09 10:26 ` [PATCH 05/48] staging: comedi: addi_apci_3xxx: " Ian Abbott
2014-09-09 10:26 ` [PATCH 06/48] staging: comedi: adl_pci9118: " Ian Abbott
2014-09-09 10:26 ` [PATCH 07/48] staging: comedi: adv_pci1710: " Ian Abbott
2014-09-09 10:26 ` [PATCH 08/48] staging: comedi: adv_pci_dio: " Ian Abbott
2014-09-09 10:26 ` [PATCH 09/48] staging: comedi: aio_aio12_8: " Ian Abbott
2014-09-09 10:26 ` [PATCH 10/48] staging: comedi: amplc_dio200_common: " Ian Abbott
2014-09-09 10:26 ` [PATCH 11/48] staging: comedi: amplc_pc236_common: " Ian Abbott
2014-09-09 10:26 ` [PATCH 12/48] staging: comedi: amplc_pci224: " Ian Abbott
2014-09-09 10:26 ` [PATCH 13/48] staging: comedi: amplc_pci230: " Ian Abbott
2014-09-09 10:26 ` [PATCH 14/48] staging: comedi: cb_pcidas64: " Ian Abbott
2014-09-09 10:26 ` [PATCH 15/48] staging: comedi: cb_pcidas: " Ian Abbott
2014-09-09 10:26 ` [PATCH 16/48] staging: comedi: das08: " Ian Abbott
2014-09-09 10:26 ` [PATCH 17/48] staging: comedi: das08_isa: " Ian Abbott
2014-09-09 10:26 ` [PATCH 18/48] staging: comedi: das16: " Ian Abbott
2014-09-09 10:26 ` [PATCH 19/48] staging: comedi: das1800: " Ian Abbott
2014-09-09 10:26 ` [PATCH 20/48] staging: comedi: das6402: " Ian Abbott
2014-09-09 10:26 ` [PATCH 21/48] staging: comedi: das800: " Ian Abbott
2014-09-09 10:26 ` [PATCH 22/48] staging: comedi: dt2801: " Ian Abbott
2014-09-09 10:26 ` [PATCH 23/48] staging: comedi: dt2811: " Ian Abbott
2014-09-09 10:26 ` [PATCH 24/48] staging: comedi: dt282x: " Ian Abbott
2014-09-09 10:26 ` [PATCH 25/48] staging: comedi: dt3000: " Ian Abbott
2014-09-09 10:26 ` [PATCH 26/48] staging: comedi: me4000: " Ian Abbott
2014-09-09 10:26 ` [PATCH 27/48] staging: comedi: ni_65xx: " Ian Abbott
2014-09-09 10:26 ` [PATCH 28/48] staging: comedi: ni_660x: " Ian Abbott
2014-09-09 10:26 ` [PATCH 29/48] staging: comedi: ni_at_a2150: " Ian Abbott
2014-09-09 10:26 ` [PATCH 30/48] staging: comedi: ni_at_ao: " Ian Abbott
2014-09-09 10:26 ` [PATCH 31/48] staging: comedi: ni_atmio16d: " Ian Abbott
2014-09-09 10:26 ` [PATCH 32/48] staging: comedi: ni_atmio: " Ian Abbott
2014-09-09 10:26 ` [PATCH 33/48] staging: comedi: ni_labpc_common: " Ian Abbott
2014-09-09 10:26 ` [PATCH 34/48] staging: comedi: ni_labpc_isadma: " Ian Abbott
2014-09-09 10:26 ` [PATCH 35/48] staging: comedi: ni_mio_common: " Ian Abbott
2014-09-09 10:26 ` [PATCH 36/48] staging: comedi: ni_pcimio: " Ian Abbott
2014-09-09 10:26 ` [PATCH 37/48] staging: comedi: pcl711: " Ian Abbott
2014-09-09 10:26 ` [PATCH 38/48] staging: comedi: pcl724: " Ian Abbott
2014-09-09 10:26 ` [PATCH 39/48] staging: comedi: pcl726: " Ian Abbott
2014-09-09 10:26 ` [PATCH 40/48] staging: comedi: pcl730: " Ian Abbott
2014-09-09 10:26 ` [PATCH 41/48] staging: comedi: pcl812: " Ian Abbott
2014-09-09 10:26 ` [PATCH 42/48] staging: comedi: pcl816: " Ian Abbott
2014-09-09 10:26 ` [PATCH 43/48] staging: comedi: pcl818: " Ian Abbott
2014-09-09 10:26 ` [PATCH 44/48] staging: comedi: pcmad: " Ian Abbott
2014-09-09 10:26 ` [PATCH 45/48] staging: comedi: pcmuio: " Ian Abbott
2014-09-09 10:26 ` [PATCH 46/48] staging: comedi: rtd520: " Ian Abbott
2014-09-09 10:26 ` [PATCH 47/48] staging: comedi: rti800: " Ian Abbott
2014-09-09 10:26 ` [PATCH 48/48] staging: comedi: vmk80xx: " Ian Abbott
2014-09-09 16:28 ` [PATCH 00/48] staging: comedi: avoid using comedi_board() Hartley Sweeten
2014-09-11 17:57 ` Hartley Sweeten
2014-09-11 21:37 ` Greg Kroah-Hartman
2014-09-11 22:00 ` Hartley Sweeten
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=1410258417-28230-5-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;
as well as URLs for NNTP newsgroup(s).