path: root/arch/arm/mm/cache-l2x0.c
diff options
authorRussell King <rmk+kernel@arm.linux.org.uk>2014-03-15 16:48:14 +0000
committerRussell King <rmk+kernel@arm.linux.org.uk>2014-05-30 00:47:39 +0100
commit83841fe1fb0c4316af89ab85d3528702724a33f4 (patch)
tree4c60c444906a5636067b19cc8f5fbf3fe7d7bf5b /arch/arm/mm/cache-l2x0.c
parentdf5dd4c6e27081bce2c68cdc2e57a93ea998b63e (diff)
ARM: l2c: rename cache_wait_way()
cache_wait_way() is actually used to wait for a particular mask to report clear; it's not really got much to do with cache ways at all. Indeed, it gets used to wait for the C bit to clear on older caches. Rename this with a more generic function name which better reflects its purpose: l2c_wait_mask(). Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/mm/cache-l2x0.c')
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/mm/cache-l2x0.c b/arch/arm/mm/cache-l2x0.c
index 1c3a23318f53..29ee7f692801 100644
--- a/arch/arm/mm/cache-l2x0.c
+++ b/arch/arm/mm/cache-l2x0.c
@@ -53,7 +53,7 @@ static bool of_init = false;
* Common code for all cache controllers.
-static inline void cache_wait_way(void __iomem *reg, unsigned long mask)
+static inline void l2c_wait_mask(void __iomem *reg, unsigned long mask)
/* wait for cache operation by line or way to complete */
while (readl_relaxed(reg) & mask)
@@ -73,7 +73,7 @@ static inline void l2c_set_debug(void __iomem *base, unsigned long val)
static void __l2c_op_way(void __iomem *reg)
writel_relaxed(l2x0_way_mask, reg);
- cache_wait_way(reg, l2x0_way_mask);
+ l2c_wait_mask(reg, l2x0_way_mask);
static inline void l2c_unlock(void __iomem *base, unsigned num)
@@ -94,7 +94,7 @@ static inline void cache_wait(void __iomem *reg, unsigned long mask)
/* cache operations by line are atomic on PL310 */
-#define cache_wait cache_wait_way
+#define cache_wait l2c_wait_mask
static inline void cache_sync(void)