Merge branch 'pm-em'

rafaeljw · rafaeljw · commit 6f3a283c2f6b · 2021-03-26T16:44:26.000+01:00
* pm-em:
  PM: EM: postpone creating the debugfs dir till fs_initcall
diff --git a/kernel/power/energy_model.c b/kernel/power/energy_model.c
@@ -98,7 +98,7 @@ static int __init em_debug_init(void)
 
 	return 0;
 }
-core_initcall(em_debug_init);
+fs_initcall(em_debug_init);
 #else /* CONFIG_DEBUG_FS */
 static void em_debug_create_pd(struct device *dev) {}
 static void em_debug_remove_pd(struct device *dev) {}

Original file line number	Diff line number	Diff line change
`@@ -98,7 +98,7 @@ static int __init em_debug_init(void)`
`98`	`98`
`99`	`99`	`return 0;`
`100`	`100`	`}`
`101`		`-core_initcall(em_debug_init);`
	`101`	`+fs_initcall(em_debug_init);`
`102`	`102`	`#else /* CONFIG_DEBUG_FS */`
`103`	`103`	`static void em_debug_create_pd(struct device *dev) {}`
`104`	`104`	`static void em_debug_remove_pd(struct device *dev) {}`