staging: comedi: rtd520: remove RtdDio0Read macro

PATCH In review H Hartley Sweeten 1 participant 1 message Jul 11, 2012 Staging

Share & tools

H Hartley Sweeten

author

2012-07-11 00:05 UTC #0 lore raw

PATCH 45/83 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 <[email protected]>

Cc Ian Abbott <[email protected]>

Cc Greg Kroah-Hartman <[email protected]>

---
 drivers/staging/comedi/drivers/rtd520.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

drivers/staging/comedi/drivers/rtd520.c +1 -3

index 757cebb..e3a6aa2 100644
@@ -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]); */

Signature · 1 line

1.7.11