linux-next: build failure after merge of the final tree (mfd and battery trees related)

linux-next: build failure after merge of the final tree (mfd and battery trees related)

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1624 bytes --]

Hi all,

After merging the final tree, today's linux-next build (powerpc
allyesconfig) failed like this:

drivers/mfd/88pm860x-core.c: In function 'device_power_init':
drivers/mfd/88pm860x-core.c:982:11: error: too few arguments to function 'mfd_add_devices'
include/linux/mfd/core.h:100:12: note: declared here

Caused by commit a830d28b48bf ("power_supply: Enable battery-charger for
88pm860x") from the battery tree interacting with commit 55692af5eb58
("mfd: core: Push irqdomain mapping out into devices") from the mfd tree.

I added the following merge-fix patch and can carry it as necessary.

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Fri, 21 Sep 2012 16:41:09 +1000
Subject: [PATCH] power_supply: 88pm860x: fix up for mfd_add_devices() API
 change

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

diff --git a/drivers/mfd/88pm860x-core.c b/drivers/mfd/88pm860x-core.c
index 62311ad..a4dba31 100644
--- a/drivers/mfd/88pm860x-core.c
+++ b/drivers/mfd/88pm860x-core.c
@@ -979,7 +979,7 @@ static void __devinit device_power_init(struct pm860x_chip *chip,
 		power_devs[3].platform_data = pdata->chg_desc;
 		power_devs[3].pdata_size = sizeof(*pdata->chg_desc);
 		ret = mfd_add_devices(chip->dev, 0, &power_devs[3], 1,
-				      NULL, chip->irq_base);
+				      NULL, chip->irq_base, NULL);
 		if (ret < 0)
 			dev_err(chip->dev, "Failed to add chg-manager subdev\n");
 	}
-- 
1.7.10.280.gaa39

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

Re: linux-next: build failure after merge of the final tree (mfd and battery trees related)

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 782 bytes --]

Hi all,

On Fri, 21 Sep 2012 16:48:19 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> After merging the final tree, today's linux-next build (powerpc
> allyesconfig) failed like this:
> 
> drivers/mfd/88pm860x-core.c: In function 'device_power_init':
> drivers/mfd/88pm860x-core.c:982:11: error: too few arguments to function 'mfd_add_devices'
> include/linux/mfd/core.h:100:12: note: declared here
> 
> Caused by commit a830d28b48bf ("power_supply: Enable battery-charger for
> 88pm860x") from the battery tree interacting with commit 55692af5eb58
> ("mfd: core: Push irqdomain mapping out into devices") from the mfd tree.

This second patch is also in Linus' tree as of v3.6-rc6.

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]