Messages in this thread | | | Subject | Re: [PATCH] powerpc/powernv/pci: add ifdef to avoid dead code | From | Christophe Leroy <> | Date | Sun, 14 Jun 2020 09:26:55 +0200 |
| |
Hi,
Le 14/06/2020 à 07:54, Greg Thelen a écrit : > Commit dc3d8f85bb57 ("powerpc/powernv/pci: Re-work bus PE > configuration") removed a couple pnv_ioda_setup_bus_dma() calls. The > only remaining calls are behind CONFIG_IOMMU_API. Thus builds without > CONFIG_IOMMU_API see: > arch/powerpc/platforms/powernv/pci-ioda.c:1888:13: error: 'pnv_ioda_setup_bus_dma' defined but not used > > Add CONFIG_IOMMU_API ifdef guard to avoid dead code.
I think you should move the function down into the same ifdef as the callers instead of adding a new ifdef.
Christophe
> > Fixes: dc3d8f85bb57 ("powerpc/powernv/pci: Re-work bus PE configuration") > Signed-off-by: Greg Thelen <gthelen@google.com> > --- > arch/powerpc/platforms/powernv/pci-ioda.c | 2 ++ > 1 file changed, 2 insertions(+) > > diff --git a/arch/powerpc/platforms/powernv/pci-ioda.c b/arch/powerpc/platforms/powernv/pci-ioda.c > index 73a63efcf855..f7762052b7c4 100644 > --- a/arch/powerpc/platforms/powernv/pci-ioda.c > +++ b/arch/powerpc/platforms/powernv/pci-ioda.c > @@ -1885,6 +1885,7 @@ static bool pnv_pci_ioda_iommu_bypass_supported(struct pci_dev *pdev, > return false; > } > > +#ifdef CONFIG_IOMMU_API > static void pnv_ioda_setup_bus_dma(struct pnv_ioda_pe *pe, struct pci_bus *bus) > { > struct pci_dev *dev; > @@ -1897,6 +1898,7 @@ static void pnv_ioda_setup_bus_dma(struct pnv_ioda_pe *pe, struct pci_bus *bus) > pnv_ioda_setup_bus_dma(pe, dev->subordinate); > } > } > +#endif > > static inline __be64 __iomem *pnv_ioda_get_inval_reg(struct pnv_phb *phb, > bool real_mode) >
| |