mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-15 15:15:47 +00:00
hwmon: (fam15h_power) Make actual power reporting conditional
power1_input should only be reported for Fam15h, Models 00h-0fh
So, introduce a is_visible function to take care of this.
As suggested by Guenter here:
http://marc.info/?l=linux-kernel&m=141038145616437&w=2
Suggested-by: Guenter Roeck <linux@roeck-us.net>
Fixes: 22e32f4f57
('x86,AMD: Power driver support for AMD's family 16h processors')
Signed-off-by: Aravind Gopalakrishnan <Aravind.Gopalakrishnan@amd.com>
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
This commit is contained in:
parent
9e82bf0141
commit
961a23788c
1 changed files with 17 additions and 1 deletions
|
@ -93,13 +93,29 @@ static ssize_t show_power_crit(struct device *dev,
|
||||||
}
|
}
|
||||||
static DEVICE_ATTR(power1_crit, S_IRUGO, show_power_crit, NULL);
|
static DEVICE_ATTR(power1_crit, S_IRUGO, show_power_crit, NULL);
|
||||||
|
|
||||||
|
static umode_t fam15h_power_is_visible(struct kobject *kobj,
|
||||||
|
struct attribute *attr,
|
||||||
|
int index)
|
||||||
|
{
|
||||||
|
/* power1_input is only reported for Fam15h, Models 00h-0fh */
|
||||||
|
if (attr == &dev_attr_power1_input.attr &&
|
||||||
|
(boot_cpu_data.x86 != 0x15 || boot_cpu_data.x86_model > 0xf))
|
||||||
|
return 0;
|
||||||
|
|
||||||
|
return attr->mode;
|
||||||
|
}
|
||||||
|
|
||||||
static struct attribute *fam15h_power_attrs[] = {
|
static struct attribute *fam15h_power_attrs[] = {
|
||||||
&dev_attr_power1_input.attr,
|
&dev_attr_power1_input.attr,
|
||||||
&dev_attr_power1_crit.attr,
|
&dev_attr_power1_crit.attr,
|
||||||
NULL
|
NULL
|
||||||
};
|
};
|
||||||
|
|
||||||
ATTRIBUTE_GROUPS(fam15h_power);
|
static const struct attribute_group fam15h_power_group = {
|
||||||
|
.attrs = fam15h_power_attrs,
|
||||||
|
.is_visible = fam15h_power_is_visible,
|
||||||
|
};
|
||||||
|
__ATTRIBUTE_GROUPS(fam15h_power);
|
||||||
|
|
||||||
static bool fam15h_power_is_internal_node0(struct pci_dev *f4)
|
static bool fam15h_power_is_internal_node0(struct pci_dev *f4)
|
||||||
{
|
{
|
||||||
|
|
Loading…
Reference in a new issue