mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-09-12 21:57:43 +00:00
Code Issues Releases Wiki Activity

staging: comedi: rtd520: remove RtdResetBoard macro

Browse source 
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>
This commit is contained in:
H Hartley Sweeten 2012-07-10 16:39:25 -07:00 committed by Greg Kroah-Hartman
parent bd972ff317
commit e0b757ad7f
1 changed files with 2 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
drivers/staging/comedi/drivers/rtd520.c
View file

@ -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 */