Now that the chrp machine has been removed this test can never be
true, remove it.
Signed-off-by: Michael Ellerman <m...@ellerman.id.au>
---
arch/powerpc/platforms/powermac/nvram.c | 8 +-------
1 file changed, 1 insertion(+), 7 deletions(-)
diff --git a/arch/powerpc/platforms/powermac/nvram.c
b/arch/powerpc/platforms/powermac/nvram.c
index fe2e0249cbc2..23af93dcb212 100644
--- a/arch/powerpc/platforms/powermac/nvram.c
+++ b/arch/powerpc/platforms/powermac/nvram.c
@@ -589,13 +589,7 @@ int __init pmac_nvram_init(void)
}
#ifdef CONFIG_PPC32
- if (machine_is(chrp) && nvram_naddrs == 1) {
- nvram_data = ioremap(r1.start, s1);
- nvram_mult = 1;
- ppc_md.nvram_read_val = direct_nvram_read_byte;
- ppc_md.nvram_write_val = direct_nvram_write_byte;
- ppc_md.nvram_size = ppc32_nvram_size;
- } else if (nvram_naddrs == 1) {
+ if (nvram_naddrs == 1) {
nvram_data = ioremap(r1.start, s1);
nvram_mult = (s1 + NVRAM_SIZE - 1) / NVRAM_SIZE;
ppc_md.nvram_read_val = direct_nvram_read_byte;
--
2.47.0
