]> bbs.cooldavid.org Git - net-next-2.6.git/commitdiff
davinci: edma: fix coding style issue related to breaking lines
authorSekhar Nori <nsekhar@ti.com>
Mon, 10 May 2010 07:11:19 +0000 (12:41 +0530)
committerKevin Hilman <khilman@deeprootsystems.com>
Thu, 13 May 2010 17:05:21 +0000 (10:05 -0700)
In the edma driver, most of the long lines in 'if condition' are
broken after the logical operator '&&' except two instances.

This patch fixes that to bring consistency across the file.

Signed-off-by: Sekhar Nori <nsekhar@ti.com>
Signed-off-by: Kevin Hilman <khilman@deeprootsystems.com>
arch/arm/mach-davinci/dma.c

index 1922d461387e360ba4e18466a0f7fafeb99f0f71..d33827aadda76a01240cf659f35b6bf737cd05de 100644 (file)
@@ -351,8 +351,8 @@ static irqreturn_t dma_irq_handler(int irq, void *data)
 
        dev_dbg(data, "dma_irq_handler\n");
 
-       if ((edma_shadow0_read_array(ctlr, SH_IPR, 0) == 0)
-           && (edma_shadow0_read_array(ctlr, SH_IPR, 1) == 0))
+       if ((edma_shadow0_read_array(ctlr, SH_IPR, 0) == 0) &&
+           (edma_shadow0_read_array(ctlr, SH_IPR, 1) == 0))
                return IRQ_NONE;
 
        while (1) {
@@ -468,10 +468,10 @@ static irqreturn_t dma_ccerr_handler(int irq, void *data)
                                }
                        }
                }
-               if ((edma_read_array(ctlr, EDMA_EMR, 0) == 0)
-                   && (edma_read_array(ctlr, EDMA_EMR, 1) == 0)
-                   && (edma_read(ctlr, EDMA_QEMR) == 0)
-                   && (edma_read(ctlr, EDMA_CCERR) == 0))
+               if ((edma_read_array(ctlr, EDMA_EMR, 0) == 0) &&
+                   (edma_read_array(ctlr, EDMA_EMR, 1) == 0) &&
+                   (edma_read(ctlr, EDMA_QEMR) == 0) &&
+                   (edma_read(ctlr, EDMA_CCERR) == 0))
                        break;
                cnt++;
                if (cnt > 10)