From: Michael Ellerman <mpe@ellerman.id.au>
To: <linuxppc-dev@lists.ozlabs.org>
Cc: <linux-kernel@vger.kernel.org>, <geert@linux-m68k.org>, <arnd@arndb.de>
Subject: [RFC PATCH 04/10] powerpc/powermac: Remove machine_is(chrp) test
Date: Fri, 15 Nov 2024 00:11:07 +1100 [thread overview]
Message-ID: <20241114131114.602234-4-mpe@ellerman.id.au> (raw)
In-Reply-To: <20241114131114.602234-1-mpe@ellerman.id.au>
Now that the chrp machine has been removed this test can never be
true, remove it.
Signed-off-by: Michael Ellerman <mpe@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
next prev parent reply other threads:[~2024-11-14 13:11 UTC|newest]
Thread overview: 36+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-11-14 13:11 [RFC PATCH 01/10] powerpc/chrp: Remove CHRP support Michael Ellerman
2024-11-14 13:11 ` [RFC PATCH 02/10] powerpc/chrp: Remove various dead code Michael Ellerman
2024-11-16 16:15 ` Christophe Leroy
2024-11-19 3:27 ` Michael Ellerman
2024-11-14 13:11 ` [RFC PATCH 03/10] powerpc/chrp: Remove PPC_CHRP from defconfigs Michael Ellerman
2024-11-14 13:11 ` Michael Ellerman [this message]
2024-11-14 13:11 ` [RFC PATCH 05/10] powerpc/rtasd: Remove machine_is(chrp) tests Michael Ellerman
2024-11-14 13:11 ` [RFC PATCH 06/10] powerpc: Remove prom_init longtrail work arounds Michael Ellerman
2024-11-14 14:33 ` Geert Uytterhoeven
2024-11-14 13:11 ` [RFC PATCH 07/10] powerpc: Remove CONFIG_ISA Michael Ellerman
2024-11-14 14:34 ` Geert Uytterhoeven
2024-11-14 13:11 ` [RFC PATCH 08/10] macintosh: Remove ADB_MACIO Michael Ellerman
2024-11-14 14:35 ` Geert Uytterhoeven
2024-11-14 15:42 ` Arnd Bergmann
2024-11-14 16:35 ` Geert Uytterhoeven
2024-11-16 16:00 ` Christophe Leroy
2024-11-17 11:29 ` Michael Ellerman
2024-11-14 13:11 ` [RFC PATCH 09/10] i2c: Remove I2C_HYDRA Michael Ellerman
2024-11-14 14:37 ` Geert Uytterhoeven
2024-11-14 14:57 ` Wolfram Sang
2024-11-14 14:47 ` Geert Uytterhoeven
2024-11-19 23:11 ` Michael Ellerman
2024-11-14 13:11 ` [RFC PATCH 10/10] i2c: Drop reference to PPC_CHRP Michael Ellerman
2024-11-14 14:31 ` [RFC PATCH 01/10] powerpc/chrp: Remove CHRP support Geert Uytterhoeven
2024-11-14 15:43 ` Arnd Bergmann
2024-11-14 21:04 ` Segher Boessenkool
2024-11-26 3:49 ` Michael Ellerman
2024-11-27 20:10 ` Segher Boessenkool
2024-11-17 20:36 ` Gerhard Pircher
2024-11-18 6:07 ` Michael Ellerman
2024-11-21 8:41 ` John Paul Adrian Glaubitz
2024-11-22 18:31 ` Segher Boessenkool
2024-11-21 8:38 ` John Paul Adrian Glaubitz
2024-11-26 3:27 ` Michael Ellerman
2024-11-26 13:27 ` John Paul Adrian Glaubitz
2024-12-12 9:50 ` John Paul Adrian Glaubitz
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20241114131114.602234-4-mpe@ellerman.id.au \
--to=mpe@ellerman.id.au \
--cc=arnd@arndb.de \
--cc=geert@linux-m68k.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linuxppc-dev@lists.ozlabs.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®