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

Commit 7129707e authored by Darren Hart (VMware)'s avatar Darren Hart (VMware)
Browse files

platform/x86: Fix dell driver init order 



Update the initcall ordering to satisfy the following dependency
ordering:

1. DCDBAS, ACPI_WMI
2. DELL_SMBIOS, DELL_RBTN
3. DELL_LAPTOP, DELL_WMI

By assigning them to the following initcall levels:

subsys_initcall: DCDBAS, ACPI_WMI
module_init: DELL_SMBIOS, DELL_RBTN
late_initcall: DELL_LAPTOP, DELL_WMI

Cc: Dominik Brodowski <linux@dominikbrodowski.net>
Cc: Mario.Limonciello@dell.com
Signed-off-by: default avatarDarren Hart (VMware) <dvhart@infradead.org>
parent 4716007c

drivers/firmware/dcdbas.c

+1 −1
Original line number Diff line number Diff line
@@ -639,7 +639,7 @@ static void __exit dcdbas_exit(void) 
	platform_driver_unregister(&dcdbas_driver);

}



module_init(dcdbas_init);

subsys_initcall_sync(dcdbas_init);

module_exit(dcdbas_exit);



MODULE_DESCRIPTION(DRIVER_DESCRIPTION " (version " DRIVER_VERSION ")");

drivers/platform/x86/dell-smbios-base.c

+1 −1
Original line number Diff line number Diff line
@@ -637,7 +637,7 @@ static void __exit dell_smbios_exit(void) 
	mutex_unlock(&smbios_mutex);

}



subsys_initcall(dell_smbios_init);

module_init(dell_smbios_init);

module_exit(dell_smbios_exit);



MODULE_AUTHOR("Matthew Garrett <mjg@redhat.com>");

drivers/platform/x86/dell-wmi.c

+1 −1
Original line number Diff line number Diff line
@@ -714,7 +714,7 @@ static int __init dell_wmi_init(void) 


	return wmi_driver_register(&dell_wmi_driver);

}

module_init(dell_wmi_init);

late_initcall(dell_wmi_init);



static void __exit dell_wmi_exit(void)

{