lkml.org 
[lkml]   [2023]   [Feb]   [22]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
From
Subject[PATCH v4 04/17] powerpc/85xx: Remove #ifdefs CONFIG_PCI in mpc85xx_ds
Date
All necessary items are declared all the time, no need to use
a #ifdef CONFIG_PCI.

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

diff --git a/arch/powerpc/platforms/85xx/mpc85xx_ds.c b/arch/powerpc/platforms/85xx/mpc85xx_ds.c
index 26257509aabf..f385cd288a76 100644
--- a/arch/powerpc/platforms/85xx/mpc85xx_ds.c
+++ b/arch/powerpc/platforms/85xx/mpc85xx_ds.c
@@ -99,7 +99,6 @@ void __init mpc85xx_ds_pic_init(void)
#endif /* CONFIG_PPC_I8259 */
}

-#ifdef CONFIG_PCI
static struct device_node *pci_with_uli;

static int mpc85xx_exclude_device(struct pci_controller *hose,
@@ -110,13 +109,14 @@ static int mpc85xx_exclude_device(struct pci_controller *hose,

return PCIBIOS_SUCCESSFUL;
}
-#endif /* CONFIG_PCI */

static void __init mpc85xx_ds_uli_init(void)
{
-#ifdef CONFIG_PCI
struct device_node *node;

+ if (!IS_ENABLED(CONFIG_PCI))
+ return;
+
/* See if we have a ULI under the primary */

node = of_find_node_by_name(NULL, "uli1575");
@@ -129,7 +129,6 @@ static void __init mpc85xx_ds_uli_init(void)
break;
}
}
-#endif
}

/*
--
2.39.1
\
 
 \ /
  Last update: 2023-03-27 00:32    [W:0.148 / U:1.560 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site