From: Hongbo Yao <yaohongbo@huawei.com>
To: <gregkh@linuxfoundation.org>, <christian.brauner@ubuntu.com>
Cc: <linux-kernel@vger.kernel.org>, <linux-pm@vger.kernel.org>,
<yaohongbo@huawei.com>, <chenzhou10@huawei.com>,
<rjw@rjwysocki.net>, <pavel@ucw.cz>
Subject: [PATCH -next] drivers/base/power: fix build error without SYSFS
Date: Mon, 2 Mar 2020 17:29:18 +0800 [thread overview]
Message-ID: <20200302092918.40163-1-yaohongbo@huawei.com> (raw)
If CONFIG_SYSFS=n, the following error is seen while building
drivers/base/power/sysfs.c:
drivers/base/power/sysfs.c: In function dpm_sysfs_change_owner:
drivers/base/power/sysfs.c:708:44: error: passing argument 2 of
sysfs_group_change_owner from incompatible pointer type
[-Werror=incompatible-pointer-types]
rc = sysfs_group_change_owner(&dev->kobj, &pm_attr_group, kuid, kgid);
^
In file included from ./include/linux/kobject.h:20:0,
from ./include/linux/device.h:17,
from drivers/base/power/sysfs.c:3:
./include/linux/sysfs.h:564:19: note: expected const struct
attribute_group ** but argument is of type const struct attribute_group *
dpm_sysfs_change_owner() should only used when CONFIG_SYSFS is
defined.
Reported-by: Hulk Robot <hulkci@huawei.com>
Fixes: 3b52fc5d7876 ("drivers/base/power: add dpm_sysfs_change_owner()")
Signed-off-by: Hongbo Yao <yaohongbo@huawei.com>
---
drivers/base/power/power.h | 10 +++++++++-
drivers/base/power/sysfs.c | 2 ++
2 files changed, 11 insertions(+), 1 deletion(-)
diff --git a/drivers/base/power/power.h b/drivers/base/power/power.h
index 54292cdd7808..4bd88f696be9 100644
--- a/drivers/base/power/power.h
+++ b/drivers/base/power/power.h
@@ -74,7 +74,6 @@ extern int pm_qos_sysfs_add_flags(struct device *dev);
extern void pm_qos_sysfs_remove_flags(struct device *dev);
extern int pm_qos_sysfs_add_latency_tolerance(struct device *dev);
extern void pm_qos_sysfs_remove_latency_tolerance(struct device *dev);
-extern int dpm_sysfs_change_owner(struct device *dev, kuid_t kuid, kgid_t kgid);
#else /* CONFIG_PM */
@@ -89,6 +88,15 @@ static inline void pm_runtime_remove(struct device *dev) {}
static inline int dpm_sysfs_add(struct device *dev) { return 0; }
static inline void dpm_sysfs_remove(struct device *dev) {}
+
+#endif
+
+#if defined(CONFIG_PM) && defined(CONFIG_SYSFS)
+
+extern int dpm_sysfs_change_owner(struct device *dev, kuid_t kuid, kgid_t kgid);
+
+#else
+
static inline int dpm_sysfs_change_owner(struct device *dev, kuid_t kuid,
kgid_t kgid) { return 0; }
diff --git a/drivers/base/power/sysfs.c b/drivers/base/power/sysfs.c
index 2b99fe1eb207..d6749f374ded 100644
--- a/drivers/base/power/sysfs.c
+++ b/drivers/base/power/sysfs.c
@@ -698,6 +698,7 @@ int dpm_sysfs_add(struct device *dev)
return rc;
}
+#ifdef CONFIG_SYSFS
int dpm_sysfs_change_owner(struct device *dev, kuid_t kuid, kgid_t kgid)
{
int rc;
@@ -736,6 +737,7 @@ int dpm_sysfs_change_owner(struct device *dev, kuid_t kuid, kgid_t kgid)
}
return 0;
}
+#endif
int wakeup_sysfs_add(struct device *dev)
{
--
2.17.1
next reply other threads:[~2020-03-02 9:14 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-03-02 9:29 Hongbo Yao [this message]
2020-03-02 9:23 ` [PATCH -next] drivers/base/power: fix build error without SYSFS Greg KH
2020-03-03 2:26 ` Hongbo Yao
2020-03-02 9:31 ` Christian Brauner
2020-03-03 3:17 ` Hongbo Yao
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=20200302092918.40163-1-yaohongbo@huawei.com \
--to=yaohongbo@huawei.com \
--cc=chenzhou10@huawei.com \
--cc=christian.brauner@ubuntu.com \
--cc=gregkh@linuxfoundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pm@vger.kernel.org \
--cc=pavel@ucw.cz \
--cc=rjw@rjwysocki.net \
/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).