Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754845AbbGXRFc (ORCPT ); Fri, 24 Jul 2015 13:05:32 -0400 Received: from sidious.london.02.net ([82.132.130.152]:42064 "EHLO mail.o2.co.uk" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1754295AbbGXRFa (ORCPT ); Fri, 24 Jul 2015 13:05:30 -0400 Message-ID: <55B26EC8.6090703@berndporr.me.uk> Date: Fri, 24 Jul 2015 17:58:48 +0100 From: Bernd Porr User-Agent: Thunderbird 2.0.0.24 (X11/20100228) MIME-Version: 1.0 To: Ian Abbott CC: driverdev-devel@linuxdriverproject.org, Greg Kroah-Hartman , H Hartley Sweeten , linux-kernel@vger.kernel.org Subject: Re: [PATCH 3/6] staging: comedi: usbduxsigma: remove AI scan_begin_src == TRIG_FOLLOW References: <1437666422-25222-1-git-send-email-abbotti@mev.co.uk> <1437666422-25222-4-git-send-email-abbotti@mev.co.uk> In-Reply-To: <1437666422-25222-4-git-send-email-abbotti@mev.co.uk> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 3387 Lines: 91 Reviewed-by: Bernd Porr Ian Abbott wrote: > The AI subdevice `cmdtest` handler `usbduxsigma_ai_cmdtest()` ensures > that `cmd->scan_begin_src == TRIG_TIMER` by the end of step 2 of the > command checking code, so assume that this is the case for step 3 > onwards and remove the redundant code. > > Signed-off-by: Ian Abbott > --- > drivers/staging/comedi/drivers/usbduxsigma.c | 47 +++++++++++----------------- > 1 file changed, 19 insertions(+), 28 deletions(-) > > diff --git a/drivers/staging/comedi/drivers/usbduxsigma.c b/drivers/staging/comedi/drivers/usbduxsigma.c > index dc0b25a..65a0df4 100644 > --- a/drivers/staging/comedi/drivers/usbduxsigma.c > +++ b/drivers/staging/comedi/drivers/usbduxsigma.c > @@ -481,6 +481,7 @@ static int usbduxsigma_ai_cmdtest(struct comedi_device *dev, > struct usbduxsigma_private *devpriv = dev->private; > int high_speed = devpriv->high_speed; > int interval = usbduxsigma_chans_to_interval(cmd->chanlist_len); > + unsigned int tmp; > int err = 0; > > /* Step 1 : check if triggers are trivially valid */ > @@ -508,36 +509,26 @@ static int usbduxsigma_ai_cmdtest(struct comedi_device *dev, > > err |= comedi_check_trigger_arg_is(&cmd->start_arg, 0); > > - if (cmd->scan_begin_src == TRIG_FOLLOW) /* internal trigger */ > - err |= comedi_check_trigger_arg_is(&cmd->scan_begin_arg, 0); > + if (high_speed) { > + /* > + * In high speed mode microframes are possible. > + * However, during one microframe we can roughly > + * sample two channels. Thus, the more channels > + * are in the channel list the more time we need. > + */ > + err |= comedi_check_trigger_arg_min(&cmd->scan_begin_arg, > + (125000 * interval)); > > - if (cmd->scan_begin_src == TRIG_TIMER) { > - unsigned int tmp; > - > - if (high_speed) { > - /* > - * In high speed mode microframes are possible. > - * However, during one microframe we can roughly > - * sample two channels. Thus, the more channels > - * are in the channel list the more time we need. > - */ > - err |= comedi_check_trigger_arg_min(&cmd-> > - scan_begin_arg, > - (1000000 / 8 * > - interval)); > - > - tmp = (cmd->scan_begin_arg / 125000) * 125000; > - } else { > - /* full speed */ > - /* 1kHz scans every USB frame */ > - err |= comedi_check_trigger_arg_min(&cmd-> > - scan_begin_arg, > - 1000000); > - > - tmp = (cmd->scan_begin_arg / 1000000) * 1000000; > - } > - err |= comedi_check_trigger_arg_is(&cmd->scan_begin_arg, tmp); > + tmp = (cmd->scan_begin_arg / 125000) * 125000; > + } else { > + /* full speed */ > + /* 1kHz scans every USB frame */ > + err |= comedi_check_trigger_arg_min(&cmd->scan_begin_arg, > + 1000000); > + > + tmp = (cmd->scan_begin_arg / 1000000) * 1000000; > } > + err |= comedi_check_trigger_arg_is(&cmd->scan_begin_arg, tmp); > > err |= comedi_check_trigger_arg_is(&cmd->scan_end_arg, > cmd->chanlist_len); -- http://www.berndporr.me.uk http://www.linux-usb-daq.co.uk http://www.imdb.com/name/nm3293421/ +44 (0)7840 340069 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/