Commit 2e38ea48 authored by Christophe Leroy's avatar Christophe Leroy Committed by Michael Ellerman

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: default avatarChristophe Leroy <christophe.leroy@csgroup.eu>
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
Link: https://lore.kernel.org/r/31c4cd093963f22831bf388449056ee045533d3b.1601362098.git.christophe.leroy@csgroup.eu
parent 8b14e1df
...@@ -95,13 +95,10 @@ void __init btext_prepare_BAT(void) ...@@ -95,13 +95,10 @@ void __init btext_prepare_BAT(void)
boot_text_mapped = 0; boot_text_mapped = 0;
return; return;
} }
{
/* 603, 604, G3, G4, ... */
lowbits = addr & ~0xFF000000UL; lowbits = addr & ~0xFF000000UL;
addr &= 0xFF000000UL; addr &= 0xFF000000UL;
disp_BAT[0] = vaddr | (BL_16M<<2) | 2; disp_BAT[0] = vaddr | (BL_16M<<2) | 2;
disp_BAT[1] = addr | (_PAGE_NO_CACHE | _PAGE_GUARDED | BPP_RW); disp_BAT[1] = addr | (_PAGE_NO_CACHE | _PAGE_GUARDED | BPP_RW);
}
logicalDisplayBase = (void *) (vaddr + lowbits); logicalDisplayBase = (void *) (vaddr + lowbits);
} }
#endif #endif
......
...@@ -73,8 +73,6 @@ unsigned long p_block_mapped(phys_addr_t pa) ...@@ -73,8 +73,6 @@ unsigned long p_block_mapped(phys_addr_t pa)
static int find_free_bat(void) static int find_free_bat(void)
{ {
int b; 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++) { for (b = 0; b < n; b++) {
...@@ -83,7 +81,6 @@ static int find_free_bat(void) ...@@ -83,7 +81,6 @@ static int find_free_bat(void)
if (!(bat[1].batu & 3)) if (!(bat[1].batu & 3))
return b; return b;
} }
}
return -1; return -1;
} }
...@@ -280,7 +277,6 @@ void __init setbat(int index, unsigned long virt, phys_addr_t phys, ...@@ -280,7 +277,6 @@ void __init setbat(int index, unsigned long virt, phys_addr_t phys,
flags &= ~_PAGE_COHERENT; flags &= ~_PAGE_COHERENT;
bl = (size >> 17) - 1; bl = (size >> 17) - 1;
{
/* Do DBAT first */ /* Do DBAT first */
wimgxpp = flags & (_PAGE_WRITETHRU | _PAGE_NO_CACHE wimgxpp = flags & (_PAGE_WRITETHRU | _PAGE_NO_CACHE
| _PAGE_COHERENT | _PAGE_GUARDED); | _PAGE_COHERENT | _PAGE_GUARDED);
...@@ -297,7 +293,6 @@ void __init setbat(int index, unsigned long virt, phys_addr_t phys, ...@@ -297,7 +293,6 @@ void __init setbat(int index, unsigned long virt, phys_addr_t phys,
bat[0] = bat[1]; bat[0] = bat[1];
else else
bat[0].batu = bat[0].batl = 0; bat[0].batu = bat[0].batl = 0;
}
bat_addrs[index].start = virt; bat_addrs[index].start = virt;
bat_addrs[index].limit = virt + ((bl + 1) << 17) - 1; bat_addrs[index].limit = virt + ((bl + 1) << 17) - 1;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment