Commit 8e32e47d authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

Merge branch 'acpi-cleanup' 

* acpi-cleanup: (34 commits)
  ACPI / proc: Remove alarm proc file
  ACPI: Remove CONFIG_ACPI_PROCFS_POWER and cm_sbsc.c
  ACPI / SBS: Remove SBS's proc directory
  ACPI / Battery: Remove battery's proc directory
  ACP / fan: trivial style cleanup
  ACPI / processor: remove superfluous pr == NULL checks
  ACPI / mm: use NUMA_NO_NODE
  toshiba_acpi: convert acpi_evaluate_object() to acpi_evaluate_integer()
  intel-smartconnect: convert acpi_evaluate_object() to acpi_evaluate_integer()
  intel-rst: convert acpi_evaluate_object() to acpi_evaluate_integer()
  fujitsu-laptop: convert acpi_evaluate_object() to acpi_evaluate_integer()
  i2c-hid: convert acpi_evaluate_object() to acpi_evaluate_integer()
  ACPI: dock: convert acpi_evaluate_object() to acpi_evaluate_integer()
  acpi_processor: convert acpi_evaluate_object() to acpi_evaluate_integer()
  pnpacpi: convert acpi_get_handle() to acpi_has_method()
  wmi: convert acpi_get_handle() to acpi_has_method()
  toshiba_acpi: convert acpi_get_handle() to acpi_has_method()
  sony-laptop: convert acpi_get_handle() to acpi_has_method()
  intel_menlow: convert acpi_get_handle() to acpi_has_method()
  fujitsu-laptop: convert acpi_get_handle() to acpi_has_method()
  ...
parents 959f5854 7744da5e

arch/x86/platform/olpc/olpc-xo15-sci.c

+1 −8
Original line number Diff line number Diff line
@@ -40,16 +40,9 @@ static bool lid_wake_on_close; 
 */

static int set_lid_wake_behavior(bool wake_on_close)

{

	struct acpi_object_list arg_list;

	union acpi_object arg;

	acpi_status status;



	arg_list.count		= 1;

	arg_list.pointer	= &arg;

	arg.type		= ACPI_TYPE_INTEGER;

	arg.integer.value	= wake_on_close;



	status = acpi_evaluate_object(NULL, "\\_SB.PCI0.LID.LIDW", &arg_list, NULL);

	status = acpi_execute_simple_method(NULL, "\\_SB.PCI0.LID.LIDW", wake_on_close);

	if (ACPI_FAILURE(status)) {

		pr_warning(PFX "failed to set lid behavior\n");

		return 1;

drivers/acpi/Kconfig

+0 −17
Original line number Diff line number Diff line
@@ -56,23 +56,6 @@ config ACPI_PROCFS 


	  Say N to delete /proc/acpi/ files that have moved to /sys/



config ACPI_PROCFS_POWER

	bool "Deprecated power /proc/acpi directories"

	depends on PROC_FS

	help

	  For backwards compatibility, this option allows

          deprecated power /proc/acpi/ directories to exist, even when

          they have been replaced by functions in /sys.

          The deprecated directories (and their replacements) include:

	  /proc/acpi/battery/* (/sys/class/power_supply/*)

	  /proc/acpi/ac_adapter/* (sys/class/power_supply/*)

	  This option has no effect on /proc/acpi/ directories

	  and functions, which do not yet exist in /sys

	  This option, together with the proc directories, will be

	  deleted in 2.6.39.



	  Say N to delete power /proc/acpi/ directories that have moved to /sys/



config ACPI_EC_DEBUGFS

	tristate "EC read/write access through /sys/kernel/debug/ec"

	default n

drivers/acpi/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -47,7 +47,6 @@ acpi-y += sysfs.o 
acpi-$(CONFIG_X86)		+= acpi_cmos_rtc.o

acpi-$(CONFIG_DEBUG_FS)		+= debugfs.o

acpi-$(CONFIG_ACPI_NUMA)	+= numa.o

acpi-$(CONFIG_ACPI_PROCFS_POWER) += cm_sbs.o

ifdef CONFIG_ACPI_VIDEO

acpi-y				+= video_detect.o

endif

drivers/acpi/acpi_memhotplug.c

+1 −1
Original line number Diff line number Diff line
@@ -281,7 +281,7 @@ static void acpi_memory_remove_memory(struct acpi_memory_device *mem_device) 
		if (!info->enabled)

			continue;



		if (nid < 0)

		if (nid == NUMA_NO_NODE)

			nid = memory_add_physaddr_to_nid(info->start_addr);



		acpi_unbind_memory_blocks(info, handle);

drivers/acpi/acpi_processor.c

+3 −3
Original line number Diff line number Diff line
@@ -219,6 +219,7 @@ static int acpi_processor_get_info(struct acpi_device *device) 
	int cpu_index, device_declaration = 0;

	acpi_status status = AE_OK;

	static int cpu0_initialized;

	unsigned long long value;



	if (num_online_cpus() > 1)

		errata.smp = TRUE;
@@ -258,7 +259,6 @@ static int acpi_processor_get_info(struct acpi_device *device) 
		 * Declared with "Device" statement; match _UID.

		 * Note that we don't handle string _UIDs yet.

		 */

		unsigned long long value;

		status = acpi_evaluate_integer(pr->handle, METHOD_NAME__UID,

						NULL, &value);

		if (ACPI_FAILURE(status)) {
@@ -332,9 +332,9 @@ static int acpi_processor_get_info(struct acpi_device *device) 
	 * ensure we get the right value in the "physical id" field

	 * of /proc/cpuinfo

	 */

	status = acpi_evaluate_object(pr->handle, "_SUN", NULL, &buffer);

	status = acpi_evaluate_integer(pr->handle, "_SUN", NULL, &value);

	if (ACPI_SUCCESS(status))

		arch_fix_phys_package_id(pr->id, object.integer.value);

		arch_fix_phys_package_id(pr->id, value);



	return 0;

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE