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 10/18] staging: comedi: amplc_pci224: reduce leading whitespace in a few places
Date: Thu, 31 Jul 2014 14:47:47 +0100 [thread overview]
Message-ID: <1406814475-5923-11-git-send-email-abbotti@mev.co.uk> (raw)
In-Reply-To: <1406814475-5923-1-git-send-email-abbotti@mev.co.uk>
Signed-off-by: Ian Abbott <abbotti@mev.co.uk>
---
drivers/staging/comedi/drivers/amplc_pci224.c | 53 +++++++++++++--------------
1 file changed, 25 insertions(+), 28 deletions(-)
diff --git a/drivers/staging/comedi/drivers/amplc_pci224.c b/drivers/staging/comedi/drivers/amplc_pci224.c
index a7f3454..68fc407 100644
--- a/drivers/staging/comedi/drivers/amplc_pci224.c
+++ b/drivers/staging/comedi/drivers/amplc_pci224.c
@@ -500,11 +500,10 @@ static void pci224_ao_stop(struct comedi_device *dev,
spin_unlock_irqrestore(&devpriv->ao_spinlock, flags);
/* Reconfigure DAC for insn_write usage. */
outw(0, dev->iobase + PCI224_DACCEN); /* Disable channels. */
- devpriv->daccon = COMBINE(devpriv->daccon,
- PCI224_DACCON_TRIG_SW |
- PCI224_DACCON_FIFOINTR_EMPTY,
- PCI224_DACCON_TRIG_MASK |
- PCI224_DACCON_FIFOINTR_MASK);
+ devpriv->daccon =
+ COMBINE(devpriv->daccon,
+ PCI224_DACCON_TRIG_SW | PCI224_DACCON_FIFOINTR_EMPTY,
+ PCI224_DACCON_TRIG_MASK | PCI224_DACCON_FIFOINTR_MASK);
outw(devpriv->daccon | PCI224_DACCON_FIFORESET,
dev->iobase + PCI224_DACCON);
}
@@ -644,8 +643,8 @@ static void pci224_ao_handle_fifo(struct comedi_device *dev,
else
trig = PCI224_DACCON_TRIG_EXTP;
}
- devpriv->daccon = COMBINE(devpriv->daccon, trig,
- PCI224_DACCON_TRIG_MASK);
+ devpriv->daccon =
+ COMBINE(devpriv->daccon, trig, PCI224_DACCON_TRIG_MASK);
outw(devpriv->daccon, dev->iobase + PCI224_DACCON);
}
@@ -717,11 +716,11 @@ pci224_ao_cmdtest(struct comedi_device *dev, struct comedi_subdevice *s,
err |= cfc_check_trigger_src(&cmd->start_src, TRIG_INT | TRIG_EXT);
err |= cfc_check_trigger_src(&cmd->scan_begin_src,
- TRIG_EXT | TRIG_TIMER);
+ TRIG_EXT | TRIG_TIMER);
err |= cfc_check_trigger_src(&cmd->convert_src, TRIG_NOW);
err |= cfc_check_trigger_src(&cmd->scan_end_src, TRIG_COUNT);
err |= cfc_check_trigger_src(&cmd->stop_src,
- TRIG_COUNT | TRIG_EXT | TRIG_NONE);
+ TRIG_COUNT | TRIG_EXT | TRIG_NONE);
if (err)
return 1;
@@ -760,8 +759,8 @@ pci224_ao_cmdtest(struct comedi_device *dev, struct comedi_subdevice *s,
case TRIG_EXT:
/* Force to external trigger 0. */
if (cmd->start_arg & ~CR_FLAGS_MASK) {
- cmd->start_arg = COMBINE(cmd->start_arg, 0,
- ~CR_FLAGS_MASK);
+ cmd->start_arg =
+ COMBINE(cmd->start_arg, 0, ~CR_FLAGS_MASK);
err |= -EINVAL;
}
/* The only flag allowed is CR_EDGE, which is ignored. */
@@ -786,16 +785,16 @@ pci224_ao_cmdtest(struct comedi_device *dev, struct comedi_subdevice *s,
case TRIG_EXT:
/* Force to external trigger 0. */
if (cmd->scan_begin_arg & ~CR_FLAGS_MASK) {
- cmd->scan_begin_arg = COMBINE(cmd->scan_begin_arg, 0,
- ~CR_FLAGS_MASK);
+ cmd->scan_begin_arg =
+ COMBINE(cmd->scan_begin_arg, 0, ~CR_FLAGS_MASK);
err |= -EINVAL;
}
/* Only allow flags CR_EDGE and CR_INVERT. Ignore CR_EDGE. */
if (cmd->scan_begin_arg & CR_FLAGS_MASK &
~(CR_EDGE | CR_INVERT)) {
- cmd->scan_begin_arg = COMBINE(cmd->scan_begin_arg, 0,
- CR_FLAGS_MASK &
- ~(CR_EDGE | CR_INVERT));
+ cmd->scan_begin_arg =
+ COMBINE(cmd->scan_begin_arg, 0,
+ CR_FLAGS_MASK & ~(CR_EDGE | CR_INVERT));
err |= -EINVAL;
}
break;
@@ -811,14 +810,14 @@ pci224_ao_cmdtest(struct comedi_device *dev, struct comedi_subdevice *s,
case TRIG_EXT:
/* Force to external trigger 0. */
if (cmd->stop_arg & ~CR_FLAGS_MASK) {
- cmd->stop_arg = COMBINE(cmd->stop_arg, 0,
- ~CR_FLAGS_MASK);
+ cmd->stop_arg =
+ COMBINE(cmd->stop_arg, 0, ~CR_FLAGS_MASK);
err |= -EINVAL;
}
/* The only flag allowed is CR_EDGE, which is ignored. */
if (cmd->stop_arg & CR_FLAGS_MASK & ~CR_EDGE) {
- cmd->stop_arg = COMBINE(cmd->stop_arg, 0,
- CR_FLAGS_MASK & ~CR_EDGE);
+ cmd->stop_arg =
+ COMBINE(cmd->stop_arg, 0, CR_FLAGS_MASK & ~CR_EDGE);
}
break;
case TRIG_NONE:
@@ -924,14 +923,12 @@ static int pci224_ao_cmd(struct comedi_device *dev, struct comedi_subdevice *s)
*
* N.B. DAC FIFO interrupts are currently disabled.
*/
- devpriv->daccon = COMBINE(devpriv->daccon,
- devpriv->hwrange[range] |
- PCI224_DACCON_TRIG_NONE |
- PCI224_DACCON_FIFOINTR_NHALF,
- PCI224_DACCON_POLAR_MASK |
- PCI224_DACCON_VREF_MASK |
- PCI224_DACCON_TRIG_MASK |
- PCI224_DACCON_FIFOINTR_MASK);
+ devpriv->daccon =
+ COMBINE(devpriv->daccon,
+ devpriv->hwrange[range] | PCI224_DACCON_TRIG_NONE |
+ PCI224_DACCON_FIFOINTR_NHALF,
+ PCI224_DACCON_POLAR_MASK | PCI224_DACCON_VREF_MASK |
+ PCI224_DACCON_TRIG_MASK | PCI224_DACCON_FIFOINTR_MASK);
outw(devpriv->daccon | PCI224_DACCON_FIFORESET,
dev->iobase + PCI224_DACCON);
--
2.0.0
next prev parent reply other threads:[~2014-07-31 13:51 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-07-31 13:47 [PATCH 00/18] staging: comedi: amplc_pci224: remove legacy stuff Ian Abbott
2014-07-31 13:47 ` [PATCH 01/18] staging: comedi: amplc_pci224: reformat some comments Ian Abbott
2014-07-31 13:47 ` [PATCH 02/18] staging: comedi: amplc_pci224: fix checkpatch line over 80 characters Ian Abbott
2014-07-31 13:47 ` [PATCH 03/18] staging: comedi: amplc_pci224: blank lines aren't necessary before a close brace '}' Ian Abbott
2014-07-31 13:47 ` [PATCH 04/18] staging: comedi: amplc_pci224: multiple assignments should be avoided Ian Abbott
2014-07-31 13:47 ` [PATCH 05/18] staging: comedi: amplc_pci224: fix spinlock_t definition without comment Ian Abbott
2014-07-31 13:47 ` [PATCH 06/18] staging: comedi: amplc_pci224: add whitespace to pci224_boards[] Ian Abbott
2014-07-31 13:47 ` [PATCH 07/18] staging: comedi: amplc_pci224: set a more descriptive MODULE_DESCRIPTION() Ian Abbott
2014-07-31 13:47 ` [PATCH 08/18] staging: comedi: amplc_pci224: omit '!= 0' from logical expressions Ian Abbott
2014-07-31 13:47 ` [PATCH 09/18] staging: comedi: amplc_pci224: remove some unnecessary parentheses Ian Abbott
2014-07-31 13:47 ` Ian Abbott [this message]
2014-07-31 13:47 ` [PATCH 11/18] staging: comedi: amplc_pci224: no need for '&function' Ian Abbott
2014-07-31 13:47 ` [PATCH 12/18] staging: comedi: amplc_pci224: remove options to select output ranges Ian Abbott
2014-07-31 13:47 ` [PATCH 13/18] staging: comedi: amplc_pci224: remove "legacy" attach mechanism Ian Abbott
2014-07-31 13:47 ` [PATCH 14/18] staging: comedi: amplc_pci224: no need to manipulate PCI ref count Ian Abbott
2014-07-31 13:47 ` [PATCH 15/18] staging: comedi: amplc_pci224: put board indices in PCI driver_data Ian Abbott
2014-07-31 13:47 ` [PATCH 16/18] staging: comedi: amplc_pci224: remove PCI_DEVICE_ID_... macros Ian Abbott
2014-07-31 13:47 ` [PATCH 17/18] staging: comedi: amplc_pci224: absorb pci224_attach_common() Ian Abbott
2014-07-31 13:47 ` [PATCH 18/18] staging: comedi: amplc_pci224: no need to comedi_set_hw_dev() here Ian Abbott
2014-07-31 20:28 ` [PATCH 00/18] staging: comedi: amplc_pci224: remove legacy stuff Hartley Sweeten
2014-07-31 20:44 ` Hartley Sweeten
2014-08-04 10:57 ` Ian Abbott
2014-08-04 11:14 ` [PATCH 15/18 v2] staging: comedi: amplc_pci224: put board indices in PCI driver_data Ian Abbott
2014-08-04 16:38 ` 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=1406814475-5923-11-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: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®