powerpc: Tidy up a bit after removal of PowerPC 601.

The removal of the 601 left some standalone blocks from
former if/else. Drop the { } and re-indent.

Signed-off-by: Christophe Leroy <christophe.leroy@csgroup.eu>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Link: https://lore.kernel.org/r/31c4cd093963f22831bf388449056ee045533d3b.1601362098.git.christophe.leroy@csgroup.eu

diff --git a/arch/powerpc/kernel/btext.c b/arch/powerpc/kernel/btext.c
index b609fb3..c22a8e0 100644 (file)
--- a/arch/powerpc/kernel/btext.c
+++ b/arch/powerpc/kernel/btext.c
@@ -95,13 +95,10 @@ void __init btext_prepare_BAT(void)
                boot_text_mapped = 0;
                return;
        }
-       {
-               /* 603, 604, G3, G4, ... */
-               lowbits = addr & ~0xFF000000UL;
-               addr &= 0xFF000000UL;
-               disp_BAT[0] = vaddr | (BL_16M<<2) | 2;
-               disp_BAT[1] = addr | (_PAGE_NO_CACHE | _PAGE_GUARDED | BPP_RW); 
-       }
+       lowbits = addr & ~0xFF000000UL;
+       addr &= 0xFF000000UL;
+       disp_BAT[0] = vaddr | (BL_16M<<2) | 2;
+       disp_BAT[1] = addr | (_PAGE_NO_CACHE | _PAGE_GUARDED | BPP_RW);
        logicalDisplayBase = (void *) (vaddr + lowbits);
 }
 #endif

diff --git a/arch/powerpc/mm/book3s32/mmu.c b/arch/powerpc/mm/book3s32/mmu.c
index 771d607..741e4fc 100644 (file)
--- a/arch/powerpc/mm/book3s32/mmu.c
+++ b/arch/powerpc/mm/book3s32/mmu.c
@@ -73,16 +73,13 @@ unsigned long p_block_mapped(phys_addr_t pa)
 static int find_free_bat(void)
 {
        int b;
+       int n = mmu_has_feature(MMU_FTR_USE_HIGH_BATS) ? 8 : 4;
 
-       {
-               int n = mmu_has_feature(MMU_FTR_USE_HIGH_BATS) ? 8 : 4;
+       for (b = 0; b < n; b++) {
+               struct ppc_bat *bat = BATS[b];
 
-               for (b = 0; b < n; b++) {
-                       struct ppc_bat *bat = BATS[b];
-
-                       if (!(bat[1].batu & 3))
-                               return b;
-               }
+               if (!(bat[1].batu & 3))
+                       return b;
        }
        return -1;
 }
@@ -280,24 +277,22 @@ void __init setbat(int index, unsigned long virt, phys_addr_t phys,
                flags &= ~_PAGE_COHERENT;
 
        bl = (size >> 17) - 1;
-       {
-               /* Do DBAT first */
-               wimgxpp = flags & (_PAGE_WRITETHRU | _PAGE_NO_CACHE
-                                  | _PAGE_COHERENT | _PAGE_GUARDED);
-               wimgxpp |= (flags & _PAGE_RW)? BPP_RW: BPP_RX;
-               bat[1].batu = virt | (bl << 2) | 2; /* Vs=1, Vp=0 */
-               bat[1].batl = BAT_PHYS_ADDR(phys) | wimgxpp;
-               if (flags & _PAGE_USER)
-                       bat[1].batu |= 1;       /* Vp = 1 */
-               if (flags & _PAGE_GUARDED) {
-                       /* G bit must be zero in IBATs */
-                       flags &= ~_PAGE_EXEC;
-               }
-               if (flags & _PAGE_EXEC)
-                       bat[0] = bat[1];
-               else
-                       bat[0].batu = bat[0].batl = 0;
+       /* Do DBAT first */
+       wimgxpp = flags & (_PAGE_WRITETHRU | _PAGE_NO_CACHE
+                          | _PAGE_COHERENT | _PAGE_GUARDED);
+       wimgxpp |= (flags & _PAGE_RW)? BPP_RW: BPP_RX;
+       bat[1].batu = virt | (bl << 2) | 2; /* Vs=1, Vp=0 */
+       bat[1].batl = BAT_PHYS_ADDR(phys) | wimgxpp;
+       if (flags & _PAGE_USER)
+               bat[1].batu |= 1;       /* Vp = 1 */
+       if (flags & _PAGE_GUARDED) {
+               /* G bit must be zero in IBATs */
+               flags &= ~_PAGE_EXEC;
        }
+       if (flags & _PAGE_EXEC)
+               bat[0] = bat[1];
+       else
+               bat[0].batu = bat[0].batl = 0;
 
        bat_addrs[index].start = virt;
        bat_addrs[index].limit = virt + ((bl + 1) << 17) - 1;