From: Hanjun Guo <guohanjun@huawei.com>
To: "Rafael J. Wysocki" <rafael@kernel.org>,
Daniel Lezcano <daniel.lezcano@linaro.org>,
Doug Smythies <dsmythies@telus.net>
Cc: <linux-pm@vger.kernel.org>, Jonathan Corbet <corbet@lwn.net>,
Hanjun Guo <guohanjun@huawei.com>
Subject: [PATCH 4/6] cpuidle: sysfs: Remove sysfs_switch and switch attributes
Date: Tue, 19 May 2020 14:25:23 +0800 [thread overview]
Message-ID: <1589869525-29893-5-git-send-email-guohanjun@huawei.com> (raw)
In-Reply-To: <1589869525-29893-1-git-send-email-guohanjun@huawei.com>
Since the cpuidle governor can be switched via sysfs in default,
remove sysfs_switch and cpuidle_switch_attrs.
Signed-off-by: Hanjun Guo <guohanjun@huawei.com>
Reviewed-by: Doug Smythies <dsmythies@telus.net>
Tested-by: Doug Smythies <dsmythies@telus.net>
Acked-by: Daniel Lezcano <daniel.lezcano@linaro.org>
---
drivers/cpuidle/sysfs.c | 22 ++--------------------
1 file changed, 2 insertions(+), 20 deletions(-)
diff --git a/drivers/cpuidle/sysfs.c b/drivers/cpuidle/sysfs.c
index b51c470d..14c0eb5 100644
--- a/drivers/cpuidle/sysfs.c
+++ b/drivers/cpuidle/sysfs.c
@@ -18,14 +18,6 @@
#include "cpuidle.h"
-static unsigned int sysfs_switch;
-static int __init cpuidle_sysfs_setup(char *unused)
-{
- sysfs_switch = 1;
- return 1;
-}
-__setup("cpuidle_sysfs_switch", cpuidle_sysfs_setup);
-
static ssize_t show_available_governors(struct device *dev,
struct device_attribute *attr,
char *buf)
@@ -112,7 +104,7 @@ static DEVICE_ATTR(current_governor, 0644, show_current_governor,
store_current_governor);
static DEVICE_ATTR(current_governor_ro, 0444, show_current_governor, NULL);
-static struct attribute *cpuidle_default_attrs[] = {
+static struct attribute *cpuidle_attrs[] = {
&dev_attr_available_governors.attr,
&dev_attr_current_driver.attr,
&dev_attr_current_governor.attr,
@@ -120,15 +112,8 @@ static DEVICE_ATTR(current_governor, 0644, show_current_governor,
NULL
};
-static struct attribute *cpuidle_switch_attrs[] = {
- &dev_attr_available_governors.attr,
- &dev_attr_current_driver.attr,
- &dev_attr_current_governor.attr,
- NULL
-};
-
static struct attribute_group cpuidle_attr_group = {
- .attrs = cpuidle_default_attrs,
+ .attrs = cpuidle_attrs,
.name = "cpuidle",
};
@@ -138,9 +123,6 @@ static DEVICE_ATTR(current_governor, 0644, show_current_governor,
*/
int cpuidle_add_interface(struct device *dev)
{
- if (sysfs_switch)
- cpuidle_attr_group.attrs = cpuidle_switch_attrs;
-
return sysfs_create_group(&dev->kobj, &cpuidle_attr_group);
}
--
1.7.12.4
next prev parent reply other threads:[~2020-05-19 6:32 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-05-19 6:25 [PATCH 0/6] cpuidle: Make cpuidle governor switchable to be the default behaviour Hanjun Guo
2020-05-19 6:25 ` [PATCH 1/6] cpuidle: sysfs: Fix the overlap for showing available governors Hanjun Guo
2020-05-19 15:43 ` Rafael J. Wysocki
2020-05-19 6:25 ` [PATCH 2/6] cpuidle: sysfs: Accept governor name with 15 characters Hanjun Guo
2020-05-19 6:25 ` [PATCH 3/6] cpuidle: Make cpuidle governor switchable to be the default behaviour Hanjun Guo
2020-05-19 6:25 ` Hanjun Guo [this message]
2020-05-19 6:25 ` [PATCH 5/6] Documentation: cpuidle: update the document Hanjun Guo
2020-05-19 6:25 ` [PATCH 6/6] Documentation: ABI: make current_governer_ro as a candidate for removal Hanjun Guo
2020-05-19 6:53 ` [PATCH 0/6] cpuidle: Make cpuidle governor switchable to be the default behaviour Hanjun Guo
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=1589869525-29893-5-git-send-email-guohanjun@huawei.com \
--to=guohanjun@huawei.com \
--cc=corbet@lwn.net \
--cc=daniel.lezcano@linaro.org \
--cc=dsmythies@telus.net \
--cc=linux-pm@vger.kernel.org \
--cc=rafael@kernel.org \
/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).