From: H Hartley Sweeten Date: Fri, 22 Mar 2013 16:46:53 +0000 (-0700) Subject: staging: comedi: ni_labpc: move declaration of local var 'irq_flags' X-Git-Tag: firefly_0821_release~3680^2~674^2~462 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=fe7fc72af7df7120e1897fc07a05e247364b3a50;p=firefly-linux-kernel-4.4.55.git 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: H Hartley Sweeten Cc: Ian Abbott Cc: Greg Kroah-Hartman Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/comedi/drivers/ni_labpc.c b/drivers/staging/comedi/drivers/ni_labpc.c index 54669b46e7e2..f9c720938e27 100644 --- a/drivers/staging/comedi/drivers/ni_labpc.c +++ b/drivers/staging/comedi/drivers/ni_labpc.c @@ -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