linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
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 10/48] staging: comedi: amplc_dio200_common: replace comedi_board() calls
Date: Tue,  9 Sep 2014 11:26:19 +0100	[thread overview]
Message-ID: <1410258417-28230-11-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>
---
 .../staging/comedi/drivers/amplc_dio200_common.c   | 30 +++++++++++-----------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/drivers/staging/comedi/drivers/amplc_dio200_common.c b/drivers/staging/comedi/drivers/amplc_dio200_common.c
index 6cadf7e..aed03dc 100644
--- a/drivers/staging/comedi/drivers/amplc_dio200_common.c
+++ b/drivers/staging/comedi/drivers/amplc_dio200_common.c
@@ -127,7 +127,7 @@ struct dio200_subdev_intr {
 static unsigned char dio200_read8(struct comedi_device *dev,
 				  unsigned int offset)
 {
-	const struct dio200_board *board = comedi_board(dev);
+	const struct dio200_board *board = dev->board_ptr;
 
 	if (board->is_pcie)
 		offset <<= 3;
@@ -140,7 +140,7 @@ static unsigned char dio200_read8(struct comedi_device *dev,
 static void dio200_write8(struct comedi_device *dev,
 			  unsigned int offset, unsigned char val)
 {
-	const struct dio200_board *board = comedi_board(dev);
+	const struct dio200_board *board = dev->board_ptr;
 
 	if (board->is_pcie)
 		offset <<= 3;
@@ -154,7 +154,7 @@ static void dio200_write8(struct comedi_device *dev,
 static unsigned int dio200_read32(struct comedi_device *dev,
 				  unsigned int offset)
 {
-	const struct dio200_board *board = comedi_board(dev);
+	const struct dio200_board *board = dev->board_ptr;
 
 	if (board->is_pcie)
 		offset <<= 3;
@@ -167,7 +167,7 @@ static unsigned int dio200_read32(struct comedi_device *dev,
 static void dio200_write32(struct comedi_device *dev,
 			   unsigned int offset, unsigned int val)
 {
-	const struct dio200_board *board = comedi_board(dev);
+	const struct dio200_board *board = dev->board_ptr;
 
 	if (board->is_pcie)
 		offset <<= 3;
@@ -183,7 +183,7 @@ static int dio200_subdev_intr_insn_bits(struct comedi_device *dev,
 					struct comedi_insn *insn,
 					unsigned int *data)
 {
-	const struct dio200_board *board = comedi_board(dev);
+	const struct dio200_board *board = dev->board_ptr;
 	struct dio200_subdev_intr *subpriv = s->private;
 
 	if (board->has_int_sce) {
@@ -200,7 +200,7 @@ static int dio200_subdev_intr_insn_bits(struct comedi_device *dev,
 static void dio200_stop_intr(struct comedi_device *dev,
 			     struct comedi_subdevice *s)
 {
-	const struct dio200_board *board = comedi_board(dev);
+	const struct dio200_board *board = dev->board_ptr;
 	struct dio200_subdev_intr *subpriv = s->private;
 
 	subpriv->active = false;
@@ -212,7 +212,7 @@ static void dio200_stop_intr(struct comedi_device *dev,
 static int dio200_start_intr(struct comedi_device *dev,
 			     struct comedi_subdevice *s)
 {
-	const struct dio200_board *board = comedi_board(dev);
+	const struct dio200_board *board = dev->board_ptr;
 	struct dio200_subdev_intr *subpriv = s->private;
 	struct comedi_cmd *cmd = &s->async->cmd;
 	unsigned int n;
@@ -306,7 +306,7 @@ static void dio200_read_scan_intr(struct comedi_device *dev,
 static int dio200_handle_read_intr(struct comedi_device *dev,
 				   struct comedi_subdevice *s)
 {
-	const struct dio200_board *board = comedi_board(dev);
+	const struct dio200_board *board = dev->board_ptr;
 	struct dio200_subdev_intr *subpriv = s->private;
 	unsigned triggered;
 	unsigned intstat;
@@ -481,7 +481,7 @@ static int dio200_subdev_intr_init(struct comedi_device *dev,
 				   unsigned int offset,
 				   unsigned valid_isns)
 {
-	const struct dio200_board *board = comedi_board(dev);
+	const struct dio200_board *board = dev->board_ptr;
 	struct dio200_subdev_intr *subpriv;
 
 	subpriv = comedi_alloc_spriv(s, sizeof(*subpriv));
@@ -626,7 +626,7 @@ static int dio200_subdev_8254_set_gate_src(struct comedi_device *dev,
 					   unsigned int counter_number,
 					   unsigned int gate_src)
 {
-	const struct dio200_board *board = comedi_board(dev);
+	const struct dio200_board *board = dev->board_ptr;
 	struct dio200_subdev_8254 *subpriv = s->private;
 	unsigned char byte;
 
@@ -648,7 +648,7 @@ static int dio200_subdev_8254_get_gate_src(struct comedi_device *dev,
 					   struct comedi_subdevice *s,
 					   unsigned int counter_number)
 {
-	const struct dio200_board *board = comedi_board(dev);
+	const struct dio200_board *board = dev->board_ptr;
 	struct dio200_subdev_8254 *subpriv = s->private;
 
 	if (!board->has_clk_gat_sce)
@@ -664,7 +664,7 @@ static int dio200_subdev_8254_set_clock_src(struct comedi_device *dev,
 					    unsigned int counter_number,
 					    unsigned int clock_src)
 {
-	const struct dio200_board *board = comedi_board(dev);
+	const struct dio200_board *board = dev->board_ptr;
 	struct dio200_subdev_8254 *subpriv = s->private;
 	unsigned char byte;
 
@@ -687,7 +687,7 @@ static int dio200_subdev_8254_get_clock_src(struct comedi_device *dev,
 					    unsigned int counter_number,
 					    unsigned int *period_ns)
 {
-	const struct dio200_board *board = comedi_board(dev);
+	const struct dio200_board *board = dev->board_ptr;
 	struct dio200_subdev_8254 *subpriv = s->private;
 	unsigned clock_src;
 
@@ -760,7 +760,7 @@ static int dio200_subdev_8254_init(struct comedi_device *dev,
 				   struct comedi_subdevice *s,
 				   unsigned int offset)
 {
-	const struct dio200_board *board = comedi_board(dev);
+	const struct dio200_board *board = dev->board_ptr;
 	struct dio200_subdev_8254 *subpriv;
 	unsigned int chan;
 
@@ -981,7 +981,7 @@ EXPORT_SYMBOL_GPL(amplc_dio200_set_enhance);
 int amplc_dio200_common_attach(struct comedi_device *dev, unsigned int irq,
 			       unsigned long req_irq_flags)
 {
-	const struct dio200_board *board = comedi_board(dev);
+	const struct dio200_board *board = dev->board_ptr;
 	struct comedi_subdevice *s;
 	unsigned int n;
 	int ret;
-- 
2.1.0


  parent reply	other threads:[~2014-09-09 10:41 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 ` [PATCH 04/48] staging: comedi: addi_apci_3120: " Ian Abbott
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 ` Ian Abbott [this message]
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-11-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).