Merge back sysfs-related ACPI material for v5.9.

rafaeljw · rafaeljw · commit da85a855104d · 2020-06-29T13:49:49.000+02:00
diff --git 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,

Original file line number	Diff line number	Diff line change
`@@ -938,13 +938,13 @@ static void __exit interrupt_stats_exit(void)`
`938`	`938`	`}`
`939`	`939`
`940`	`940`	`static ssize_t`
`941`		`-acpi_show_profile(struct device dev, struct device_attribute attr,`
	`941`	`+acpi_show_profile(struct kobject kobj, struct kobj_attribute attr,`
`942`	`942`	`char *buf)`
`943`	`943`	`{`
`944`	`944`	`return sprintf(buf, "%d\n", acpi_gbl_FADT.preferred_profile);`
`945`	`945`	`}`
`946`	`946`
`947`		`-static const struct device_attribute pm_profile_attr =`
	`947`	`+static const struct kobj_attribute pm_profile_attr =`
`948`	`948`	`__ATTR(pm_profile, S_IRUGO, acpi_show_profile, NULL);`
`949`	`949`
`950`	`950`	`static ssize_t hotplug_enabled_show(struct kobject *kobj,`