In the edma driver, some lines are broken up at really
odd places to meet the 80 chars per line rule. This make
reading those parts particularly difficult.
This patch fixes that by creating a few lines over 80
characters, but I feel it still improves readability over
what is existing currently.
Here are the checkpatch warnings:
WARNING: line over 80 characters
+
edma_cc[ctlr]->intr_data[k].data);
WARNING: line over 80 characters
+ if
(edma_cc[ctlr]->intr_data[k].callback) {
WARNING: line over 80 characters
+
edma_cc[ctlr]->intr_data[k].callback(k,
WARNING: line over 80 characters
+
edma_cc[ctlr]->intr_data[k].data);
WARNING: line over 80 characters
+ count > (edma_cc[ctlr]->num_slots -
edma_cc[ctlr]->num_channels))
Signed-off-by: Sekhar Nori <[email protected]>
---
arch/arm/mach-davinci/dma.c | 22 +++++++++-------------
1 files changed, 9 insertions(+), 13 deletions(-)
diff --git a/arch/arm/mach-davinci/dma.c b/arch/arm/mach-davinci/dma.c
index 2734de9..3c89dd8 100644
--- a/arch/arm/mach-davinci/dma.c
+++ b/arch/arm/mach-davinci/dma.c
@@ -376,10 +376,9 @@ static irqreturn_t dma_irq_handler(int irq, void *data)
edma_shadow0_write_array(ctlr, SH_ICR, j,
(1 << i));
if (edma_cc[ctlr]->intr_data[k].callback)
- edma_cc[ctlr]->intr_data[k].callback(
- k, DMA_COMPLETE,
- edma_cc[ctlr]->intr_data[k].
- data);
+ edma_cc[ctlr]->intr_data[k].callback(k,
+ DMA_COMPLETE,
+
edma_cc[ctlr]->intr_data[k].data);
}
}
cnt++;
@@ -430,13 +429,10 @@ static irqreturn_t dma_ccerr_handler(int irq, void *data)
/* Clear any SER */
edma_shadow0_write_array(ctlr, SH_SECR,
j, (1 << i));
- if (edma_cc[ctlr]->intr_data[k].
- callback) {
- edma_cc[ctlr]->intr_data[k].
- callback(k,
- DMA_CC_ERROR,
- edma_cc[ctlr]->intr_data
- [k].data);
+ if
(edma_cc[ctlr]->intr_data[k].callback) {
+
edma_cc[ctlr]->intr_data[k].callback(k,
+ DMA_CC_ERROR,
+
edma_cc[ctlr]->intr_data[k].data);
}
}
}
@@ -825,8 +821,8 @@ int edma_alloc_cont_slots(unsigned ctlr, unsigned int id,
int slot, int count)
* and cannot be more than the number of slots minus the number of
* channels
*/
- if (count < 1 || count >
- (edma_cc[ctlr]->num_slots - edma_cc[ctlr]->num_channels))
+ if (count < 1 ||
+ count > (edma_cc[ctlr]->num_slots -
edma_cc[ctlr]->num_channels))
return -EINVAL;
switch (id) {
--
1.6.2.4
_______________________________________________
Davinci-linux-open-source mailing list
[email protected]
http://linux.davincidsp.com/mailman/listinfo/davinci-linux-open-source
