Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6 (474829e8) · Commits · e / devices / android_kernel_fairphone_FP5

MAINTAINERS

+0 −15

Original line number	Original line	Diff line number	Diff line
	@@ -243,21 +243,6 @@ F: drivers/pnp/pnpacpi/
	F: include/linux/acpi.h		F: include/linux/acpi.h
	F: include/acpi/		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		ACPI FAN DRIVER
	M: Zhang Rui <rui.zhang@intel.com>		M: Zhang Rui <rui.zhang@intel.com>
	L: linux-acpi@vger.kernel.org		L: linux-acpi@vger.kernel.org

arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -701,6 +701,7 @@ static int acpi_cpufreq_cpu_exit(struct cpufreq_policy *policy)
	per_cpu(acfreq_data, policy->cpu) = NULL;		per_cpu(acfreq_data, policy->cpu) = NULL;
	acpi_processor_unregister_performance(data->acpi_data,		acpi_processor_unregister_performance(data->acpi_data,
	policy->cpu);		policy->cpu);
			kfree(data->freq_table);
	kfree(data);		kfree(data);
	}		}

drivers/acpi/Kconfig

+4 −9

Original line number	Original line	Diff line number	Diff line
	@@ -9,7 +9,6 @@ menuconfig ACPI
	depends on PCI		depends on PCI
	depends on PM		depends on PM
	select PNP		select PNP
	select CPU_IDLE
	default y		default y
	help		help
	Advanced Configuration and Power Interface (ACPI) support for		Advanced Configuration and Power Interface (ACPI) support for
	@@ -66,7 +65,6 @@ config ACPI_PROCFS
	config ACPI_PROCFS_POWER		config ACPI_PROCFS_POWER
	bool "Deprecated power /proc/acpi directories"		bool "Deprecated power /proc/acpi directories"
	depends on PROC_FS		depends on PROC_FS
	default y
	help		help
	For backwards compatibility, this option allows		For backwards compatibility, this option allows
	deprecated power /proc/acpi/ directories to exist, even when		deprecated power /proc/acpi/ directories to exist, even when
	@@ -90,13 +88,6 @@ config ACPI_POWER_METER
	To compile this driver as a module, choose M here:		To compile this driver as a module, choose M here:
	the module will be called power-meter.		the module will be called power-meter.

	config ACPI_SYSFS_POWER
	bool "Future power /sys interface"
	select POWER_SUPPLY
	default y
	help
	Say N to disable power /sys interface

	config ACPI_EC_DEBUGFS		config ACPI_EC_DEBUGFS
	tristate "EC read/write access through /sys/kernel/debug/ec"		tristate "EC read/write access through /sys/kernel/debug/ec"
	default n		default n
	@@ -136,6 +127,7 @@ config ACPI_PROC_EVENT
	config ACPI_AC		config ACPI_AC
	tristate "AC Adapter"		tristate "AC Adapter"
	depends on X86		depends on X86
			select POWER_SUPPLY
	default y		default y
	help		help
	This driver supports the AC Adapter object, which indicates		This driver supports the AC Adapter object, which indicates
	@@ -148,6 +140,7 @@ config ACPI_AC
	config ACPI_BATTERY		config ACPI_BATTERY
	tristate "Battery"		tristate "Battery"
	depends on X86		depends on X86
			select POWER_SUPPLY
	default y		default y
	help		help
	This driver adds support for battery information through		This driver adds support for battery information through
	@@ -206,6 +199,7 @@ config ACPI_DOCK
	config ACPI_PROCESSOR		config ACPI_PROCESSOR
	tristate "Processor"		tristate "Processor"
	select THERMAL		select THERMAL
			select CPU_IDLE
	default y		default y
	help		help
	This driver installs ACPI as the idle handler for Linux and uses		This driver installs ACPI as the idle handler for Linux and uses
	@@ -364,6 +358,7 @@ config ACPI_HOTPLUG_MEMORY
	config ACPI_SBS		config ACPI_SBS
	tristate "Smart Battery System"		tristate "Smart Battery System"
	depends on X86		depends on X86
			select POWER_SUPPLY
	help		help
	This driver supports the Smart Battery System, another		This driver supports the Smart Battery System, another
	type of access to battery information, found on some laptops.		type of access to battery information, found on some laptops.

drivers/acpi/ac.c

+0 −14

Original line number	Original line	Diff line number	Diff line
	@@ -32,9 +32,7 @@
	#include <linux/proc_fs.h>		#include <linux/proc_fs.h>
	#include <linux/seq_file.h>		#include <linux/seq_file.h>
	#endif		#endif
	#ifdef CONFIG_ACPI_SYSFS_POWER
	#include <linux/power_supply.h>		#include <linux/power_supply.h>
	#endif
	#include <acpi/acpi_bus.h>		#include <acpi/acpi_bus.h>
	#include <acpi/acpi_drivers.h>		#include <acpi/acpi_drivers.h>

	@@ -86,9 +84,7 @@ static struct acpi_driver acpi_ac_driver = {
	};		};

	struct acpi_ac {		struct acpi_ac {
	#ifdef CONFIG_ACPI_SYSFS_POWER
	struct power_supply charger;		struct power_supply charger;
	#endif
	struct acpi_device * device;		struct acpi_device * device;
	unsigned long long state;		unsigned long long state;
	};		};
	@@ -104,7 +100,6 @@ static const struct file_operations acpi_ac_fops = {
	.release = single_release,		.release = single_release,
	};		};
	#endif		#endif
	#ifdef CONFIG_ACPI_SYSFS_POWER
	static int get_ac_property(struct power_supply *psy,		static int get_ac_property(struct power_supply *psy,
	enum power_supply_property psp,		enum power_supply_property psp,
	union power_supply_propval *val)		union power_supply_propval *val)
	@@ -123,7 +118,6 @@ static int get_ac_property(struct power_supply *psy,
	static enum power_supply_property ac_props[] = {		static enum power_supply_property ac_props[] = {
	POWER_SUPPLY_PROP_ONLINE,		POWER_SUPPLY_PROP_ONLINE,
	};		};
	#endif
	/* --------------------------------------------------------------------------		/* --------------------------------------------------------------------------
	AC Adapter Management		AC Adapter Management
	-------------------------------------------------------------------------- */		-------------------------------------------------------------------------- */
	@@ -247,9 +241,7 @@ static void acpi_ac_notify(struct acpi_device *device, u32 event)
	dev_name(&device->dev), event,		dev_name(&device->dev), event,
	(u32) ac->state);		(u32) ac->state);
	acpi_notifier_call_chain(device, event, (u32) ac->state);		acpi_notifier_call_chain(device, event, (u32) ac->state);
	#ifdef CONFIG_ACPI_SYSFS_POWER
	kobject_uevent(&ac->charger.dev->kobj, KOBJ_CHANGE);		kobject_uevent(&ac->charger.dev->kobj, KOBJ_CHANGE);
	#endif
	}		}

	return;		return;
	@@ -282,14 +274,12 @@ static int acpi_ac_add(struct acpi_device *device)
	#endif		#endif
	if (result)		if (result)
	goto end;		goto end;
	#ifdef CONFIG_ACPI_SYSFS_POWER
	ac->charger.name = acpi_device_bid(device);		ac->charger.name = acpi_device_bid(device);
	ac->charger.type = POWER_SUPPLY_TYPE_MAINS;		ac->charger.type = POWER_SUPPLY_TYPE_MAINS;
	ac->charger.properties = ac_props;		ac->charger.properties = ac_props;
	ac->charger.num_properties = ARRAY_SIZE(ac_props);		ac->charger.num_properties = ARRAY_SIZE(ac_props);
	ac->charger.get_property = get_ac_property;		ac->charger.get_property = get_ac_property;
	power_supply_register(&ac->device->dev, &ac->charger);		power_supply_register(&ac->device->dev, &ac->charger);
	#endif

	printk(KERN_INFO PREFIX "%s [%s] (%s)\n",		printk(KERN_INFO PREFIX "%s [%s] (%s)\n",
	acpi_device_name(device), acpi_device_bid(device),		acpi_device_name(device), acpi_device_bid(device),
	@@ -316,10 +306,8 @@ static int acpi_ac_resume(struct acpi_device *device)
	old_state = ac->state;		old_state = ac->state;
	if (acpi_ac_get_state(ac))		if (acpi_ac_get_state(ac))
	return 0;		return 0;
	#ifdef CONFIG_ACPI_SYSFS_POWER
	if (old_state != ac->state)		if (old_state != ac->state)
	kobject_uevent(&ac->charger.dev->kobj, KOBJ_CHANGE);		kobject_uevent(&ac->charger.dev->kobj, KOBJ_CHANGE);
	#endif
	return 0;		return 0;
	}		}

	@@ -333,10 +321,8 @@ static int acpi_ac_remove(struct acpi_device *device, int type)

	ac = acpi_driver_data(device);		ac = acpi_driver_data(device);

	#ifdef CONFIG_ACPI_SYSFS_POWER
	if (ac->charger.dev)		if (ac->charger.dev)
	power_supply_unregister(&ac->charger);		power_supply_unregister(&ac->charger);
	#endif
	#ifdef CONFIG_ACPI_PROCFS_POWER		#ifdef CONFIG_ACPI_PROCFS_POWER
	acpi_ac_remove_fs(device);		acpi_ac_remove_fs(device);
	#endif		#endif

drivers/acpi/acpica/Makefile

+3 −2

Original line number	Original line	Diff line number	Diff line
	@@ -21,7 +21,7 @@ acpi-y += exconfig.o exfield.o exnames.o exoparg6.o exresolv.o exstorob.o\
	excreate.o exmisc.o exoparg2.o exregion.o exstore.o exutils.o \		excreate.o exmisc.o exoparg2.o exregion.o exstore.o exutils.o \
	exdump.o exmutex.o exoparg3.o exresnte.o exstoren.o exdebug.o		exdump.o exmutex.o exoparg3.o exresnte.o exstoren.o exdebug.o

	acpi-y += hwacpi.o hwgpe.o hwregs.o hwsleep.o hwxface.o hwvalid.o		acpi-y += hwacpi.o hwgpe.o hwregs.o hwsleep.o hwxface.o hwvalid.o hwpci.o

	acpi-$(ACPI_FUTURE_USAGE) += hwtimer.o		acpi-$(ACPI_FUTURE_USAGE) += hwtimer.o

	@@ -44,4 +44,5 @@ acpi-y += tbxface.o tbinstal.o tbutils.o tbfind.o tbfadt.o tbxfroot.o

	acpi-y += utalloc.o utdebug.o uteval.o utinit.o utmisc.o utxface.o \		acpi-y += utalloc.o utdebug.o uteval.o utinit.o utmisc.o utxface.o \
	utcopy.o utdelete.o utglobal.o utmath.o utobject.o \		utcopy.o utdelete.o utglobal.o utmath.o utobject.o \
	utstate.o utmutex.o utobject.o utresrc.o utlock.o utids.o		utstate.o utmutex.o utobject.o utresrc.o utlock.o utids.o \
			utosi.o utxferror.o