From: Jason Wong <tsanghan@gmail.com>
To: gregkh@suse.de
Cc: devel@driverdev.osuosl.org, linux-kernel@vger.kernel.org,
Jason Wong <tsanghan@gmail.com>
Subject: [PATCH 5/9] Staging: comedi: adv_pci1710: fixed multiple brace coding style issue
Date: Sat, 13 Mar 2010 22:53:30 +0800 [thread overview]
Message-ID: <1268492014-6355-6-git-send-email-tsanghan@gmail.com> (raw)
In-Reply-To: <Jason Wong <tsanghan@gmail.com>
Fixed multiple coding style issue.
Signed-off-by: Jason Wong <tsanghan@gmail.com>
---
drivers/staging/comedi/drivers/adv_pci1710.c | 22 +++++++++++-----------
1 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/drivers/staging/comedi/drivers/adv_pci1710.c b/drivers/staging/comedi/drivers/adv_pci1710.c
index 394d2ea..f5bb286 100644
--- a/drivers/staging/comedi/drivers/adv_pci1710.c
+++ b/drivers/staging/comedi/drivers/adv_pci1710.c
@@ -657,9 +657,9 @@ static void interrupt_pci1710_every_sample(void *d)
#endif
++s->async->cur_chan;
- if (s->async->cur_chan >= devpriv->ai_n_chan) {
+ if (s->async->cur_chan >= devpriv->ai_n_chan)
s->async->cur_chan = 0;
- }
+
if (s->async->cur_chan == 0) { /* one scan done */
devpriv->ai_act_scan++;
@@ -863,12 +863,12 @@ static int pci171x_ai_docmd_and_mode(int mode, struct comedi_device *dev,
devpriv->ai_eos = 0;
}
- if ((devpriv->ai_scans == 0) || (devpriv->ai_scans == -1)) {
+ if ((devpriv->ai_scans == 0) || (devpriv->ai_scans == -1))
devpriv->neverending_ai = 1;
- } /* well, user want neverending */
- else {
+ /* well, user want neverending */
+ else
devpriv->neverending_ai = 0;
- }
+
switch (mode) {
case 1:
case 2:
@@ -1109,11 +1109,11 @@ static int pci171x_ai_cmd(struct comedi_device *dev, struct comedi_subdevice *s)
devpriv->ai_timer1 = 0;
devpriv->ai_timer2 = 0;
- if (cmd->stop_src == TRIG_COUNT) {
+ if (cmd->stop_src == TRIG_COUNT)
devpriv->ai_scans = cmd->stop_arg;
- } else {
+ else
devpriv->ai_scans = 0;
- }
+
if (cmd->scan_begin_src == TRIG_FOLLOW) { /* mode 1, 2, 3 */
if (cmd->convert_src == TRIG_TIMER) { /* mode 1 and 2 */
@@ -1593,9 +1593,9 @@ static int pci1710_detach(struct comedi_device *dev)
if (dev->irq)
free_irq(dev->irq, dev);
if (devpriv->pcidev) {
- if (dev->iobase) {
+ if (dev->iobase)
comedi_pci_disable(devpriv->pcidev);
- }
+
pci_dev_put(devpriv->pcidev);
}
}
--
1.7.0
next prev parent reply other threads:[~2010-03-13 14:55 UTC|newest]
Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <Jason Wong <tsanghan@gmail.com>
2010-03-13 14:53 ` Staging: comedi drivers patches Jason Wong
2010-03-13 14:53 ` [PATCH 1/9] Staging: comedi: amplc_pci224: fixed multiple brace coding style issue Jason Wong
2010-03-13 14:53 ` [PATCH 2/9] Staging: comedi: amplc_pci230: fix " Jason Wong
2010-03-13 14:53 ` [PATCH 3/9] Staging: comedi: adl_pci9111: fixed multiple " Jason Wong
2010-03-13 14:53 ` [PATCH 4/9] Staging: comedi: adl_pci9118: " Jason Wong
2010-03-13 14:53 ` Jason Wong [this message]
2010-03-13 14:53 ` [PATCH 6/9] Staging: comedi: adv_pci_dio: " Jason Wong
2010-03-13 14:53 ` [PATCH 7/9] Staging: comedi: cb_das16_cs: " Jason Wong
2010-03-13 14:53 ` [PATCH 8/9] Staging: comedi: cb_pcidas64: " Jason Wong
2010-03-13 14:53 ` [PATCH 9/9] Staging: comedi: cb_pcidas64: fixed a coding style missed in the previosu patch Jason Wong
2010-03-20 18:14 ` Staging: comedi drivers patches Jason Wong
2010-03-20 18:14 ` [PATCH 1/9] Staging: comedi: amplc_pci224: fixed multiple brace coding style issue Jason Wong
2010-03-20 18:14 ` [PATCH 2/9] Staging: comedi: amplc_pci230: fix " Jason Wong
2010-03-20 18:14 ` [PATCH 3/9] Staging: comedi: adl_pci9111: fixed multiple " Jason Wong
2010-03-20 18:14 ` [PATCH 4/9] Staging: comedi: adl_pci9118: " Jason Wong
2010-03-20 18:14 ` [PATCH 5/9] Staging: comedi: adv_pci1710: " Jason Wong
2010-03-20 18:14 ` [PATCH 6/9] Staging: comedi: adv_pci_dio: " Jason Wong
2010-03-20 18:14 ` [PATCH 7/9] Staging: comedi: cb_das16_cs: " Jason Wong
2010-03-20 18:14 ` [PATCH 8/9] Staging: comedi: cb_pcidas64: " Jason Wong
2010-03-20 18:14 ` [PATCH 9/9] Staging: comedi: cb_pcidas64: fixed a coding style missed in the previosu patch Jason Wong
2010-03-27 1:48 ` Staging: comedi frivers patches Jason Wong
2010-03-27 1:48 ` [PATCH 1/9] Staging: comedi: amplc_pci224: fixed multiple brace coding style issue Jason Wong
2010-03-27 1:48 ` [PATCH 2/9] Staging: comedi: amplc_pci230: fix " Jason Wong
2010-03-27 1:48 ` [PATCH 3/9] Staging: comedi: adl_pci9111: fixed multiple " Jason Wong
2010-04-27 21:03 ` Greg KH
2010-03-27 1:48 ` [PATCH 4/9] Staging: comedi: adl_pci9118: " Jason Wong
2010-03-27 1:48 ` [PATCH 5/9] Staging: comedi: adv_pci1710: " Jason Wong
2010-03-27 1:48 ` [PATCH 6/9] Staging: comedi: adv_pci_dio: " Jason Wong
2010-03-27 1:48 ` [PATCH 7/9] Staging: comedi: cb_das16_cs: " Jason Wong
2010-03-27 1:48 ` [PATCH 8/9] Staging: comedi: cb_pcidas64: " Jason Wong
2010-03-27 1:48 ` [PATCH 9/9] Staging: comedi: cb_pcidas64: fixed a coding style missed in the previosu patch Jason Wong
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=1268492014-6355-6-git-send-email-tsanghan@gmail.com \
--to=tsanghan@gmail.com \
--cc=devel@driverdev.osuosl.org \
--cc=gregkh@suse.de \
--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