From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1759253Ab0CMOz1 (ORCPT ); Sat, 13 Mar 2010 09:55:27 -0500 Received: from mail-gw0-f46.google.com ([74.125.83.46]:63334 "EHLO mail-gw0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757378Ab0CMOzP (ORCPT ); Sat, 13 Mar 2010 09:55:15 -0500 DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; b=W2jT5hfCKGgni1jRx47PjE9tkp7CCDodKUc5d6Uuc7vk2Ej3qUNzOql9vcXQcA2OrY g75+mulkkncX+0WGjhK9G10y8B/uqKv0zis0RKqNYbRc6doU/TM23Gui4vXgaWQFo8N/ 4thY/Oj23U5CqarD2HASaY5xc/vR7gFeyQClY= From: Jason Wong To: gregkh@suse.de Cc: devel@driverdev.osuosl.org, linux-kernel@vger.kernel.org, Jason Wong Subject: [PATCH 3/9] Staging: comedi: adl_pci9111: fixed multiple brace coding style issue Date: Sat, 13 Mar 2010 22:53:28 +0800 Message-Id: <1268492014-6355-4-git-send-email-tsanghan@gmail.com> X-Mailer: git-send-email 1.7.0 In-Reply-To: References: Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Fixed coding style issue Signed-off-by: Jason Wong --- 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