linux-next: build failure after merge of the pci tree

Stephen Rothwell posted 1 patch 2 weeks, 2 days ago
drivers/pci/pci.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
linux-next: build failure after merge of the pci tree
Posted by Stephen Rothwell 2 weeks, 2 days ago
Hi all,

After merging the pci tree, today's linux-next build (i386 defconfig)
failed like this:

In file included from drivers/pci/msi/pcidev_msi.c:5:
drivers/pci/msi/../pci.h:862:1: error: expected identifier or '(' before '{' token
  862 | {
      | ^
drivers/pci/msi/../pci.h:861:20: error: 'of_pci_is_supply_present' declared 'static' but never defined [-Werror=unused-function]
  861 | static inline bool of_pci_is_supply_present(struct device_node *np);
      |                    ^~~~~~~~~~~~~~~~~~~~~~~~
cc1: all warnings being treated as errors

Caused by commit

  0a93ef0a2d90 ("PCI/pwrctl: Create pwrctl devices only if at least one power supply is present")

I have applied the following patch for today.

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Thu, 7 Nov 2024 22:53:24 +1100
Subject: [PATCH] fixup for "PCI/pwrctl: Create pwrctl devices only if at least
 one power supply is present"

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 drivers/pci/pci.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/pci/pci.h b/drivers/pci/pci.h
index 345db6844690..7dc82eac5b04 100644
--- a/drivers/pci/pci.h
+++ b/drivers/pci/pci.h
@@ -858,7 +858,7 @@ static inline int devm_of_pci_bridge_init(struct device *dev, struct pci_host_br
 	return 0;
 }
 
-static inline bool of_pci_is_supply_present(struct device_node *np);
+static inline bool of_pci_is_supply_present(struct device_node *np)
 {
 	return false;
 }
-- 
2.45.2

-- 
Cheers,
Stephen Rothwell
Re: linux-next: build failure after merge of the pci tree
Posted by Manivannan Sadhasivam 2 weeks, 2 days ago
On Thu, Nov 07, 2024 at 11:02:31PM +1100, Stephen Rothwell wrote:
> Hi all,
> 
> After merging the pci tree, today's linux-next build (i386 defconfig)
> failed like this:
> 
> In file included from drivers/pci/msi/pcidev_msi.c:5:
> drivers/pci/msi/../pci.h:862:1: error: expected identifier or '(' before '{' token
>   862 | {
>       | ^
> drivers/pci/msi/../pci.h:861:20: error: 'of_pci_is_supply_present' declared 'static' but never defined [-Werror=unused-function]
>   861 | static inline bool of_pci_is_supply_present(struct device_node *np);
>       |                    ^~~~~~~~~~~~~~~~~~~~~~~~

That's silly on me. Krzysztof, could you please fix it in the branch?

- Mani

> cc1: all warnings being treated as errors
> 
> Caused by commit
> 
>   0a93ef0a2d90 ("PCI/pwrctl: Create pwrctl devices only if at least one power supply is present")
> 
> I have applied the following patch for today.
> 
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Thu, 7 Nov 2024 22:53:24 +1100
> Subject: [PATCH] fixup for "PCI/pwrctl: Create pwrctl devices only if at least
>  one power supply is present"
> 
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> ---
>  drivers/pci/pci.h | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/pci/pci.h b/drivers/pci/pci.h
> index 345db6844690..7dc82eac5b04 100644
> --- a/drivers/pci/pci.h
> +++ b/drivers/pci/pci.h
> @@ -858,7 +858,7 @@ static inline int devm_of_pci_bridge_init(struct device *dev, struct pci_host_br
>  	return 0;
>  }
>  
> -static inline bool of_pci_is_supply_present(struct device_node *np);
> +static inline bool of_pci_is_supply_present(struct device_node *np)
>  {
>  	return false;
>  }
> -- 
> 2.45.2
> 
> -- 
> Cheers,
> Stephen Rothwell



-- 
மணிவண்ணன் சதாசிவம்
Re: linux-next: build failure after merge of the pci tree
Posted by Bjorn Helgaas 2 weeks, 2 days ago
On Thu, Nov 07, 2024 at 12:07:16PM +0000, Manivannan Sadhasivam wrote:
> On Thu, Nov 07, 2024 at 11:02:31PM +1100, Stephen Rothwell wrote:
> > Hi all,
> > 
> > After merging the pci tree, today's linux-next build (i386 defconfig)
> > failed like this:
> > 
> > In file included from drivers/pci/msi/pcidev_msi.c:5:
> > drivers/pci/msi/../pci.h:862:1: error: expected identifier or '(' before '{' token
> >   862 | {
> >       | ^
> > drivers/pci/msi/../pci.h:861:20: error: 'of_pci_is_supply_present' declared 'static' but never defined [-Werror=unused-function]
> >   861 | static inline bool of_pci_is_supply_present(struct device_node *np);
> >       |                    ^~~~~~~~~~~~~~~~~~~~~~~~
> 
> That's silly on me. Krzysztof, could you please fix it in the branch?

I fixed it, thanks for the report.