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

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

staging: comedi: ni_labpc: move declaration of local var 'irq_flags' 



In labpc_ai_cmd(), move the declaration of the local variable
'irq_flags' to remove the need for the extra #ifdef/#endif.

Signed-off-by: default avatarH Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 147a85d7

drivers/staging/comedi/drivers/ni_labpc.c

+2 −3
Original line number Diff line number Diff line
@@ -851,9 +851,6 @@ static int labpc_ai_cmd(struct comedi_device *dev, struct comedi_subdevice *s) 
	const struct labpc_boardinfo *board = comedi_board(dev);

	struct labpc_private *devpriv = dev->private;

	int channel, range, aref;

#ifdef CONFIG_ISA_DMA_API

	unsigned long irq_flags;

#endif

	int ret;

	struct comedi_async *async = s->async;

	struct comedi_cmd *cmd = &async->cmd;
@@ -1026,6 +1023,8 @@ static int labpc_ai_cmd(struct comedi_device *dev, struct comedi_subdevice *s) 
#ifdef CONFIG_ISA_DMA_API

	/*  set up dma transfer */

	if (xfer == isa_dma_transfer) {

		unsigned long irq_flags;



		irq_flags = claim_dma_lock();

		disable_dma(devpriv->dma_chan);

		/* clear flip-flop to make sure 2-byte registers for