Skip to content

Commit

Permalink
staging: comedi: rtd520: remove RtdDio0CtrlWrite macro
Browse files Browse the repository at this point in the history
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
'writew'. 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>
  • Loading branch information
H Hartley Sweeten authored and Greg Kroah-Hartman committed Jul 15, 2012
1 parent d6e3da8 commit b0c375a
Showing 1 changed file with 1 addition and 4 deletions.
5 changes: 1 addition & 4 deletions drivers/staging/comedi/drivers/rtd520.c
Original file line number Diff line number Diff line change
Expand Up @@ -406,9 +406,6 @@ struct rtdPrivate {

/* Macros to access registers */

#define RtdDio0CtrlWrite(dev, v) \
writew((v) & 0xff, devpriv->las0+LAS0_DIO0_CTRL)

/* Digital to Analog converter */
/* Write one data value (sign + 12bit + marker bits) */
/* Note: matches what DMA would put. Actual value << 3 */
Expand Down Expand Up @@ -1686,7 +1683,7 @@ static int rtd_dio_insn_config(struct comedi_device *dev,
/* TODO support digital match interrupts and strobes */
devpriv->dioStatus = 0x01; /* set direction */
writew(devpriv->dioStatus, devpriv->las0 + LAS0_DIO_STATUS);
RtdDio0CtrlWrite(dev, s->io_bits); /* set direction 1 means Out */
writew(s->io_bits & 0xff, devpriv->las0 + LAS0_DIO0_CTRL);
devpriv->dioStatus = 0x00; /* clear interrupts */
writew(devpriv->dioStatus, devpriv->las0 + LAS0_DIO_STATUS);

Expand Down

0 comments on commit b0c375a

Please sign in to comment.