As multiple handlers may register for ACPI platform profile handler,
only remove the sysfs group when the last one unregisters.
Tested-by: Matthew Schwartz <matthew.schwartz@xxxxxxxxx>
Reviewed-by: Hans de Goede <hdegoede@xxxxxxxxxx>
Reviewed-by: Mark Pearson <mpearson-lenovo@xxxxxxxxx>
Signed-off-by: Mario Limonciello <mario.limonciello@xxxxxxx>
---
drivers/acpi/platform_profile.c | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
diff --git a/drivers/acpi/platform_profile.c b/drivers/acpi/platform_profile.c
index 2d971dba2d917..b70ceb11947d0 100644
--- a/drivers/acpi/platform_profile.c
+++ b/drivers/acpi/platform_profile.c
@@ -23,6 +23,12 @@ static const char * const profile_names[] = {
};
static_assert(ARRAY_SIZE(profile_names) == PLATFORM_PROFILE_LAST);
+static bool platform_profile_is_registered(void)
+{
+ lockdep_assert_held(&profile_lock);
+ return !list_empty(&platform_profile_handler_list);
+}
+
static ssize_t platform_profile_choices_show(struct device *dev,
struct device_attribute *attr,
char *buf)
@@ -184,8 +190,10 @@ int platform_profile_remove(struct platform_profile_handler *pprof)
list_del(&pprof->list);
- sysfs_remove_group(acpi_kobj, &platform_profile_group);
cur_profile = NULL;
+ if (!platform_profile_is_registered())
+ sysfs_remove_group(acpi_kobj, &platform_profile_group);
+
return 0;
}
EXPORT_SYMBOL_GPL(platform_profile_remove);
--
2.43.0
