Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 84f810c3 authored by Bjorn Helgaas's avatar Bjorn Helgaas Committed by Len Brown
Browse files

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: default avatarBjorn Helgaas <bjorn.helgaas@hp.com>
Signed-off-by: default avatarLen Brown <len.brown@intel.com>
parent 141a0af3

drivers/acpi/bus.c

+1 −0
Original line number Original line Diff line number Diff line
@@ -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;

}

}

drivers/acpi/debug.c

+6 −8
Original line number Original line Diff line number Diff line
@@ -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

}

drivers/acpi/internal.h

+6 −0
Original line number Original line Diff line number Diff line
@@ -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

   -------------------------------------------------------------------------- */

   -------------------------------------------------------------------------- */