diff options
| author | H Hartley Sweeten <hartleys@visionengravers.com> | 2012-07-10 17:04:58 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-07-13 08:12:31 -0700 |
| commit | 2b6e6b8042a9f783170b0a15e0550a075381726e (patch) | |
| tree | f2740ff487ad5052938edb5128a2339838b5d081 | |
| parent | db1701246d5c553ed440bcb6ee1b00ed6a975829 (diff) | |
| download | linux-2b6e6b8042a9f783170b0a15e0550a075381726e.tar.gz linux-2b6e6b8042a9f783170b0a15e0550a075381726e.tar.bz2 linux-2b6e6b8042a9f783170b0a15e0550a075381726e.zip | |
staging: comedi: rtd520: remove RtdDio0Read macro
This macro uses the 'devpriv' macro which relies on a local variable
having a specific name. Plus it's just a wrapper around a simple
'readw'. Remove the macro.
Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | drivers/staging/comedi/drivers/rtd520.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/staging/comedi/drivers/rtd520.c b/drivers/staging/comedi/drivers/rtd520.c index 757cebb8a299..e3a6aa26e858 100644 --- a/drivers/staging/comedi/drivers/rtd520.c +++ b/drivers/staging/comedi/drivers/rtd520.c @@ -407,8 +407,6 @@ struct rtdPrivate { /* Macros to access registers */ /* Digital IO */ -#define RtdDio0Read(dev) \ - (readw(devpriv->las0+LAS0_DIO0) & 0xff) #define RtdDio0Write(dev, v) \ writew((v) & 0xff, devpriv->las0+LAS0_DIO0) @@ -1664,7 +1662,7 @@ static int rtd_dio_insn_bits(struct comedi_device *dev, } /* on return, data[1] contains the value of the digital * input lines. */ - data[1] = RtdDio0Read(dev); + data[1] = readw(devpriv->las0 + LAS0_DIO0) & 0xff; /*DPRINTK("rtd520:port_0 wrote: 0x%x read: 0x%x\n", s->state, data[1]); */ |