diff --git a/drivers/staging/android/ion/heaps/ion_cma_heap.c b/drivers/staging/android/ion/heaps/ion_cma_heap.c
index 6ba7fd84c9ee..5ae0bacea2fe 100644
--- a/drivers/staging/android/ion/heaps/ion_cma_heap.c
+++ b/drivers/staging/android/ion/heaps/ion_cma_heap.c
@@ -146,6 +146,6 @@ static void __exit ion_cma_heap_exit(void)
 		ion_device_remove_heap(&cma_heaps[nr].heap);
 }
 
-module_init(ion_cma_heap_init);
+subsys_initcall(ion_cma_heap_init);
 module_exit(ion_cma_heap_exit);
 MODULE_LICENSE("GPL v2");
diff --git a/drivers/staging/android/ion/heaps/ion_system_heap.c b/drivers/staging/android/ion/heaps/ion_system_heap.c
index 706bd402509d..7727a2b0d849 100644
--- a/drivers/staging/android/ion/heaps/ion_system_heap.c
+++ b/drivers/staging/android/ion/heaps/ion_system_heap.c
@@ -293,6 +293,6 @@ static void __exit ion_system_heap_exit(void)
 	ion_system_heap_destroy_pools(system_heap.pools);
 }
 
-module_init(ion_system_heap_init);
+subsys_initcall(ion_system_heap_init);
 module_exit(ion_system_heap_exit);
 MODULE_LICENSE("GPL v2");