Merge branch 'bjorn-initcall-cleanup' into release (9a38f4ee) · Commits · 戴 / test

drivers/acpi/Makefile

+2 −6

Original line number	Diff line number	Diff line
		@@ -32,10 +32,8 @@ ifdef CONFIG_CPU_FREQ
		processor-objs += processor_perflib.o
		endif

		obj-y += bus.o glue.o
		obj-y += scan.o
		# Keep EC driver first. Initialization of others depend on it.
		obj-y += ec.o
		obj-y += bus.o glue.o scan.o ec.o \
		power.o system.o event.o
		obj-$(CONFIG_ACPI_AC) += ac.o
		obj-$(CONFIG_ACPI_BATTERY) += battery.o
		obj-$(CONFIG_ACPI_BUTTON) += button.o
		@@ -51,8 +49,6 @@ obj-$(CONFIG_ACPI_PCI_SLOT) += pci_slot.o
		obj-$(CONFIG_ACPI_PROCESSOR) += processor.o
		obj-$(CONFIG_ACPI_CONTAINER) += container.o
		obj-$(CONFIG_ACPI_THERMAL) += thermal.o
		obj-y += power.o
		obj-y += system.o event.o
		obj-$(CONFIG_ACPI_DEBUG) += debug.o
		obj-$(CONFIG_ACPI_NUMA) += numa.o
		obj-$(CONFIG_ACPI_HOTPLUG_MEMORY) += acpi_memhotplug.o

+15 −0

Original line number	Diff line number	Diff line
		@@ -39,6 +39,8 @@
		#include <acpi/acpi_bus.h>
		#include <acpi/acpi_drivers.h>

		#include "internal.h"

		#define _COMPONENT ACPI_BUS_COMPONENT
		ACPI_MODULE_NAME("bus");

		@@ -846,6 +848,7 @@ static int __init acpi_init(void)
		acpi_kobj = NULL;
		}

		init_acpi_device_notify();
		result = acpi_bus_init();

		if (!result) {
		@@ -860,11 +863,23 @@ static int __init acpi_init(void)
		}
		} else
		disable_acpi();

		if (acpi_disabled)
		return result;

		/*
		* If the laptop falls into the DMI check table, the power state check
		* will be disabled in the course of device power transistion.
		*/
		dmi_check_system(power_nocheck_dmi_table);

		acpi_scan_init();
		acpi_ec_init();
		acpi_power_init();
		acpi_system_init();
		acpi_debug_init();
		acpi_sleep_proc_init();
		acpi_wakeup_device_init();
		return result;
		}

+6 −8

Original line number	Diff line number	Diff line
		@@ -297,17 +297,15 @@ acpi_system_write_debug(struct file *file,

		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;
		int error = 0;
		char *name;


		if (acpi_disabled)
		return 0;

		/* 'debug_layer' [R/W] */
		name = ACPI_SYSTEM_FILE_DEBUG_LAYER;
		entry =
		@@ -338,7 +336,7 @@ static int __init acpi_debug_init(void)
		remove_proc_entry(ACPI_SYSTEM_FILE_DEBUG_LAYER, acpi_root_dir);
		error = -ENODEV;
		goto Done;
		}

		subsys_initcall(acpi_debug_init);
		#else
		return 0;
		#endif
		}

+1 −6

Original line number	Diff line number	Diff line
		@@ -1069,13 +1069,10 @@ static struct acpi_driver acpi_ec_driver = {
		},
		};

		static int __init acpi_ec_init(void)
		int __init acpi_ec_init(void)
		{
		int result = 0;

		if (acpi_disabled)
		return 0;

		acpi_ec_dir = proc_mkdir(ACPI_EC_CLASS, acpi_root_dir);
		if (!acpi_ec_dir)
		return -ENODEV;
		@@ -1090,8 +1087,6 @@ static int __init acpi_ec_init(void)
		return result;
		}

		subsys_initcall(acpi_ec_init);

		/* EC driver currently not unloadable */
		#if 0
		static void __exit acpi_ec_exit(void)

+1 −5

Original line number	Diff line number	Diff line
		@@ -286,10 +286,8 @@ static int acpi_platform_notify_remove(struct device *dev)
		return 0;
		}

		static int __init init_acpi_device_notify(void)
		int __init init_acpi_device_notify(void)
		{
		if (acpi_disabled)
		return 0;
		if (platform_notify \|\| platform_notify_remove) {
		printk(KERN_ERR PREFIX "Can't use platform_notify\n");
		return 0;
		@@ -298,5 +296,3 @@ static int __init init_acpi_device_notify(void)
		platform_notify_remove = acpi_platform_notify_remove;
		return 0;
		}

		arch_initcall(init_acpi_device_notify);