openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

ACPI: call acpi_debug_init() explicitly rather than as initcall 

This patch makes acpi_init() call acpi_debug_init() directly.
Previously, both were subsys_initcalls.  acpi_debug_init()
must happen after acpi_init(), and it's better to call it
explicitly rather than rely on link ordering.

Signed-off-by: Bjorn Helgaas <bjorn.helgaas@hp.com>
Signed-off-by: Len Brown <len.brown@intel.com>
This commit is contained in:
Bjorn Helgaas 2009-03-24 16:50:03 -06:00 committed by Len Brown
parent 141a0af3ca
commit 84f810c33f
3 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
drivers/acpi/bus.c
View File

@ -883,6 +883,7 @@ static int __init acpi_init(void)
acpi_ec_init(); acpi_ec_init();
acpi_power_init(); acpi_power_init();
acpi_system_init(); acpi_system_init();
acpi_debug_init();
return result; return result;
} }

14
drivers/acpi/debug.c
View File

@ -297,17 +297,15 @@ acpi_system_write_debug(struct file *file,
return count; return count;
} }
#endif
static int __init acpi_debug_init(void) int __init acpi_debug_init(void)
{ {
#ifdef CONFIG_ACPI_PROCFS
struct proc_dir_entry *entry; struct proc_dir_entry *entry;
int error = 0; int error = 0;
char *name; char *name;
if (acpi_disabled)
return 0;
/* 'debug_layer' [R/W] */ /* 'debug_layer' [R/W] */
name = ACPI_SYSTEM_FILE_DEBUG_LAYER; name = ACPI_SYSTEM_FILE_DEBUG_LAYER;
entry = entry =
@ -338,7 +336,7 @@ static int __init acpi_debug_init(void)
remove_proc_entry(ACPI_SYSTEM_FILE_DEBUG_LAYER, acpi_root_dir); remove_proc_entry(ACPI_SYSTEM_FILE_DEBUG_LAYER, acpi_root_dir);
error = -ENODEV; error = -ENODEV;
goto Done; goto Done;
} #else
return 0;
subsys_initcall(acpi_debug_init);
#endif #endif
}

6
drivers/acpi/internal.h
View File

@ -3,6 +3,12 @@
int acpi_scan_init(void); int acpi_scan_init(void);
int acpi_system_init(void); int acpi_system_init(void);
#ifdef CONFIG_ACPI_DEBUG
int acpi_debug_init(void);
#else
static inline int acpi_debug_init(void) { return 0; }
#endif
/* -------------------------------------------------------------------------- /* --------------------------------------------------------------------------
Power Resource Power Resource
-------------------------------------------------------------------------- */ -------------------------------------------------------------------------- */