Skip to content

Commit 3e8b4ec

Browse files
committed
platform/x86: dell-wmi-sysman: Cleanup create_attributes_level_sysfs_files()
jira LE-3064 Rebuild_History Non-Buildable kernel-4.18.0-553.53.1.el8_10 commit-author Hans de Goede <hdegoede@redhat.com> commit 42f38dc 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: e8a60aa ("platform/x86: Introduce support for Systems Management Driver over WMI for Dell Systems") Cc: Divya Bharathi <Divya_Bharathi@dell.com> Cc: Mario Limonciello <mario.limonciello@dell.com> Signed-off-by: Hans de Goede <hdegoede@redhat.com> Link: https://lore.kernel.org/r/20210321115901.35072-8-hdegoede@redhat.com (cherry picked from commit 42f38dc) Signed-off-by: Jonathan Maple <jmaple@ciq.com>
1 parent b9e4d1e commit 3e8b4ec

File tree

1 file changed

+7
-9
lines changed
  • drivers/platform/x86/dell-wmi-sysman

1 file changed

+7
-9
lines changed

drivers/platform/x86/dell-wmi-sysman/sysman.c

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -208,19 +208,17 @@ static struct kobj_attribute pending_reboot = __ATTR_RO(pending_reboot);
208208
*/
209209
static int create_attributes_level_sysfs_files(void)
210210
{
211-
int ret = sysfs_create_file(&wmi_priv.main_dir_kset->kobj, &reset_bios.attr);
211+
int ret;
212212

213-
if (ret) {
214-
pr_debug("could not create reset_bios file\n");
213+
ret = sysfs_create_file(&wmi_priv.main_dir_kset->kobj, &reset_bios.attr);
214+
if (ret)
215215
return ret;
216-
}
217216

218217
ret = sysfs_create_file(&wmi_priv.main_dir_kset->kobj, &pending_reboot.attr);
219-
if (ret) {
220-
pr_debug("could not create changing_pending_reboot file\n");
221-
sysfs_remove_file(&wmi_priv.main_dir_kset->kobj, &reset_bios.attr);
222-
}
223-
return ret;
218+
if (ret)
219+
return ret;
220+
221+
return 0;
224222
}
225223

226224
static ssize_t wmi_sysman_attr_show(struct kobject *kobj, struct attribute *attr,

0 commit comments

Comments
 (0)