lkml.org 
[lkml]   [2015]   [Jun]   [5]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
From
Subject[PATCH 13/32] staging: comedi: das08: rename DAS08_CONTROL
Date
The `DAS08_CONTROL` macro contains the offset to the write-only control
register. Rename it to `DAS08_CONTROL_REG` and add a comment.

Signed-off-by: Ian Abbott <abbotti@mev.co.uk>
---
drivers/staging/comedi/drivers/das08.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/staging/comedi/drivers/das08.c b/drivers/staging/comedi/drivers/das08.c
index eef0456..b43bc2d 100644
--- a/drivers/staging/comedi/drivers/das08.c
+++ b/drivers/staging/comedi/drivers/das08.c
@@ -67,7 +67,7 @@
#define DAS08_STATUS_IRQ BIT(3) /* latched interrupt input */
/* digital inputs (not "JR" boards) */
#define DAS08_STATUS_DI(x) (((x) & 0x70) >> 4)
-#define DAS08_CONTROL 2
+#define DAS08_CONTROL_REG 0x02 /* (W) control */
#define DAS08_MUX_MASK 0x7
#define DAS08_MUX(x) ((x) & DAS08_MUX_MASK)
#define DAS08_INTE (1<<3)
@@ -240,7 +240,7 @@ static int das08_ai_rinsn(struct comedi_device *dev, struct comedi_subdevice *s,
spin_lock(&dev->spinlock);
devpriv->do_mux_bits &= ~DAS08_MUX_MASK;
devpriv->do_mux_bits |= DAS08_MUX(chan);
- outb(devpriv->do_mux_bits, dev->iobase + DAS08_CONTROL);
+ outb(devpriv->do_mux_bits, dev->iobase + DAS08_CONTROL_REG);
spin_unlock(&dev->spinlock);

if (devpriv->pg_gainlist) {
@@ -305,7 +305,7 @@ static int das08_do_wbits(struct comedi_device *dev,
spin_lock(&dev->spinlock);
devpriv->do_mux_bits &= ~DAS08_DO_MASK;
devpriv->do_mux_bits |= DAS08_OP(s->state);
- outb(devpriv->do_mux_bits, dev->iobase + DAS08_CONTROL);
+ outb(devpriv->do_mux_bits, dev->iobase + DAS08_CONTROL_REG);
spin_unlock(&dev->spinlock);
}

--
2.1.4


\
 
 \ /
  Last update: 2015-06-05 20:01    [W:0.208 / U:0.132 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site