mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Christophe Leroy <christophe.leroy@csgroup.eu>
To: "Pali Rohár" <pali@kernel.org>,
	"Michael Ellerman" <mpe@ellerman.id.au>,
	"Nicholas Piggin" <npiggin@gmail.com>
Cc: Christophe Leroy <christophe.leroy@csgroup.eu>,
	linux-kernel@vger.kernel.org, linuxppc-dev@lists.ozlabs.org
Subject: [PATCH v4 04/17] powerpc/85xx: Remove #ifdefs CONFIG_PCI in mpc85xx_ds
Date: Wed, 22 Feb 2023 15:42:51 +0100	[thread overview]
Message-ID: <b8ff8526affea2e2653eeb79b47efe3aaf443818.1677076552.git.christophe.leroy@csgroup.eu> (raw)
In-Reply-To: <cover.1677076552.git.christophe.leroy@csgroup.eu>

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


  parent reply	other threads:[~2023-02-22 14:43 UTC|newest]

Thread overview: 21+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-02-22 14:42 [PATCH v4 00/17] powerpc/85xx: p2020: Create one unified machine description Christophe Leroy
2023-02-22 14:42 ` [PATCH v4 01/17] powerpc/fsl_uli1575: Misc cleanup Christophe Leroy
2023-02-22 14:42 ` [PATCH v4 02/17] powerpc/85xx: Rename setup_arch and pic_init on p1023 Christophe Leroy
2023-02-22 14:42 ` [PATCH v4 03/17] powerpc/85xx: Remove DBG() macro Christophe Leroy
2023-02-22 14:42 ` Christophe Leroy [this message]
2023-02-22 14:42 ` [PATCH v4 05/17] powerpc/85xx: mpc85xx_{ds/rdb} compact the call to mpic_alloc() Christophe Leroy
2023-02-22 14:42 ` [PATCH v4 06/17] powerpc/85xx: mpc85xx_{ds/rdb} replace BUG_ON() by WARN_ON() Christophe Leroy
2023-02-22 14:42 ` [PATCH v4 07/17] powerpc/85xx: mpc85xx_{ds/rdb} replace prink by pr_xxx macro Christophe Leroy
2023-02-22 14:42 ` [PATCH v4 08/17] powerpc/85xx: Remove #ifdefs CONFIG_PPC_I8259 in mpc85xx_ds Christophe Leroy
2023-02-22 14:42 ` [PATCH v4 09/17] powerpc/85xx: Remove #ifdef CONFIG_QUICC_ENGINE in mpc85xx_rdb Christophe Leroy
2023-02-22 14:42 ` [PATCH v4 10/17] powerpc/85xx: p2020: Move all P2020 DS machine descriptions to p2020.c Christophe Leroy
2023-02-22 14:42 ` [PATCH v4 11/17] powerpc/85xx: p2020: Move all P2020 RDB " Christophe Leroy
2023-02-22 14:42 ` [PATCH v4 12/17] powerpc/85xx: p2020: Move i8259 code into own function Christophe Leroy
2023-02-22 14:43 ` [PATCH v4 13/17] powerpc/85xx: mpc85xx_ds: Move PCI code into own file Christophe Leroy
2023-02-22 14:43 ` [PATCH v4 14/17] powerpc/85xx: p2020: Unify .setup_arch and .init_IRQ callbacks Christophe Leroy
2023-02-22 14:43 ` [PATCH v4 15/17] powerpc/85xx: p2020: Define just one machine description Christophe Leroy
2023-02-22 14:43 ` [PATCH v4 16/17] powerpc/85xx: p2020: Enable boards by new config option CONFIG_PPC_P2020 Christophe Leroy
2023-02-22 14:43 ` [PATCH v4 17/17] powerpc: dts: turris1x.dts: Remove "fsl,P2020RDB-PC" compatible string Christophe Leroy
2023-02-22 18:22 ` [PATCH v4 00/17] powerpc/85xx: p2020: Create one unified machine description Pali Rohár
2023-02-23  8:37   ` Christophe Leroy
2023-02-23  8:58     ` Michael Ellerman

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=b8ff8526affea2e2653eeb79b47efe3aaf443818.1677076552.git.christophe.leroy@csgroup.eu \
    --to=christophe.leroy@csgroup.eu \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linuxppc-dev@lists.ozlabs.org \
    --cc=mpe@ellerman.id.au \
    --cc=npiggin@gmail.com \
    --cc=pali@kernel.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®