@@ -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) {