diff --git a/drivers/interconnect/core.c b/drivers/interconnect/core.c
index aba5d38ea9d1..2d2e49780511 100644
--- a/drivers/interconnect/core.c
+++ b/drivers/interconnect/core.c
@@ -944,12 +944,7 @@ static int __init icc_init(void)
 	return 0;
 }
 
-static void __exit icc_exit(void)
-{
-	debugfs_remove_recursive(icc_debugfs_dir);
-}
-module_init(icc_init);
-module_exit(icc_exit);
+device_initcall(icc_init);
 
 MODULE_AUTHOR("Georgi Djakov <georgi.djakov@linaro.org>");
 MODULE_DESCRIPTION("Interconnect Driver Core");