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 3/9] Staging: comedi: adl_pci9111: fixed multiple brace coding style issue
Date: Sat, 13 Mar 2010 22:53:28 +0800 [thread overview]
Message-ID: <1268492014-6355-4-git-send-email-tsanghan@gmail.com> (raw)
In-Reply-To: <Jason Wong <tsanghan@gmail.com>
Fixed coding style issue
Signed-off-by: Jason Wong <tsanghan@gmail.com>
---
drivers/staging/comedi/drivers/adl_pci9111.c | 30 +++++++++++++-------------
1 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/drivers/staging/comedi/drivers/adl_pci9111.c b/drivers/staging/comedi/drivers/adl_pci9111.c
index da172a5..7015fc0 100644
--- a/drivers/staging/comedi/drivers/adl_pci9111.c
+++ b/drivers/staging/comedi/drivers/adl_pci9111.c
@@ -585,9 +585,9 @@ pci9111_ai_do_cmd_test(struct comedi_device *dev,
(cmd->scan_begin_src != TRIG_EXT))
error++;
- if ((cmd->convert_src != TRIG_TIMER) && (cmd->convert_src != TRIG_EXT)) {
+ if ((cmd->convert_src != TRIG_TIMER) && (cmd->convert_src != TRIG_EXT))
error++;
- }
+
if ((cmd->convert_src == TRIG_TIMER) &&
!((cmd->scan_begin_src == TRIG_TIMER) ||
(cmd->scan_begin_src == TRIG_FOLLOW))) {
@@ -1067,9 +1067,9 @@ static int pci9111_ai_insn_read(struct comedi_device *dev,
pci9111_ai_channel_set(CR_CHAN((&insn->chanspec)[0]));
- if ((pci9111_ai_range_get()) != CR_RANGE((&insn->chanspec)[0])) {
+ if ((pci9111_ai_range_get()) != CR_RANGE((&insn->chanspec)[0]))
pci9111_ai_range_set(CR_RANGE((&insn->chanspec)[0]));
- }
+
pci9111_fifo_reset();
@@ -1090,11 +1090,11 @@ static int pci9111_ai_insn_read(struct comedi_device *dev,
conversion_done:
- if (resolution == PCI9111_HR_AI_RESOLUTION) {
+ if (resolution == PCI9111_HR_AI_RESOLUTION)
data[i] = pci9111_hr_ai_get_data();
- } else {
+ else
data[i] = pci9111_ai_get_data();
- }
+
}
#ifdef AI_INSN_DEBUG
@@ -1131,9 +1131,9 @@ static int pci9111_ao_insn_read(struct comedi_device *dev,
{
int i;
- for (i = 0; i < insn->n; i++) {
+ for (i = 0; i < insn->n; i++)
data[i] = dev_private->ao_readback & PCI9111_AO_RESOLUTION_MASK;
- }
+
return i;
}
@@ -1222,9 +1222,9 @@ static int pci9111_attach(struct comedi_device *dev,
int error, i;
const struct pci9111_board *board;
- if (alloc_private(dev, sizeof(struct pci9111_private_data)) < 0) {
+ if (alloc_private(dev, sizeof(struct pci9111_private_data)) < 0)
return -ENOMEM;
- }
+
/* Probe the device to determine what device in the series it is. */
printk("comedi%d: " PCI9111_DRIVER_NAME " driver\n", dev->minor);
@@ -1394,14 +1394,14 @@ static int pci9111_detach(struct comedi_device *dev)
}
/* Release previously allocated irq */
- if (dev->irq != 0) {
+ if (dev->irq != 0)
free_irq(dev->irq, dev);
- }
+
if (dev_private != 0 && dev_private->pci_device != 0) {
- if (dev->iobase) {
+ if (dev->iobase)
comedi_pci_disable(dev_private->pci_device);
- }
+
pci_dev_put(dev_private->pci_device);
}
--
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 ` Jason Wong [this message]
2010-03-13 14:53 ` [PATCH 4/9] Staging: comedi: adl_pci9118: fixed multiple " Jason Wong
2010-03-13 14:53 ` [PATCH 5/9] Staging: comedi: adv_pci1710: " Jason Wong
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-4-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