Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b12b73f1 authored by Michel Lespinasse's avatar Michel Lespinasse Committed by Greg Kroah-Hartman
Browse files

firmware: fix google/gsmi duplicate efivars_sysfs_init() 



Starting in commit e14ab23d,
efivars_sysfs_init() is called both by itself as an init function,
and by drivers/firmware/google/gsmi.c gsmi_init().

This results in runtime warnings such as the following:
[    5.651330] WARNING: at fs/sysfs/dir.c:530 sysfs_add_one+0xbd/0xe0()
[    5.657699] sysfs: cannot create duplicate filename '/firmware/gsmi/vars'

Fixing this by removing the redundant efivars_sysfs_init() call in
gsmi_init().

Tested: booted, checked that /firmware/gsmi/vars was still present and
showed the expected contents.

Signed-off-by: default avatarMichel Lespinasse <walken@google.com>
Acked-by: default avatarMatt Fleming <matt.fleming@intel.com>
Acked-by: default avatarMike Waychison <mikew@google.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 4272b961

drivers/firmware/google/gsmi.c

+0 −7
Original line number Diff line number Diff line
@@ -892,13 +892,6 @@ static __init int gsmi_init(void) 
		goto out_remove_sysfs_files;

	}



	ret = efivars_sysfs_init();

	if (ret) {

		printk(KERN_INFO "gsmi: Failed to create efivars files\n");

		efivars_unregister(&efivars);

		goto out_remove_sysfs_files;

	}



	register_reboot_notifier(&gsmi_reboot_notifier);

	register_die_notifier(&gsmi_die_notifier);

	atomic_notifier_chain_register(&panic_notifier_list,