[PATCH 7/7][SRU][OEM-5.10] platform/x86: dell-wmi-sysman: Cleanup create_attributes_level_sysfs_files()
AceLan Kao
acelan.kao at canonical.com
Thu Jun 10 06:47:54 UTC 2021
From: Hans de Goede <hdegoede at redhat.com>
BugLink: https://bugs.launchpad.net/bugs/1931509
Cleanup create_attributes_level_sysfs_files():
1. There is no need to call sysfs_remove_file() on error, sysman_init()
will already call release_attributes_data() on failure which already does
this.
2. There is no need for the pr_debug() calls sysfs_create_file() should
never fail and if it does it will already complain about the problem
itself.
Fixes: e8a60aa7404b ("platform/x86: Introduce support for Systems Management Driver over WMI for Dell Systems")
Cc: Divya Bharathi <Divya_Bharathi at dell.com>
Cc: Mario Limonciello <mario.limonciello at dell.com>
Signed-off-by: Hans de Goede <hdegoede at redhat.com>
Link: https://lore.kernel.org/r/20210321115901.35072-8-hdegoede@redhat.com
(cherry picked from commit 42f38dcccfb3c235f25f5b0b5a99436ccfcd0737)
Signed-off-by: Chia-Lin Kao (AceLan) <acelan.kao at canonical.com>
---
.../platform/x86/dell/dell-wmi-sysman/sysman.c | 16 +++++++---------
1 file changed, 7 insertions(+), 9 deletions(-)
diff --git a/drivers/platform/x86/dell/dell-wmi-sysman/sysman.c b/drivers/platform/x86/dell/dell-wmi-sysman/sysman.c
index 1d996bbf7f5a7..a90ae6ba4a73b 100644
--- a/drivers/platform/x86/dell/dell-wmi-sysman/sysman.c
+++ b/drivers/platform/x86/dell/dell-wmi-sysman/sysman.c
@@ -210,19 +210,17 @@ static struct kobj_attribute pending_reboot = __ATTR_RO(pending_reboot);
*/
static int create_attributes_level_sysfs_files(void)
{
- int ret = sysfs_create_file(&wmi_priv.main_dir_kset->kobj, &reset_bios.attr);
+ int ret;
- if (ret) {
- pr_debug("could not create reset_bios file\n");
+ ret = sysfs_create_file(&wmi_priv.main_dir_kset->kobj, &reset_bios.attr);
+ if (ret)
return ret;
- }
ret = sysfs_create_file(&wmi_priv.main_dir_kset->kobj, &pending_reboot.attr);
- if (ret) {
- pr_debug("could not create changing_pending_reboot file\n");
- sysfs_remove_file(&wmi_priv.main_dir_kset->kobj, &reset_bios.attr);
- }
- return ret;
+ if (ret)
+ return ret;
+
+ return 0;
}
static ssize_t wmi_sysman_attr_show(struct kobject *kobj, struct attribute *attr,
--
2.25.1
More information about the kernel-team
mailing list