Merge branch 'misc' into release (7e318424) · Commits · 戴 / test

MAINTAINERS

+0 −15

Original line number	Diff line number	Diff line
		@@ -241,21 +241,6 @@ F: drivers/pnp/pnpacpi/
		F: include/linux/acpi.h
		F: include/acpi/

		ACPI BATTERY DRIVERS
		M: Alexey Starikovskiy <astarikovskiy@suse.de>
		L: linux-acpi@vger.kernel.org
		W: http://www.lesswatts.org/projects/acpi/
		S: Supported
		F: drivers/acpi/battery.c
		F: drivers/acpi/sbs

		ACPI EC DRIVER
		M: Alexey Starikovskiy <astarikovskiy@suse.de>
		L: linux-acpi@vger.kernel.org
		W: http://www.lesswatts.org/projects/acpi/
		S: Supported
		F: drivers/acpi/ec.c

		ACPI FAN DRIVER
		M: Zhang Rui <rui.zhang@intel.com>
		L: linux-acpi@vger.kernel.org

+1 −1

Original line number	Diff line number	Diff line
		@@ -9,7 +9,6 @@ menuconfig ACPI
		depends on PCI
		depends on PM
		select PNP
		select CPU_IDLE
		default y
		help
		Advanced Configuration and Power Interface (ACPI) support for
		@@ -200,6 +199,7 @@ config ACPI_DOCK
		config ACPI_PROCESSOR
		tristate "Processor"
		select THERMAL
		select CPU_IDLE
		default y
		help
		This driver installs ACPI as the idle handler for Linux and uses

+6 −1

Original line number	Diff line number	Diff line
		@@ -935,6 +935,12 @@ static int __init acpi_bus_init(void)
		goto error1;
		}

		/*
		* _PDC control method may load dynamic SSDT tables,
		* and we need to install the table handler before that.
		*/
		acpi_sysfs_init();

		acpi_early_processor_set_pdc();

		/*
		@@ -1026,7 +1032,6 @@ static int __init acpi_init(void)
		acpi_scan_init();
		acpi_ec_init();
		acpi_power_init();
		acpi_sysfs_init();
		acpi_debugfs_init();
		acpi_sleep_proc_init();
		acpi_wakeup_device_init();

+3 −3

Original line number	Diff line number	Diff line
		@@ -930,7 +930,7 @@ static struct attribute_group dock_attribute_group = {
		* allocated and initialize a new dock station device. Find all devices
		* that are on the dock station, and register for dock event notifications.
		*/
		static int dock_add(acpi_handle handle)
		static int __init dock_add(acpi_handle handle)
		{
		int ret, id;
		struct dock_station ds, *dock_station;
		@@ -1024,7 +1024,7 @@ static int dock_remove(struct dock_station *ds)
		*
		* This is called by acpi_walk_namespace to look for dock stations.
		*/
		static acpi_status
		static __init acpi_status
		find_dock(acpi_handle handle, u32 lvl, void context, void *rv)
		{
		if (is_dock(handle))
		@@ -1033,7 +1033,7 @@ find_dock(acpi_handle handle, u32 lvl, void context, void *rv)
		return AE_OK;
		}

		static acpi_status
		static __init acpi_status
		find_bay(acpi_handle handle, u32 lvl, void context, void *rv)
		{
		/* If bay is a dock, it's already handled */

+0 −25

Original line number	Diff line number	Diff line
		@@ -874,16 +874,6 @@ void acpi_os_wait_events_complete(void *context)

		EXPORT_SYMBOL(acpi_os_wait_events_complete);

		/*
		* Allocate the memory for a spinlock and initialize it.
		*/
		acpi_status acpi_os_create_lock(acpi_spinlock * handle)
		{
		spin_lock_init(*handle);

		return AE_OK;
		}

		/*
		* Deallocate the memory for a spinlock.
		*/
		@@ -1265,21 +1255,6 @@ int acpi_check_region(resource_size_t start, resource_size_t n,
		}
		EXPORT_SYMBOL(acpi_check_region);

		int acpi_check_mem_region(resource_size_t start, resource_size_t n,
		const char *name)
		{
		struct resource res = {
		.start = start,
		.end = start + n - 1,
		.name = name,
		.flags = IORESOURCE_MEM,
		};

		return acpi_check_resource_conflict(&res);

		}
		EXPORT_SYMBOL(acpi_check_mem_region);

		/*
		* Let drivers know whether the resource checks are effective
		*/