powerpc: Dead code in commit bdc728a849a7
Hi Daniel,
your commit bdc728a849a7 ("powerpc: move find_and_init_phbs() to pSeries specific code") in today's Linux next tree moves a function into the pSeries specific setup.c file. I noticed it because I'm running an automated bot on top of linux-next which looks for variability-related defects with undertaker-checkpatch[0].
Inside the function, there is an #ifdef block which depends on CONFIG_PPC32 to be set. However, the file at arch/powerpc/platforms/pseries/setup.c will only be built if CONFIG_PPC_PSERIES is enabled[1], which through its Kconfig dependencies can only be selected if CONFIG_PPC64 is enabled[2]. As CONFIG_PPC32 and CONFIG_PPC64 are mutually exclusive, the #ifdef can never evaluate to true, and the corresponding code is dead.
Should I send a patch which removes the #ifdef and the dead code or would you prefer to do this yourself?
Best regards,
Andreas
[0] https://undertaker.cs.fau.de
[1] arch/powerpc/platforms/Makefile, line 18
[2] arch/powerpc/platforms/pseries/Kconfig, line 2
PATCH 1/1 powerpc: Remove PPC32 code from pseries specific find_and_init_phbs()
In bdc728a849a7 ("powerpc: move find_and_init_phbs() to pSeries specific code"), find_and_init_phbs() was moved into a pseries specific file, but PPC32 code wasn't removed. Remove it.
See https://lkml.kernel.org/r/[email protected]
--- arch/powerpc/platforms/pseries/setup.c | 7 ------- 1 file changed, 7 deletions(-)
arch/powerpc/platforms/pseries/setup.c +0 -7
@@ -499,13 +499,6 @@ static void __init find_and_init_phbs(void)else pci_clear_flags (PCI_PROBE_ONLY ); } - -#ifdef CONFIG_PPC32 /* Will be made generic soon */ - prop =of_get_property (of_chosen, -"linux,pci-assign-all-buses" ,NULL ); -if (prop && *prop) -pci_add_flags (PCI_REASSIGN_ALL_BUS ); -#endif /* CONFIG_PPC32 */ } }
Signature · 1 line
2.1.4