aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/crypto/caam/jr.c2
-rw-r--r--drivers/crypto/caam/regs.h8
2 files changed, 1 insertions, 9 deletions
diff --git a/drivers/crypto/caam/jr.c b/drivers/crypto/caam/jr.c
index 044a69b526f7..1de2562d0982 100644
--- a/drivers/crypto/caam/jr.c
+++ b/drivers/crypto/caam/jr.c
@@ -213,7 +213,7 @@ static void caam_jr_dequeue(unsigned long devarg)
213 mb(); 213 mb();
214 214
215 /* set done */ 215 /* set done */
216 wr_reg32_relaxed(&jrp->rregs->outring_rmvd, 1); 216 wr_reg32(&jrp->rregs->outring_rmvd, 1);
217 217
218 jrp->out_ring_read_index = (jrp->out_ring_read_index + 1) & 218 jrp->out_ring_read_index = (jrp->out_ring_read_index + 1) &
219 (JOBR_DEPTH - 1); 219 (JOBR_DEPTH - 1);
diff --git a/drivers/crypto/caam/regs.h b/drivers/crypto/caam/regs.h
index c1fa1ec701d9..8591914d5c51 100644
--- a/drivers/crypto/caam/regs.h
+++ b/drivers/crypto/caam/regs.h
@@ -96,14 +96,6 @@ cpu_to_caam(16)
96cpu_to_caam(32) 96cpu_to_caam(32)
97cpu_to_caam(64) 97cpu_to_caam(64)
98 98
99static inline void wr_reg32_relaxed(void __iomem *reg, u32 data)
100{
101 if (caam_little_end)
102 writel_relaxed(data, reg);
103 else
104 writel_relaxed(cpu_to_be32(data), reg);
105}
106
107static inline void wr_reg32(void __iomem *reg, u32 data) 99static inline void wr_reg32(void __iomem *reg, u32 data)
108{ 100{
109 if (caam_little_end) 101 if (caam_little_end)