Commit e0b757ad authored by H Hartley Sweeten's avatar H Hartley Sweeten Committed by Greg Kroah-Hartman

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: default avatarH Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent bd972ff3
...@@ -406,10 +406,6 @@ struct rtdPrivate { ...@@ -406,10 +406,6 @@ struct rtdPrivate {
/* Macros to access registers */ /* Macros to access registers */
/* Reset board */
#define RtdResetBoard(dev) \
writel(0, devpriv->las0+LAS0_BOARD_RESET)
/* Reset channel gain table read pointer */ /* Reset channel gain table read pointer */
#define RtdResetCGT(dev) \ #define RtdResetCGT(dev) \
writel(0, devpriv->las0+LAS0_CGT_RESET) writel(0, devpriv->las0+LAS0_CGT_RESET)
...@@ -2050,7 +2046,7 @@ static int rtd_attach(struct comedi_device *dev, struct comedi_devconfig *it) ...@@ -2050,7 +2046,7 @@ static int rtd_attach(struct comedi_device *dev, struct comedi_devconfig *it)
/* initialize board, per RTD spec */ /* initialize board, per RTD spec */
/* also, initialize shadow registers */ /* also, initialize shadow registers */
RtdResetBoard(dev); writel(0, devpriv->las0 + LAS0_BOARD_RESET);
udelay(100); /* needed? */ udelay(100); /* needed? */
RtdPlxInterruptWrite(dev, 0); RtdPlxInterruptWrite(dev, 0);
RtdInterruptMask(dev, 0); /* and sets shadow */ RtdInterruptMask(dev, 0); /* and sets shadow */
...@@ -2231,7 +2227,7 @@ static void rtd_detach(struct comedi_device *dev) ...@@ -2231,7 +2227,7 @@ static void rtd_detach(struct comedi_device *dev)
} }
#endif /* USE_DMA */ #endif /* USE_DMA */
if (devpriv->las0) { if (devpriv->las0) {
RtdResetBoard(dev); writel(0, devpriv->las0 + LAS0_BOARD_RESET);
RtdInterruptMask(dev, 0); RtdInterruptMask(dev, 0);
RtdInterruptClearMask(dev, ~0); RtdInterruptClearMask(dev, ~0);
RtdInterruptClear(dev); /* clears bits set by mask */ RtdInterruptClear(dev); /* clears bits set by mask */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment