diff options
| author |   Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2020-06-26 17:06:29 +0200 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2020-06-26 17:06:29 +0200 |
| commit | 0f29c20bf4342c7757d9f4bf81159b02498b1b0d (patch) | |
| tree | 72e23a79c262928ea75fc3abfcf7e141d9d61a36 /drivers | |
| parent | ACPI: configfs: Disallow loading ACPI tables when locked down (diff) | |
| parent | ACPI: sysfs: Fix pm_profile_attr type (diff) | |
| download | linux-dev-0f29c20bf4342c7757d9f4bf81159b02498b1b0d.tar.xz linux-dev-0f29c20bf4342c7757d9f4bf81159b02498b1b0d.zip | |
Merge branch 'acpi-sysfs'
* acpi-sysfs:
ACPI: sysfs: Fix pm_profile_attr type
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/acpi/sysfs.c | 4 |
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, |