Commit 3a0a73b3 authored Apr 22, 2013 by H Hartley Sweeten Committed by Greg Kroah-Hartman Apr 23, 2013

staging: comedi: ni_labpc: remove unnecessary 'bustype' check



Only the ISA versions of the LabPC boards support DMA and the
devpriv->dma_chan is only set during the ISA board attach if
DMA is available. The extra check of the board->bustype is not
necessary in labpc_ai_cmd().

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Reviewed-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

parent 3e034797

drivers/staging/comedi/drivers/ni_labpc.c

+1 −3

Original line number	Diff line number	Diff line
		@@ -893,9 +893,7 @@ static int labpc_ai_cmd(struct comedi_device dev, struct comedi_subdevice s)
		* dma unsafe at RT priority,
		* and too much setup time for TRIG_WAKE_EOS for
		*/
		(cmd->flags & (TRIG_WAKE_EOS \| TRIG_RT)) == 0 &&
		/* only available on the isa boards */
		board->bustype == isa_bustype) {
		(cmd->flags & (TRIG_WAKE_EOS \| TRIG_RT)) == 0) {
		xfer = isa_dma_transfer;
		/* pc-plus has no fifo-half full interrupt */
		} else