summaryrefslogtreecommitdiff
path: root/drivers/acpi
diff options
context:
space:
mode:
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>2020-06-26 18:06:29 +0300
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2020-06-26 18:06:29 +0300
commit0f29c20bf4342c7757d9f4bf81159b02498b1b0d (patch)
tree72e23a79c262928ea75fc3abfcf7e141d9d61a36 /drivers/acpi
parent75b0cea7bf307f362057cc778efe89af4c615354 (diff)
parente6d701dca9893990d999fd145e3e07223c002b06 (diff)
downloadlinux-0f29c20bf4342c7757d9f4bf81159b02498b1b0d.tar.xz
Merge branch 'acpi-sysfs'
* acpi-sysfs: ACPI: sysfs: Fix pm_profile_attr type
Diffstat (limited to 'drivers/acpi')
-rw-r--r--drivers/acpi/sysfs.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/acpi/sysfs.c b/drivers/acpi/sysfs.c
index 3a89909b50a6..76c668c05fa0 100644
--- a/drivers/acpi/sysfs.c
+++ b/drivers/acpi/sysfs.c
@@ -938,13 +938,13 @@ static void __exit interrupt_stats_exit(void)
}
static ssize_t
-acpi_show_profile(struct device *dev, struct device_attribute *attr,
+acpi_show_profile(struct kobject *kobj, struct kobj_attribute *attr,
char *buf)
{
return sprintf(buf, "%d\n", acpi_gbl_FADT.preferred_profile);
}
-static const struct device_attribute pm_profile_attr =
+static const struct kobj_attribute pm_profile_attr =
__ATTR(pm_profile, S_IRUGO, acpi_show_profile, NULL);
static ssize_t hotplug_enabled_show(struct kobject *kobj,