From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Samuel Ortiz <sameo@linux.intel.com>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Gyungoh Yoo <jack.yoo@maxim-ic.com>,
Stephen Warren <swarren@nvidia.com>
Subject: linux-next: build failure after merge of the final tree (mfd tree related)
Date: Mon, 17 Sep 2012 21:38:33 +1000 [thread overview]
Message-ID: <20120917213833.2b3ac86e097d131065a0541d@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1511 bytes --]
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@canb.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@canb.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@canb.auug.org.au
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
next reply other threads:[~2012-09-17 11:38 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-09-17 11:38 Stephen Rothwell [this message]
2012-09-17 13:28 ` linux-next: build failure after merge of the final tree (mfd tree related) Samuel Ortiz
-- strict thread matches above, loose matches on Subject: below --
2013-06-18 7:19 Stephen Rothwell
2013-06-19 8:24 ` Samuel Ortiz
2013-06-20 2:25 ` Chao Xie
2011-12-21 6:33 Stephen Rothwell
2011-12-21 10:51 ` Cousson, Benoit
2011-12-21 12:24 ` Samuel Ortiz
2011-12-22 17:30 ` Samuel Ortiz
2011-03-28 3:52 Stephen Rothwell
2011-03-21 8:12 함명주
2011-03-21 2:59 Stephen Rothwell
2010-12-20 8:21 Stephen Rothwell
2010-12-20 10:33 ` Samuel Ortiz
2010-12-20 10:52 ` Mark Brown
2010-12-20 12:18 ` Mark Brown
2010-09-14 3:43 Stephen Rothwell
2010-09-14 5:05 ` Arun MURTHY
2010-09-16 7:15 ` Arun MURTHY
2010-09-16 7:23 ` Stephen Rothwell
2010-09-16 8:51 ` Stephen Rothwell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20120917213833.2b3ac86e097d131065a0541d@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=jack.yoo@maxim-ic.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=sameo@linux.intel.com \
--cc=swarren@nvidia.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).