Skip to content

Commit

Permalink
Merge branch 'acpi-sysfs'
Browse files Browse the repository at this point in the history
* acpi-sysfs:
  ACPI: sysfs: Fix pm_profile_attr type
  • Loading branch information
Rafael J. Wysocki committed Jun 26, 2020
2 parents 75b0cea + e6d701d commit 0f29c20
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions drivers/acpi/sysfs.c
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down

0 comments on commit 0f29c20

Please sign in to comment.