diff options
| author | Darren Hart (VMware) <dvhart@infradead.org> | 2018-03-13 07:28:00 +0100 |
|---|---|---|
| committer | Darren Hart (VMware) <dvhart@infradead.org> | 2018-03-14 18:48:06 +0100 |
| commit | 7129707ec2356ef9ef9cce469ad14eb37fbbe67e (patch) | |
| tree | b8dd1a46c1a5c9ef93e44e161a67c5db6a9e81ec /drivers/platform | |
| parent | platform/x86: dell-smbios: Resolve dependency error on ACPI_WMI (diff) | |
| download | linux-7129707ec2356ef9ef9cce469ad14eb37fbbe67e.tar.xz linux-7129707ec2356ef9ef9cce469ad14eb37fbbe67e.zip | |
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: Darren Hart (VMware) <dvhart@infradead.org>
Diffstat (limited to 'drivers/platform')
| -rw-r--r-- | drivers/platform/x86/dell-smbios-base.c | 2 | ||||
| -rw-r--r-- | drivers/platform/x86/dell-wmi.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/platform/x86/dell-smbios-base.c b/drivers/platform/x86/dell-smbios-base.c index 5bcf8a18f785..2485c80a9fdd 100644 --- a/drivers/platform/x86/dell-smbios-base.c +++ b/drivers/platform/x86/dell-smbios-base.c @@ -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>"); diff --git a/drivers/platform/x86/dell-wmi.c b/drivers/platform/x86/dell-wmi.c index 2c9927430d85..8d102195a392 100644 --- a/drivers/platform/x86/dell-wmi.c +++ b/drivers/platform/x86/dell-wmi.c @@ -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) { |