linux-next: build failure after merge of the sound-asoc tree

[Stephen Rothwell]

Hi all,

After merging the sound-asoc tree, today's linux-next build (powerpc
ppc64_defconfig) failed like this:

In file included from include/linux/phy/phy.h:17,
                 from drivers/phy/phy-core.c:17:
include/linux/regulator/consumer.h:600:1: error: expected identifier or '(' before '{' token
  600 | {
      | ^
include/linux/regulator/consumer.h:599:1: warning: 'regulator_is_equal' declared 'static' but never defined [-Wunused-function]
  599 | regulator_is_equal(struct regulator *reg1, struct regulator *reg2);
      | ^~~~~~~~~~~~~~~~~~
In file included from include/linux/phy/phy.h:17,
                 from include/linux/usb/otg.h:13,
                 from include/linux/usb/of.h:12,
                 from drivers/usb/common/common.c:15:
include/linux/regulator/consumer.h:600:1: error: expected identifier or '(' before '{' token
  600 | {
      | ^
include/linux/regulator/consumer.h:599:1: warning: 'regulator_is_equal' declared 'static' but never defined [-Wunused-function]
  599 | regulator_is_equal(struct regulator *reg1, struct regulator *reg2);
      | ^~~~~~~~~~~~~~~~~~
In file included from include/linux/phy/phy.h:17,
                 from include/linux/usb/otg.h:13,
                 from include/linux/usb/of.h:12,
                 from drivers/usb/phy/of.c:9:
include/linux/regulator/consumer.h:600:1: error: expected identifier or '(' before '{' token
  600 | {
      | ^
include/linux/regulator/consumer.h:599:1: warning: 'regulator_is_equal' declared 'static' but never defined [-Wunused-function]
  599 | regulator_is_equal(struct regulator *reg1, struct regulator *reg2);
      | ^~~~~~~~~~~~~~~~~~
In file included from include/linux/phy/phy.h:17,
                 from include/linux/usb/otg.h:13,
                 from drivers/usb/host/ohci-hcd.c:37:
include/linux/regulator/consumer.h:600:1: error: expected identifier or '(' before '{' token
  600 | {
      | ^
include/linux/regulator/consumer.h:599:1: warning: 'regulator_is_equal' declared 'static' but never defined [-Wunused-function]
  599 | regulator_is_equal(struct regulator *reg1, struct regulator *reg2);
      | ^~~~~~~~~~~~~~~~~~
In file included from include/linux/phy/phy.h:17,
                 from include/linux/usb/otg.h:13,
                 from drivers/usb/host/ehci-hub.c:17,
                 from drivers/usb/host/ehci-hcd.c:305:
include/linux/regulator/consumer.h:600:1: error: expected identifier or '(' before '{' token
  600 | {
      | ^
include/linux/regulator/consumer.h:599:1: warning: 'regulator_is_equal' declared 'static' but never defined [-Wunused-function]
  599 | regulator_is_equal(struct regulator *reg1, struct regulator *reg2);
      | ^~~~~~~~~~~~~~~~~~
In file included from include/linux/amba/bus.h:19,
                 from drivers/of/platform.c:14:
include/linux/regulator/consumer.h:600:1: error: expected identifier or '(' before '{' token
  600 | {
      | ^
In file included from include/linux/amba/bus.h:19,
                 from drivers/of/platform.c:14:
include/linux/regulator/consumer.h:599:1: warning: 'regulator_is_equal' declared 'static' but never defined [-Wunused-function]
  599 | regulator_is_equal(struct regulator *reg1, struct regulator *reg2);
      | ^~~~~~~~~~~~~~~~~~
In file included from include/linux/phy/phy.h:17,
                 from drivers/usb/core/phy.c:12:
include/linux/regulator/consumer.h:600:1: error: expected identifier or '(' before '{' token
  600 | {
      | ^
include/linux/regulator/consumer.h:599:1: warning: 'regulator_is_equal' declared 'static' but never defined [-Wunused-function]
  599 | regulator_is_equal(struct regulator *reg1, struct regulator *reg2);
      | ^~~~~~~~~~~~~~~~~~
In file included from include/linux/phy/phy.h:17,
                 from drivers/ata/ahci.h:25,
                 from drivers/ata/ahci.c:35:
include/linux/regulator/consumer.h:600:1: error: expected identifier or '(' before '{' token
  600 | {
      | ^
include/linux/regulator/consumer.h:599:1: warning: 'regulator_is_equal' declared 'static' but never defined [-Wunused-function]
  599 | regulator_is_equal(struct regulator *reg1, struct regulator *reg2);
      | ^~~~~~~~~~~~~~~~~~
In file included from include/linux/phy/phy.h:17,
                 from include/linux/usb/otg.h:13,
                 from include/linux/usb/of.h:12,
                 from drivers/usb/core/usb.c:42:
include/linux/regulator/consumer.h:600:1: error: expected identifier or '(' before '{' token
  600 | {
      | ^
include/linux/regulator/consumer.h:599:1: warning: 'regulator_is_equal' declared 'static' but never defined [-Wunused-function]
  599 | regulator_is_equal(struct regulator *reg1, struct regulator *reg2);
      | ^~~~~~~~~~~~~~~~~~
In file included from include/linux/phy/phy.h:17,
                 from include/linux/usb/otg.h:13,
                 from include/linux/usb/of.h:12,
                 from drivers/usb/core/of.c:12:
include/linux/regulator/consumer.h:600:1: error: expected identifier or '(' before '{' token
  600 | {
      | ^
In file included from include/linux/phy/phy.h:17,
                 from include/linux/usb/otg.h:13,
                 from include/linux/usb/of.h:12,
                 from drivers/usb/core/of.c:12:
include/linux/regulator/consumer.h:599:1: warning: 'regulator_is_equal' declared 'static' but never defined [-Wunused-function]
  599 | regulator_is_equal(struct regulator *reg1, struct regulator *reg2);
      | ^~~~~~~~~~~~~~~~~~
In file included from include/linux/phy/phy.h:17,
                 from drivers/ata/ahci.h:25,
                 from drivers/ata/libahci.c:32:
include/linux/regulator/consumer.h:600:1: error: expected identifier or '(' before '{' token
  600 | {
      | ^
include/linux/regulator/consumer.h:599:1: warning: 'regulator_is_equal' declared 'static' but never defined [-Wunused-function]
  599 | regulator_is_equal(struct regulator *reg1, struct regulator *reg2);
      | ^~~~~~~~~~~~~~~~~~
In file included from include/linux/phy/phy.h:17,
                 from drivers/usb/core/hcd.c:35:
include/linux/regulator/consumer.h:600:1: error: expected identifier or '(' before '{' token
  600 | {
      | ^
include/linux/regulator/consumer.h:599:1: warning: 'regulator_is_equal' declared 'static' but never defined [-Wunused-function]
  599 | regulator_is_equal(struct regulator *reg1, struct regulator *reg2);
      | ^~~~~~~~~~~~~~~~~~
In file included from include/linux/phy/phy.h:17,
                 from drivers/ata/sata_mv.c:50:
include/linux/regulator/consumer.h:600:1: error: expected identifier or '(' before '{' token
  600 | {
      | ^
include/linux/regulator/consumer.h:599:1: warning: 'regulator_is_equal' declared 'static' but never defined [-Wunused-function]
  599 | regulator_is_equal(struct regulator *reg1, struct regulator *reg2);
      | ^~~~~~~~~~~~~~~~~~
In file included from include/linux/phy/phy.h:17,
                 from include/linux/usb/otg.h:13,
                 from include/linux/usb/of.h:12,
                 from drivers/usb/core/message.c:21:
include/linux/regulator/consumer.h:600:1: error: expected identifier or '(' before '{' token
  600 | {
      | ^
include/linux/regulator/consumer.h:599:1: warning: 'regulator_is_equal' declared 'static' but never defined [-Wunused-function]
  599 | regulator_is_equal(struct regulator *reg1, struct regulator *reg2);
      | ^~~~~~~~~~~~~~~~~~
In file included from include/linux/phy/phy.h:17,
                 from include/linux/usb/otg.h:13,
                 from drivers/usb/core/hub.c:26:
include/linux/regulator/consumer.h:600:1: error: expected identifier or '(' before '{' token
  600 | {
      | ^
include/linux/regulator/consumer.h:599:1: warning: 'regulator_is_equal' declared 'static' but never defined [-Wunused-function]
  599 | regulator_is_equal(struct regulator *reg1, struct regulator *reg2);
      | ^~~~~~~~~~~~~~~~~~

Caused by commit

  b059b7e0ec32 ("regulator: core: Add regulator_is_equal() helper")

I have added the following fix patch for today.

From: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
Date: Wed, 15 Jan 2020 11:58:36 +1100
Subject: [PATCH] fix for "regulator: core: Add regulator_is_equal() helper"

Signed-off-by: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
---
 include/linux/regulator/consumer.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/linux/regulator/consumer.h b/include/linux/regulator/consumer.h
index 2c89d886595c..6a92fd3105a3 100644
--- a/include/linux/regulator/consumer.h
+++ b/include/linux/regulator/consumer.h
@@ -596,7 +596,7 @@ regulator_bulk_set_supply_names(struct regulator_bulk_data *consumers,
 }
 
 static inline bool
-regulator_is_equal(struct regulator *reg1, struct regulator *reg2);
+regulator_is_equal(struct regulator *reg1, struct regulator *reg2)
 {
 	return false;
 }
-- 
2.24.0

-- 
Cheers,
Stephen Rothwell

Attachment: pgpY48yYNdGAg.pgp
Description: OpenPGP digital signature