find_pte is useful for debugging, but was unreferenced at first until we
added flush_cacheable_pages as user of __find_pte.

__find_pte is easy to use, so just drop find_pte and rename __find_pte
to find_pte. This is in preparation for mmu32 to provide a function
with the same semantics.

While at it, change the level to be unsigned as there are no negative
levels.

Signed-off-by: Ahmad Fatoum <a.fat...@pengutronix.de>
---
 arch/arm/cpu/mmu_64.c | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

diff --git a/arch/arm/cpu/mmu_64.c b/arch/arm/cpu/mmu_64.c
index 15b809808153..a20cb39a9296 100644
--- a/arch/arm/cpu/mmu_64.c
+++ b/arch/arm/cpu/mmu_64.c
@@ -96,7 +96,7 @@ static uint64_t *alloc_pte(void)
 #endif
 
 /**
- * __find_pte - Find page table entry
+ * find_pte - Find page table entry
  * @ttb: Translation Table Base
  * @addr: Virtual address to lookup
  * @level: used to store the level at which the page table walk ended.
@@ -110,7 +110,7 @@ static uint64_t *alloc_pte(void)
  *
  * Returns a pointer to the page table entry
  */
-static uint64_t *__find_pte(uint64_t *ttb, uint64_t addr, int *level)
+static uint64_t *find_pte(uint64_t *ttb, uint64_t addr, unsigned *level)
 {
        uint64_t *pte = ttb;
        uint64_t block_shift;
@@ -135,12 +135,6 @@ static uint64_t *__find_pte(uint64_t *ttb, uint64_t addr, 
int *level)
        return pte;
 }
 
-/* This is currently unused, but useful for debugging */
-static __maybe_unused uint64_t *find_pte(uint64_t addr)
-{
-       return __find_pte(get_ttb(), addr, NULL);
-}
-
 static unsigned long get_pte_attrs(maptype_t map_type)
 {
        switch (map_type & MAP_TYPE_MASK) {
@@ -310,8 +304,8 @@ static void flush_cacheable_pages(void *start, size_t size)
         * actually flushing the ranges isn't too significant.
         */
        for (mmu_addr_t addr = region_start; addr < region_end; addr += 
block_size) {
-               int level;
-               mmu_addr_t *pte = __find_pte(ttb, addr, &level);
+               unsigned level;
+               mmu_addr_t *pte = find_pte(ttb, addr, &level);
 
                block_size = granule_size(level);
                
-- 
2.39.5


Reply via email to