[PATCH v4 02/17] powerpc/85xx: Rename setup_arch and pic_init on p1023

[Christophe Leroy]

Avoid conflict with other functions, rename mpc85xx_rdb_setup_arch()
to p1023_rdb_setup_arch(), same for mpc85xx_rdb_pic_init().

Signed-off-by: Christophe Leroy <christophe.le...@csgroup.eu>
---
 arch/powerpc/platforms/85xx/p1023_rdb.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/arch/powerpc/platforms/85xx/p1023_rdb.c 
b/arch/powerpc/platforms/85xx/p1023_rdb.c
index c04868eb2eb1..5d434ee96445 100644
--- a/arch/powerpc/platforms/85xx/p1023_rdb.c
+++ b/arch/powerpc/platforms/85xx/p1023_rdb.c
@@ -37,7 +37,7 @@
  * Setup the architecture
  *
  */
-static void __init mpc85xx_rdb_setup_arch(void)
+static void __init p1023_rdb_setup_arch(void)
 {
        struct device_node *np;
 
@@ -83,7 +83,7 @@ static void __init mpc85xx_rdb_setup_arch(void)
 
 machine_arch_initcall(p1023_rdb, mpc85xx_common_publish_devices);
 
-static void __init mpc85xx_rdb_pic_init(void)
+static void __init p1023_rdb_pic_init(void)
 {
        struct mpic *mpic = mpic_alloc(NULL, 0, MPIC_BIG_ENDIAN |
                MPIC_SINGLE_DEST_CPU,
@@ -103,8 +103,8 @@ static int __init p1023_rdb_probe(void)
 define_machine(p1023_rdb) {
        .name                   = "P1023 RDB",
        .probe                  = p1023_rdb_probe,
-       .setup_arch             = mpc85xx_rdb_setup_arch,
-       .init_IRQ               = mpc85xx_rdb_pic_init,
+       .setup_arch             = p1023_rdb_setup_arch,
+       .init_IRQ               = p1023_rdb_pic_init,
        .get_irq                = mpic_get_irq,
        .calibrate_decr         = generic_calibrate_decr,
        .progress               = udbg_progress,
-- 
2.39.1