linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
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 8/9] Staging: comedi: cb_pcidas64: fixed multiple brace coding style issue
Date: Sun, 21 Mar 2010 02:14:09 +0800	[thread overview]
Message-ID: <1269108850-1414-9-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/cb_pcidas64.c |   40 +++++++++++++-------------
 1 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/drivers/staging/comedi/drivers/cb_pcidas64.c b/drivers/staging/comedi/drivers/cb_pcidas64.c
index 82295e0..1d43d0d 100644
--- a/drivers/staging/comedi/drivers/cb_pcidas64.c
+++ b/drivers/staging/comedi/drivers/cb_pcidas64.c
@@ -1621,9 +1621,9 @@ int alloc_and_init_dma_members(struct comedi_device *dev)
 		priv(dev)->ai_buffer[i] =
 		    pci_alloc_consistent(priv(dev)->hw_dev, DMA_BUFFER_SIZE,
 					 &priv(dev)->ai_buffer_bus_addr[i]);
-		if (priv(dev)->ai_buffer[i] == NULL) {
+		if (priv(dev)->ai_buffer[i] == NULL)
 			return -ENOMEM;
-		}
+
 	}
 	for (i = 0; i < AO_DMA_RING_COUNT; i++) {
 		if (ao_cmd_is_supported(board(dev))) {
@@ -1632,9 +1632,9 @@ int alloc_and_init_dma_members(struct comedi_device *dev)
 						 DMA_BUFFER_SIZE,
 						 &priv(dev)->
 						 ao_buffer_bus_addr[i]);
-			if (priv(dev)->ao_buffer[i] == NULL) {
+			if (priv(dev)->ao_buffer[i] == NULL)
 				return -ENOMEM;
-			}
+
 		}
 	}
 	/*  allocate dma descriptors */
@@ -1643,9 +1643,9 @@ int alloc_and_init_dma_members(struct comedi_device *dev)
 				 sizeof(struct plx_dma_desc) *
 				 ai_dma_ring_count(board(dev)),
 				 &priv(dev)->ai_dma_desc_bus_addr);
-	if (priv(dev)->ai_dma_desc == NULL) {
+	if (priv(dev)->ai_dma_desc == NULL)
 		return -ENOMEM;
-	}
+
 	DEBUG_PRINT("ai dma descriptors start at bus addr 0x%x\n",
 		    priv(dev)->ai_dma_desc_bus_addr);
 	if (ao_cmd_is_supported(board(dev))) {
@@ -1654,9 +1654,9 @@ int alloc_and_init_dma_members(struct comedi_device *dev)
 					 sizeof(struct plx_dma_desc) *
 					 AO_DMA_RING_COUNT,
 					 &priv(dev)->ao_dma_desc_bus_addr);
-		if (priv(dev)->ao_dma_desc == NULL) {
+		if (priv(dev)->ao_dma_desc == NULL)
 			return -ENOMEM;
-		}
+
 		DEBUG_PRINT("ao dma descriptors start at bus addr 0x%x\n",
 			    priv(dev)->ao_dma_desc_bus_addr);
 	}
@@ -1848,9 +1848,9 @@ static int attach(struct comedi_device *dev, struct comedi_devconfig *it)
 	printk(" irq %u\n", dev->irq);
 
 	retval = setup_subdevices(dev);
-	if (retval < 0) {
+	if (retval < 0)
 		return retval;
-	}
+
 
 	return 0;
 }
@@ -1919,9 +1919,9 @@ static int detach(struct comedi_device *dev)
 						    priv(dev)->ao_dma_desc,
 						    priv(dev)->
 						    ao_dma_desc_bus_addr);
-			if (priv(dev)->main_phys_iobase) {
+			if (priv(dev)->main_phys_iobase)
 				comedi_pci_disable(priv(dev)->hw_dev);
-			}
+	
 			pci_dev_put(priv(dev)->hw_dev);
 		}
 	}
@@ -2902,9 +2902,9 @@ static void pio_drain_ai_fifo_16(struct comedi_device *dev)
 		if (cmd->stop_src == TRIG_COUNT) {
 			if (priv(dev)->ai_count == 0)
 				break;
-			if (num_samples > priv(dev)->ai_count) {
+			if (num_samples > priv(dev)->ai_count)
 				num_samples = priv(dev)->ai_count;
-			}
+
 			priv(dev)->ai_count -= num_samples;
 		}
 
@@ -2943,9 +2943,9 @@ static void pio_drain_ai_fifo_32(struct comedi_device *dev)
 	    readw(priv(dev)->main_iobase + ADC_READ_PNTR_REG) & 0x7fff;
 
 	if (cmd->stop_src == TRIG_COUNT) {
-		if (max_transfer > priv(dev)->ai_count) {
+		if (max_transfer > priv(dev)->ai_count)
 			max_transfer = priv(dev)->ai_count;
-		}
+
 	}
 	for (i = 0; read_code != write_code && i < max_transfer;) {
 		fifo_data = readl(priv(dev)->dio_counter_iobase + ADC_FIFO_REG);
@@ -2964,9 +2964,9 @@ static void pio_drain_ai_fifo_32(struct comedi_device *dev)
 /* empty fifo */
 static void pio_drain_ai_fifo(struct comedi_device *dev)
 {
-	if (board(dev)->layout == LAYOUT_4020) {
+	if (board(dev)->layout == LAYOUT_4020)
 		pio_drain_ai_fifo_32(dev);
-	} else
+	else
 		pio_drain_ai_fifo_16(dev);
 }
 
@@ -3038,9 +3038,9 @@ void handle_ai_interrupt(struct comedi_device *dev, unsigned short status,
 		       priv(dev)->plx9080_iobase + PLX_DMA1_CS_REG);
 		DEBUG_PRINT("dma1 status 0x%x\n", dma1_status);
 
-		if (dma1_status & PLX_DMA_EN_BIT) {
+		if (dma1_status & PLX_DMA_EN_BIT)
 			drain_dma_buffers(dev, 1);
-		}
+
 		DEBUG_PRINT(" cleared dma ch1 interrupt\n");
 	}
 	spin_unlock_irqrestore(&dev->spinlock, flags);
-- 
1.7.0.2


  parent reply	other threads:[~2010-03-20 18:16 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 ` [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 ` Jason Wong [this message]
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=1269108850-1414-9-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;
as well as URLs for NNTP newsgroup(s).