Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 732941ad authored by H Hartley Sweeten's avatar H Hartley Sweeten Committed by Greg Kroah-Hartman
Browse files

staging: comedi: rtd520: remove RtdInterruptStatus 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: 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 5d4a9343

drivers/staging/comedi/drivers/rtd520.c

+3 −7
Original line number Original line Diff line number Diff line
@@ -406,10 +406,6 @@ struct rtdPrivate { 




/* Macros to access registers */

/* Macros to access registers */





/* Interrupt status */

#define RtdInterruptStatus(dev) \

	readw(devpriv->las0+LAS0_IT)



/* Interrupt mask */

/* Interrupt mask */

#define RtdInterruptMask(dev, v) \

#define RtdInterruptMask(dev, v) \

	writew((devpriv->intMask = (v)), devpriv->las0+LAS0_IT)

	writew((devpriv->intMask = (v)), devpriv->las0+LAS0_IT)
@@ -1078,7 +1074,7 @@ static irqreturn_t rtd_interrupt(int irq, /* interrupt number (ignored) */ 
	/* Fall through and check for other interrupt sources */

	/* Fall through and check for other interrupt sources */

#endif /* USE_DMA */

#endif /* USE_DMA */





	status = RtdInterruptStatus(dev);

	status = readw(devpriv->las0 + LAS0_IT);

	/* if interrupt was not caused by our board, or handled above */

	/* if interrupt was not caused by our board, or handled above */

	if (0 == status)

	if (0 == status)

		return IRQ_HANDLED;

		return IRQ_HANDLED;
@@ -1175,7 +1171,7 @@ static irqreturn_t rtd_interrupt(int irq, /* interrupt number (ignored) */ 
	comedi_event(dev, s);

	comedi_event(dev, s);





	/* clear the interrupt */

	/* clear the interrupt */

	status = RtdInterruptStatus(dev);

	status = readw(devpriv->las0 + LAS0_IT);

	RtdInterruptClearMask(dev, status);

	RtdInterruptClearMask(dev, status);

	RtdInterruptClear(dev);

	RtdInterruptClear(dev);
@@ -1627,7 +1623,7 @@ static int rtd_ai_cancel(struct comedi_device *dev, struct comedi_subdevice *s) 
		devpriv->flags &= ~DMA0_ACTIVE;

		devpriv->flags &= ~DMA0_ACTIVE;

	}

	}

#endif /* USE_DMA */

#endif /* USE_DMA */

	status = RtdInterruptStatus(dev);

	status = readw(devpriv->las0 + LAS0_IT);

	DPRINTK

	DPRINTK

	    ("rtd520: Acquisition canceled. %ld ints, intStat=%x, overStat=%x\n",

	    ("rtd520: Acquisition canceled. %ld ints, intStat=%x, overStat=%x\n",

	     devpriv->intCount, status,

	     devpriv->intCount, status,