From: Ian Abbott <abbotti@mev.co.uk> To: driverdev-devel@linuxdriverproject.org Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>, Ian Abbott <abbotti@mev.co.uk>, H Hartley Sweeten <hartleys@visionengravers.com>, linux-kernel@vger.kernel.org Subject: [PATCH 25/28] staging: comedi: amplc_pci230: reduce indentation in pci230_ai_inttrig_convert() Date: Mon, 1 Sep 2014 12:03:57 +0100 [thread overview] Message-ID: <1409569440-10979-26-git-send-email-abbotti@mev.co.uk> (raw) In-Reply-To: <1409569440-10979-1-git-send-email-abbotti@mev.co.uk> Signed-off-by: Ian Abbott <abbotti@mev.co.uk> --- drivers/staging/comedi/drivers/amplc_pci230.c | 54 +++++++++++++-------------- 1 file changed, 25 insertions(+), 29 deletions(-) diff --git a/drivers/staging/comedi/drivers/amplc_pci230.c b/drivers/staging/comedi/drivers/amplc_pci230.c index e0b40b3..b0313c8 100644 --- a/drivers/staging/comedi/drivers/amplc_pci230.c +++ b/drivers/staging/comedi/drivers/amplc_pci230.c @@ -1802,43 +1802,39 @@ static int pci230_ai_inttrig_convert(struct comedi_device *dev, { struct pci230_private *devpriv = dev->private; unsigned long irqflags; + unsigned int delayus; if (trig_num) return -EINVAL; spin_lock_irqsave(&devpriv->ai_stop_spinlock, irqflags); - if (devpriv->ai_cmd_started) { - unsigned int delayus; - - /* - * Trigger conversion by toggling Z2-CT2 output. - * Finish with output high. - */ - i8254_set_mode(dev->iobase + PCI230_Z2_CT_BASE, 0, - 2, I8254_MODE0); - i8254_set_mode(dev->iobase + PCI230_Z2_CT_BASE, 0, - 2, I8254_MODE1); - /* - * Delay. Should driver be responsible for this? An - * alternative would be to wait until conversion is complete, - * but we can't tell when it's complete because the ADC busy - * bit has a different meaning when FIFO enabled (and when - * FIFO not enabled, it only works for software triggers). - */ - if ((devpriv->adccon & PCI230_ADC_IM_MASK) == - PCI230_ADC_IM_DIF && devpriv->hwver == 0) { - /* PCI230/260 in differential mode */ - delayus = 8; - } else { - /* single-ended or PCI230+/260+ */ - delayus = 4; - } + if (!devpriv->ai_cmd_started) { spin_unlock_irqrestore(&devpriv->ai_stop_spinlock, irqflags); - udelay(delayus); + return 1; + } + /* + * Trigger conversion by toggling Z2-CT2 output. + * Finish with output high. + */ + i8254_set_mode(dev->iobase + PCI230_Z2_CT_BASE, 0, 2, I8254_MODE0); + i8254_set_mode(dev->iobase + PCI230_Z2_CT_BASE, 0, 2, I8254_MODE1); + /* + * Delay. Should driver be responsible for this? An + * alternative would be to wait until conversion is complete, + * but we can't tell when it's complete because the ADC busy + * bit has a different meaning when FIFO enabled (and when + * FIFO not enabled, it only works for software triggers). + */ + if ((devpriv->adccon & PCI230_ADC_IM_MASK) == PCI230_ADC_IM_DIF && + devpriv->hwver == 0) { + /* PCI230/260 in differential mode */ + delayus = 8; } else { - spin_unlock_irqrestore(&devpriv->ai_stop_spinlock, irqflags); + /* single-ended or PCI230+/260+ */ + delayus = 4; } - + spin_unlock_irqrestore(&devpriv->ai_stop_spinlock, irqflags); + udelay(delayus); return 1; } -- 2.0.4
WARNING: multiple messages have this Message-ID (diff)
From: Ian Abbott <abbotti@mev.co.uk> To: driverdev-devel@linuxdriverproject.org Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>, Ian Abbott <abbotti@mev.co.uk>, linux-kernel@vger.kernel.org Subject: [PATCH 25/28] staging: comedi: amplc_pci230: reduce indentation in pci230_ai_inttrig_convert() Date: Mon, 1 Sep 2014 12:03:57 +0100 [thread overview] Message-ID: <1409569440-10979-26-git-send-email-abbotti@mev.co.uk> (raw) In-Reply-To: <1409569440-10979-1-git-send-email-abbotti@mev.co.uk> Signed-off-by: Ian Abbott <abbotti@mev.co.uk> Reviewed-by: H Hartley Sweeten <hsweeten@visionengravers.com> --- drivers/staging/comedi/drivers/amplc_pci230.c | 54 +++++++++++++-------------- 1 file changed, 25 insertions(+), 29 deletions(-) diff --git a/drivers/staging/comedi/drivers/amplc_pci230.c b/drivers/staging/comedi/drivers/amplc_pci230.c index e0b40b3..b0313c8 100644 --- a/drivers/staging/comedi/drivers/amplc_pci230.c +++ b/drivers/staging/comedi/drivers/amplc_pci230.c @@ -1802,43 +1802,39 @@ static int pci230_ai_inttrig_convert(struct comedi_device *dev, { struct pci230_private *devpriv = dev->private; unsigned long irqflags; + unsigned int delayus; if (trig_num) return -EINVAL; spin_lock_irqsave(&devpriv->ai_stop_spinlock, irqflags); - if (devpriv->ai_cmd_started) { - unsigned int delayus; - - /* - * Trigger conversion by toggling Z2-CT2 output. - * Finish with output high. - */ - i8254_set_mode(dev->iobase + PCI230_Z2_CT_BASE, 0, - 2, I8254_MODE0); - i8254_set_mode(dev->iobase + PCI230_Z2_CT_BASE, 0, - 2, I8254_MODE1); - /* - * Delay. Should driver be responsible for this? An - * alternative would be to wait until conversion is complete, - * but we can't tell when it's complete because the ADC busy - * bit has a different meaning when FIFO enabled (and when - * FIFO not enabled, it only works for software triggers). - */ - if ((devpriv->adccon & PCI230_ADC_IM_MASK) == - PCI230_ADC_IM_DIF && devpriv->hwver == 0) { - /* PCI230/260 in differential mode */ - delayus = 8; - } else { - /* single-ended or PCI230+/260+ */ - delayus = 4; - } + if (!devpriv->ai_cmd_started) { spin_unlock_irqrestore(&devpriv->ai_stop_spinlock, irqflags); - udelay(delayus); + return 1; + } + /* + * Trigger conversion by toggling Z2-CT2 output. + * Finish with output high. + */ + i8254_set_mode(dev->iobase + PCI230_Z2_CT_BASE, 0, 2, I8254_MODE0); + i8254_set_mode(dev->iobase + PCI230_Z2_CT_BASE, 0, 2, I8254_MODE1); + /* + * Delay. Should driver be responsible for this? An + * alternative would be to wait until conversion is complete, + * but we can't tell when it's complete because the ADC busy + * bit has a different meaning when FIFO enabled (and when + * FIFO not enabled, it only works for software triggers). + */ + if ((devpriv->adccon & PCI230_ADC_IM_MASK) == PCI230_ADC_IM_DIF && + devpriv->hwver == 0) { + /* PCI230/260 in differential mode */ + delayus = 8; } else { - spin_unlock_irqrestore(&devpriv->ai_stop_spinlock, irqflags); + /* single-ended or PCI230+/260+ */ + delayus = 4; } - + spin_unlock_irqrestore(&devpriv->ai_stop_spinlock, irqflags); + udelay(delayus); return 1; } -- 2.0.4 _______________________________________________ devel mailing list devel@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
next prev parent reply other threads:[~2014-09-01 11:04 UTC|newest] Thread overview: 60+ messages / expand[flat|nested] mbox.gz Atom feed top 2014-09-01 11:03 [PATCH 00/28] staging: comedi: more clean-up and remove legacy attach Ian Abbott 2014-09-01 11:03 ` Ian Abbott 2014-09-01 11:03 ` [PATCH 01/28] staging: comedi: amplc_pci230: update MODULE_DESCRIPTION() Ian Abbott 2014-09-01 11:03 ` Ian Abbott 2014-09-01 11:03 ` [PATCH 02/28] staging: comedi: amplc_pci230: don't use multiple blank lines Ian Abbott 2014-09-01 11:03 ` Ian Abbott 2014-09-01 11:03 ` [PATCH 03/28] staging: comedi: amplc_pci230: remove some unnecessary parentheses Ian Abbott 2014-09-01 11:03 ` Ian Abbott 2014-09-01 11:03 ` [PATCH 04/28] staging: comedi: amplc_pci230: collapse some 'else { if' chains Ian Abbott 2014-09-01 11:03 ` Ian Abbott 2014-09-01 11:03 ` [PATCH 05/28] staging: comedi: amplc_pci230: remove "legacy" attach mechanism Ian Abbott 2014-09-01 11:03 ` Ian Abbott 2014-09-01 11:03 ` [PATCH 06/28] staging: comedi: amplc_pci230: no need to manipulate PCI ref count Ian Abbott 2014-09-01 11:03 ` Ian Abbott 2014-09-01 11:03 ` [PATCH 07/28] staging: comedi: amplc_pci230: set detach handler to comedi_pci_detach() Ian Abbott 2014-09-01 11:03 ` Ian Abbott 2014-09-01 11:03 ` [PATCH 08/28] staging: comedi: amplc_pci230: absorb pci230_attach_common() Ian Abbott 2014-09-01 11:03 ` Ian Abbott 2014-09-01 11:03 ` [PATCH 09/28] staging: comedi: amplc_pci230: no need to comedi_set_hw_dev() here Ian Abbott 2014-09-01 11:03 ` Ian Abbott 2014-09-01 11:03 ` [PATCH 10/28] staging: comedi: amplc_pci230: absorb pci230_alloc_private() Ian Abbott 2014-09-01 11:03 ` Ian Abbott 2014-09-01 11:03 ` [PATCH 11/28] staging: comedi: amplc_pci230: remove ai_chans member Ian Abbott 2014-09-01 11:03 ` Ian Abbott 2014-09-01 11:03 ` [PATCH 12/28] staging: comedi: amplc_pci230: remove ao_chans member Ian Abbott 2014-09-01 11:03 ` Ian Abbott 2014-09-01 11:03 ` [PATCH 13/28] staging: comedi: amplc_pci230: shrink struct pci230_board Ian Abbott 2014-09-01 11:03 ` Ian Abbott 2014-09-01 11:03 ` [PATCH 14/28] staging: comedi: amplc_pci230: simplify pci230_ao_mangle_datum() Ian Abbott 2014-09-01 11:03 ` Ian Abbott 2014-09-01 11:03 ` [PATCH 15/28] staging: comedi: amplc_pci230: simplify pci230_ai_read() Ian Abbott 2014-09-01 11:03 ` Ian Abbott 2014-09-01 11:03 ` [PATCH 16/28] staging: comedi: amplc_pci230: remove 'inline' Ian Abbott 2014-09-01 11:03 ` Ian Abbott 2014-09-01 11:03 ` [PATCH 17/28] staging: comedi: amplc_pci230: rename pci230_ai_rinsn() Ian Abbott 2014-09-01 11:03 ` Ian Abbott 2014-09-01 11:03 ` [PATCH 18/28] staging: comedi: amplc_pci230: add `pci230_` prefix to functions Ian Abbott 2014-09-01 11:03 ` Ian Abbott 2014-09-01 11:03 ` [PATCH 19/28] staging: comedi: amplc_pci230: use comedi_range_is_bipolar() Ian Abbott 2014-09-01 11:03 ` Ian Abbott 2014-09-01 11:03 ` [PATCH 20/28] staging: comedi: amplc_pci230: make `intr_running` a bitfield Ian Abbott 2014-09-01 11:03 ` Ian Abbott 2014-09-01 11:03 ` [PATCH 21/28] staging: comedi: amplc_pci230: replace `state` member with bitfields Ian Abbott 2014-09-01 11:03 ` Ian Abbott 2014-09-01 11:03 ` [PATCH 22/28] staging: comedi: amplc_pci230: rewrite shared resource handling Ian Abbott 2014-09-01 11:03 ` Ian Abbott 2014-09-01 11:03 ` [PATCH 23/28] staging: comedi: amplc_pci230: reduce indentation in pci230_ao_inttrig_scan_begin() Ian Abbott 2014-09-01 11:03 ` Ian Abbott 2014-09-01 11:03 ` [PATCH 24/28] staging: comedi: amplc_pci230: reduce indentation in pci230_ao_start() Ian Abbott 2014-09-01 11:03 ` Ian Abbott 2014-09-01 11:03 ` Ian Abbott [this message] 2014-09-01 11:03 ` [PATCH 25/28] staging: comedi: amplc_pci230: reduce indentation in pci230_ai_inttrig_convert() Ian Abbott 2014-09-01 11:03 ` [PATCH 26/28] staging: comedi: amplc_pci230: reduce indentation in pci230_ai_start() Ian Abbott 2014-09-01 11:03 ` Ian Abbott 2014-09-01 11:03 ` [PATCH 27/28] staging: comedi: amplc_pci230: change pci230_handle_ao_fifo() return type Ian Abbott 2014-09-01 11:03 ` Ian Abbott 2014-09-01 11:04 ` [PATCH 28/28] staging: comedi: amplc_pci230: simplify interrupt enable handling Ian Abbott 2014-09-01 11:04 ` Ian Abbott 2014-09-02 17:43 ` [PATCH 00/28] staging: comedi: more clean-up and remove legacy attach Hartley Sweeten 2014-09-02 17:43 ` Hartley Sweeten
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=1409569440-10979-26-git-send-email-abbotti@mev.co.uk \ --to=abbotti@mev.co.uk \ --cc=driverdev-devel@linuxdriverproject.org \ --cc=gregkh@linuxfoundation.org \ --cc=hartleys@visionengravers.com \ --cc=linux-kernel@vger.kernel.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.