[PATCH v1 19/19] powerpc: Remove impossible mmu_psize_defs[] on nohash

[Christophe Leroy]

Today there is:

  if e500 or 8xx
    if e500
      mmu_psize_defs[] =
    else if 8xx
      mmu_psize_defs[] =
    else
      mmu_psize_defs[] =
    endif
  endif

The else leg is dead definition.

Drop that else leg and rewrite as:

  if e500
    mmu_psize_defs[] =
  endif
  if 8xx
    mmu_psize_defs[] =
  endif

Signed-off-by: Christophe Leroy <christophe.le...@csgroup.eu>
---
 arch/powerpc/mm/nohash/tlb.c | 41 ++++--------------------------------
 1 file changed, 4 insertions(+), 37 deletions(-)

diff --git a/arch/powerpc/mm/nohash/tlb.c b/arch/powerpc/mm/nohash/tlb.c
index fac59fbd475a..bf9093575d9d 100644
--- a/arch/powerpc/mm/nohash/tlb.c
+++ b/arch/powerpc/mm/nohash/tlb.c
@@ -49,7 +49,6 @@
  * other sizes not listed here.   The .ind field is only used on MMUs that have
  * indirect page table entries.
  */
-#if defined(CONFIG_PPC_E500) || defined(CONFIG_PPC_8xx)
 #ifdef CONFIG_PPC_E500
 struct mmu_psize_def mmu_psize_defs[MMU_PAGE_COUNT] = {
        [MMU_PAGE_4K] = {
@@ -81,7 +80,9 @@ struct mmu_psize_def mmu_psize_defs[MMU_PAGE_COUNT] = {
                .enc    = BOOK3E_PAGESZ_1GB,
        },
 };
-#elif defined(CONFIG_PPC_8xx)
+#endif
+
+#ifdef CONFIG_PPC_8xx
 struct mmu_psize_def mmu_psize_defs[MMU_PAGE_COUNT] = {
        [MMU_PAGE_4K] = {
                .shift  = 12,
@@ -96,41 +97,7 @@ struct mmu_psize_def mmu_psize_defs[MMU_PAGE_COUNT] = {
                .shift  = 23,
        },
 };
-#else
-struct mmu_psize_def mmu_psize_defs[MMU_PAGE_COUNT] = {
-       [MMU_PAGE_4K] = {
-               .shift  = 12,
-               .ind    = 20,
-               .enc    = BOOK3E_PAGESZ_4K,
-       },
-       [MMU_PAGE_16K] = {
-               .shift  = 14,
-               .enc    = BOOK3E_PAGESZ_16K,
-       },
-       [MMU_PAGE_64K] = {
-               .shift  = 16,
-               .ind    = 28,
-               .enc    = BOOK3E_PAGESZ_64K,
-       },
-       [MMU_PAGE_1M] = {
-               .shift  = 20,
-               .enc    = BOOK3E_PAGESZ_1M,
-       },
-       [MMU_PAGE_16M] = {
-               .shift  = 24,
-               .ind    = 36,
-               .enc    = BOOK3E_PAGESZ_16M,
-       },
-       [MMU_PAGE_256M] = {
-               .shift  = 28,
-               .enc    = BOOK3E_PAGESZ_256M,
-       },
-       [MMU_PAGE_1G] = {
-               .shift  = 30,
-               .enc    = BOOK3E_PAGESZ_1GB,
-       },
-};
-#endif /* CONFIG_PPC_85xx */
+#endif
 
 static inline int mmu_get_tsize(int psize)
 {
-- 
2.37.1