diff options
| author | H Hartley Sweeten <hartleys@visionengravers.com> | 2012-07-10 16:39:25 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-07-13 08:12:21 -0700 |
| commit | e0b757ad7f68cef55de6b36d656bd3747b0550d1 (patch) | |
| tree | c64504b88609206aa3486b226d5048d3c3b833a9 | |
| parent | bd972ff3176caf91a49d1d754848c3f6c5435328 (diff) | |
staging: comedi: rtd520: remove RtdResetBoard 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
'writel'. 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 | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/drivers/staging/comedi/drivers/rtd520.c b/drivers/staging/comedi/drivers/rtd520.c index cc1371daacd2..0b6da102f976 100644 --- a/drivers/staging/comedi/drivers/rtd520.c +++ b/drivers/staging/comedi/drivers/rtd520.c @@ -406,10 +406,6 @@ struct rtdPrivate { /* Macros to access registers */ -/* Reset board */ -#define RtdResetBoard(dev) \ - writel(0, devpriv->las0+LAS0_BOARD_RESET) - /* Reset channel gain table read pointer */ #define RtdResetCGT(dev) \ writel(0, devpriv->las0+LAS0_CGT_RESET) @@ -2050,7 +2046,7 @@ static int rtd_attach(struct comedi_device *dev, struct comedi_devconfig *it) /* initialize board, per RTD spec */ /* also, initialize shadow registers */ - RtdResetBoard(dev); + writel(0, devpriv->las0 + LAS0_BOARD_RESET); udelay(100); /* needed? */ RtdPlxInterruptWrite(dev, 0); RtdInterruptMask(dev, 0); /* and sets shadow */ @@ -2231,7 +2227,7 @@ static void rtd_detach(struct comedi_device *dev) } #endif /* USE_DMA */ if (devpriv->las0) { - RtdResetBoard(dev); + writel(0, devpriv->las0 + LAS0_BOARD_RESET); RtdInterruptMask(dev, 0); RtdInterruptClearMask(dev, ~0); RtdInterruptClear(dev); /* clears bits set by mask */ |