From: Mark Brown <broonie@kernel•org>
To: Sudeep Dutt <sudeep.dutt@intel•com>,
Greg Kroah-Hartman <gregkh@linuxfoundation•org>,
Dasaratharaman Chandramouli
<dasaratharaman.chandramouli@intel•com>,
Ashutosh Dixit <ashutosh.dixit@intel•com>,
Tejun Heo <tj@kernel•org>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
Thierry Reding <thierry.reding@gmail•com>
Subject: Build failure after merge of the char-misc tree
Date: Fri, 4 Oct 2013 00:54:19 +0100 [thread overview]
Message-ID: <20131003235419.GG27287@sirena.org.uk> (raw)
[-- Attachment #1: Type: text/plain, Size: 1859 bytes --]
After merging the char-misc tree into -next an x86 allmodconfig build fails
with:
drivers/misc/mic/host/mic_main.c: In function ‘mic_probe’:
drivers/misc/mic/host/mic_main.c:320:3: error: too many arguments to function ‘sysfs_get_dirent’
NULL, "state");
^
In file included from include/linux/kobject.h:21:0,
from include/linux/module.h:16,
from drivers/misc/mic/host/mic_main.c:26:
include/linux/sysfs.h:465:1: note: declared here
sysfs_get_dirent(struct sysfs_dirent *parent_sd, const unsigned char
*name)
^
make[4]: *** [drivers/misc/mic/host/mic_main.o] Error 1
caused by an interaction between the addition of the Intel MIC host
driver and commit 388975cccaaf1 (sysfs: clean up sysfs_get_dirent())
from the driver-current tree.
I've applied the patch below and can carry it for the time being.
From abbabb4580f45accf74f95aed6fe35b26ae8d009 Mon Sep 17 00:00:00 2001
From: Mark Brown <broonie@linaro•org>
Date: Fri, 4 Oct 2013 00:53:01 +0100
Subject: [PATCH] misc: mic: Update for sysfs_get_dirent() cleanups
Signed-off-by: Mark Brown <broonie@linaro•org>
---
drivers/misc/mic/host/mic_main.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/drivers/misc/mic/host/mic_main.c b/drivers/misc/mic/host/mic_main.c
index ca06aa9..50c2ea3 100644
--- a/drivers/misc/mic/host/mic_main.c
+++ b/drivers/misc/mic/host/mic_main.c
@@ -316,8 +316,7 @@ static int mic_probe(struct pci_dev *pdev,
"device_create_with_groups failed rc %d\n", rc);
goto smpt_uninit;
}
- mdev->state_sysfs = sysfs_get_dirent(mdev->sdev->kobj.sd,
- NULL, "state");
+ mdev->state_sysfs = sysfs_get_dirent(mdev->sdev->kobj.sd, "state");
if (!mdev->state_sysfs) {
rc = -ENODEV;
dev_err(&pdev->dev, "sysfs_get_dirent failed rc %d\n", rc);
--
1.8.4.rc3
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 836 bytes --]
next reply other threads:[~2013-10-03 23:54 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-10-03 23:54 Mark Brown [this message]
2013-10-04 0:11 ` Build failure after merge of the char-misc tree Greg Kroah-Hartman
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=20131003235419.GG27287@sirena.org.uk \
--to=broonie@kernel$(echo .)org \
--cc=ashutosh.dixit@intel$(echo .)com \
--cc=dasaratharaman.chandramouli@intel$(echo .)com \
--cc=gregkh@linuxfoundation$(echo .)org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=sudeep.dutt@intel$(echo .)com \
--cc=thierry.reding@gmail$(echo .)com \
--cc=tj@kernel$(echo .)org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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