2020-07-30 00:57:36

by Jiaxun Yang

[permalink] [raw]
Subject: [PATCH] of_address: Guard of_bus_pci_get_flags with CONFIG_PCI

After 2f96593ecc37 ("of_address: Add bus type match for pci ranges parser"),
the last user of of_bus_pci_get_flags when CONFIG_PCI is disabled had gone.

This caused unused function warning when compiling without CONFIG_PCI.
Fix by guarding it with CONFIG_PCI.

Signed-off-by: Jiaxun Yang <[email protected]>
Reported-by: Stephen Rothwell <[email protected]>
Fixes: 2f96593ecc37 ("of_address: Add bus type match for pci ranges parser")
---
drivers/of/address.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/of/address.c b/drivers/of/address.c
index 813936d419ad..157dc7e06077 100644
--- a/drivers/of/address.c
+++ b/drivers/of/address.c
@@ -101,6 +101,7 @@ static unsigned int of_bus_default_get_flags(const __be32 *addr)
return IORESOURCE_MEM;
}

+#ifdef CONFIG_PCI
static unsigned int of_bus_pci_get_flags(const __be32 *addr)
{
unsigned int flags = 0;
@@ -123,7 +124,6 @@ static unsigned int of_bus_pci_get_flags(const __be32 *addr)
return flags;
}

-#ifdef CONFIG_PCI
/*
* PCI bus specific translator
*/
--
2.27.0


2020-07-31 14:29:47

by Rob Herring (Arm)

[permalink] [raw]
Subject: Re: [PATCH] of_address: Guard of_bus_pci_get_flags with CONFIG_PCI

On Wed, Jul 29, 2020 at 7:04 PM Jiaxun Yang <[email protected]> wrote:
>
> After 2f96593ecc37 ("of_address: Add bus type match for pci ranges parser"),
> the last user of of_bus_pci_get_flags when CONFIG_PCI is disabled had gone.
>
> This caused unused function warning when compiling without CONFIG_PCI.
> Fix by guarding it with CONFIG_PCI.
>
> Signed-off-by: Jiaxun Yang <[email protected]>
> Reported-by: Stephen Rothwell <[email protected]>
> Fixes: 2f96593ecc37 ("of_address: Add bus type match for pci ranges parser")
> ---
> drivers/of/address.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)

Acked-by: Rob Herring <[email protected]>

2020-07-31 15:58:59

by Thomas Bogendoerfer

[permalink] [raw]
Subject: Re: [PATCH] of_address: Guard of_bus_pci_get_flags with CONFIG_PCI

On Fri, Jul 31, 2020 at 08:27:55AM -0600, Rob Herring wrote:
> On Wed, Jul 29, 2020 at 7:04 PM Jiaxun Yang <[email protected]> wrote:
> >
> > After 2f96593ecc37 ("of_address: Add bus type match for pci ranges parser"),
> > the last user of of_bus_pci_get_flags when CONFIG_PCI is disabled had gone.
> >
> > This caused unused function warning when compiling without CONFIG_PCI.
> > Fix by guarding it with CONFIG_PCI.
> >
> > Signed-off-by: Jiaxun Yang <[email protected]>
> > Reported-by: Stephen Rothwell <[email protected]>
> > Fixes: 2f96593ecc37 ("of_address: Add bus type match for pci ranges parser")
> > ---
> > drivers/of/address.c | 2 +-
> > 1 file changed, 1 insertion(+), 1 deletion(-)
>
> Acked-by: Rob Herring <[email protected]>

applied to mips-next.

Thomas.

--
Crap can work. Given enough thrust pigs will fly, but it's not necessarily a
good idea. [ RFC1925, 2.3 ]