[3/5] davinci: edma: fix coding style issues related to indentation

Commit Message

Sekhar Nori May 4, 2010, 8:41 a.m. UTC

None

Patch

diff --git a/arch/arm/mach-davinci/dma.c b/arch/arm/mach-davinci/dma.c
index cc5fcda..2734de9 100644
--- a/arch/arm/mach-davinci/dma.c
+++ b/arch/arm/mach-davinci/dma.c
@@ -330,7 +330,7 @@  static int irq2ctlr(int irq)
 	if (irq >= edma_cc[0]->irq_res_start && irq <= edma_cc[0]->irq_res_end)
 		return 0;
 	else if (irq >= edma_cc[1]->irq_res_start &&
-		irq <= edma_cc[1]->irq_res_end)
+				irq <= edma_cc[1]->irq_res_end)
 		return 1;
 
 	return -1;
@@ -352,7 +352,7 @@  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))
+			&& (edma_shadow0_read_array(ctlr, SH_IPR, 1) == 0))
 		return IRQ_NONE;
 
 	while (1) {
@@ -406,9 +406,9 @@  static irqreturn_t dma_ccerr_handler(int irq, void *data)
 	dev_dbg(data, "dma_ccerr_handler\n");
 
 	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))
+			(edma_read_array(ctlr, EDMA_EMR, 1) == 0) &&
+			(edma_read(ctlr, EDMA_QEMR) == 0) &&
+			(edma_read(ctlr, EDMA_CCERR) == 0))
 		return IRQ_NONE;
 
 	while (1) {
@@ -469,9 +469,9 @@  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))
+				&& (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)
@@ -773,7 +773,7 @@  void edma_free_slot(unsigned slot)
 	slot = EDMA_CHAN_SLOT(slot);
 
 	if (slot < edma_cc[ctlr]->num_channels ||
-		slot >= edma_cc[ctlr]->num_slots)
+			slot >= edma_cc[ctlr]->num_slots)
 		return;
 
 	memcpy_toio(edmacc_regs_base[ctlr] + PARM_OFFSET(slot),
@@ -816,8 +816,8 @@  int edma_alloc_cont_slots(unsigned ctlr, unsigned int id, int slot, int count)
 	 * of slots
 	 */
 	if ((id != EDMA_CONT_PARAMS_ANY) &&
-		(slot < edma_cc[ctlr]->num_channels ||
-		slot >= edma_cc[ctlr]->num_slots))
+			(slot < edma_cc[ctlr]->num_channels ||
+			slot >= edma_cc[ctlr]->num_slots))
 		return -EINVAL;
 
 	/*
@@ -865,8 +865,8 @@  int edma_free_cont_slots(unsigned slot, int count)
 	slot = EDMA_CHAN_SLOT(slot);
 
 	if (slot < edma_cc[ctlr]->num_channels ||
-		slot >= edma_cc[ctlr]->num_slots ||
-		count < 1)
+			slot >= edma_cc[ctlr]->num_slots ||
+			count < 1)
 		return -EINVAL;
 
 	for (i = slot; i < slot + count; ++i) {