These inline functions are designed to modify parts of the PaRAM in eDMA. Change the names accordingly. Signed-off-by: Peter Ujfalusi <peter.ujfalusi@xxxxxx> --- drivers/dma/edma.c | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/drivers/dma/edma.c b/drivers/dma/edma.c index f33a297f870f..d8639a92f286 100644 --- a/drivers/dma/edma.c +++ b/drivers/dma/edma.c @@ -349,32 +349,32 @@ static inline void edma_shadow0_write_array(struct edma_cc *ecc, int offset, edma_write(ecc, EDMA_SHADOW0 + offset + (i << 2), val); } -static inline unsigned int edma_parm_read(struct edma_cc *ecc, int offset, - int param_no) +static inline unsigned int edma_param_read(struct edma_cc *ecc, int offset, + int param_no) { return edma_read(ecc, EDMA_PARM + offset + (param_no << 5)); } -static inline void edma_parm_write(struct edma_cc *ecc, int offset, - int param_no, unsigned val) +static inline void edma_param_write(struct edma_cc *ecc, int offset, + int param_no, unsigned val) { edma_write(ecc, EDMA_PARM + offset + (param_no << 5), val); } -static inline void edma_parm_modify(struct edma_cc *ecc, int offset, - int param_no, unsigned and, unsigned or) +static inline void edma_param_modify(struct edma_cc *ecc, int offset, + int param_no, unsigned and, unsigned or) { edma_modify(ecc, EDMA_PARM + offset + (param_no << 5), and, or); } -static inline void edma_parm_and(struct edma_cc *ecc, int offset, int param_no, - unsigned and) +static inline void edma_param_and(struct edma_cc *ecc, int offset, int param_no, + unsigned and) { edma_and(ecc, EDMA_PARM + offset + (param_no << 5), and); } -static inline void edma_parm_or(struct edma_cc *ecc, int offset, int param_no, - unsigned or) +static inline void edma_param_or(struct edma_cc *ecc, int offset, int param_no, + unsigned or) { edma_or(ecc, EDMA_PARM + offset + (param_no << 5), or); } @@ -594,8 +594,8 @@ static void edma_link(struct edma_cc *ecc, unsigned from, unsigned to) if (from >= ecc->num_slots || to >= ecc->num_slots) return; - edma_parm_modify(ecc, PARM_LINK_BCNTRLD, from, 0xffff0000, - PARM_OFFSET(to)); + edma_param_modify(ecc, PARM_LINK_BCNTRLD, from, 0xffff0000, + PARM_OFFSET(to)); } /** -- 2.6.1 -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html