From: H Hartley Sweeten Date: Mon, 22 Apr 2013 19:34:13 +0000 (-0700) Subject: staging: comedi: ni_labpc: remove unnecessary 'bustype' check X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=3a0a73b3c884ef43487d6c3b43af077d6da124b7;p=openwrt%2Fstaging%2Fblogic.git 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 Reviewed-by: Ian Abbott 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 365149a2ef73..5630be33d452 100644 --- a/drivers/staging/comedi/drivers/ni_labpc.c +++ b/drivers/staging/comedi/drivers/ni_labpc.c @@ -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