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

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Date:	Mon, 17 Sep 2012 21:38:33 +1000
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Samuel Ortiz <sameo@...ux.intel.com>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Gyungoh Yoo <jack.yoo@...im-ic.com>,
	Stephen Warren <swarren@...dia.com>
Subject: linux-next: build failure after merge of the final tree (mfd tree
 related)

Hi all,

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

drivers/mfd/max8907.c: In function 'max8907_i2c_probe':
drivers/mfd/max8907.c:248:10: error: too few arguments to function 'mfd_add_devices'
include/linux/mfd/core.h:100:12: note: declared here

Caused by commit 6c2591532a6f ("mfd: Add MAX8907 core driver") from the
mfd tree interacting with commit 0848c94fb4a5 ("mfd: core: Push irqdomain
mapping out into devices") from Linus' tree.

I have added the following patch and will carry it as a merge fix:

From: Stephen Rothwell <sfr@...b.auug.org.au>
Date: Mon, 17 Sep 2012 21:31:20 +1000
Subject: [PATCH] mfd: fix up for mfd_add_devices() API change

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

diff --git a/drivers/mfd/max8907.c b/drivers/mfd/max8907.c
index 5295276..6497c98 100644
--- a/drivers/mfd/max8907.c
+++ b/drivers/mfd/max8907.c
@@ -245,7 +245,7 @@ static __devinit int max8907_i2c_probe(struct i2c_client *i2c,
 	enable_irq(max8907->i2c_gen->irq);
 
 	ret = mfd_add_devices(max8907->dev, -1, max8907_cells,
-			      ARRAY_SIZE(max8907_cells), NULL, 0);
+			      ARRAY_SIZE(max8907_cells), NULL, 0, NULL);
 	if (ret != 0) {
 		dev_err(&i2c->dev, "failed to add MFD devices %d\n", ret);
 		goto err_add_devices;
-- 
1.7.10.280.gaa39

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

Content of type "application/pgp-signature" skipped