iwlwifi: only show active power level via sysfs
This changes the power_level file to adhere to the "one value per file" sysfs rule. The user will know which power level was requested as it will be the number just written to this file. It is thus not necessary to create a new sysfs file for this value. In addition it fixes a problem where powertop's parsing expects this value to be the first value in this file without any descriptions. Signed-off-by: Reinette Chatre <reinette.chatre@intel.com> cc: stable@kernel.org Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
parent
513a2396d8
commit
872ed1902f
|
@ -2675,12 +2675,10 @@ static ssize_t show_power_level(struct device *d,
|
||||||
struct device_attribute *attr, char *buf)
|
struct device_attribute *attr, char *buf)
|
||||||
{
|
{
|
||||||
struct iwl_priv *priv = dev_get_drvdata(d);
|
struct iwl_priv *priv = dev_get_drvdata(d);
|
||||||
int mode = priv->power_data.user_power_setting;
|
|
||||||
int level = priv->power_data.power_mode;
|
int level = priv->power_data.power_mode;
|
||||||
char *p = buf;
|
char *p = buf;
|
||||||
|
|
||||||
p += sprintf(p, "INDEX:%d\t", level);
|
p += sprintf(p, "%d\n", level);
|
||||||
p += sprintf(p, "USER:%d\n", mode);
|
|
||||||
return p - buf + 1;
|
return p - buf + 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -3643,12 +3643,10 @@ static ssize_t show_power_level(struct device *d,
|
||||||
struct device_attribute *attr, char *buf)
|
struct device_attribute *attr, char *buf)
|
||||||
{
|
{
|
||||||
struct iwl_priv *priv = dev_get_drvdata(d);
|
struct iwl_priv *priv = dev_get_drvdata(d);
|
||||||
int mode = priv->power_data.user_power_setting;
|
|
||||||
int level = priv->power_data.power_mode;
|
int level = priv->power_data.power_mode;
|
||||||
char *p = buf;
|
char *p = buf;
|
||||||
|
|
||||||
p += sprintf(p, "INDEX:%d\t", level);
|
p += sprintf(p, "%d\n", level);
|
||||||
p += sprintf(p, "USER:%d\n", mode);
|
|
||||||
return p - buf + 1;
|
return p - buf + 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue