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

thermal: ACPI: Move the ACPI thermal library to drivers/acpi/ 



The ACPI thermal library contains functions that can be used to
retrieve trip point temperature values through the platform firmware
for various types of trip points.  Each of these functions basically
evaluates a specific ACPI object, checks if the value produced by it
is reasonable and returns it (or THERMAL_TEMP_INVALID if anything
fails).

It made sense to hold it in drivers/thermal/ so long as it was only used
by the code in that directory, but since it is also going to be used by
the ACPI thermal driver located in drivers/acpi/, move it to the latter
in order to keep the code related to evaluating ACPI objects defined in
the specification proper together.

No intentional functional impact.

Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent 98b1cc82

drivers/acpi/Kconfig

+5 −0
Original line number Diff line number Diff line
@@ -61,6 +61,10 @@ config ACPI_CCA_REQUIRED 
config ACPI_TABLE_LIB

	bool



config ACPI_THERMAL_LIB

       depends on THERMAL

       bool



config ACPI_DEBUGGER

	bool "AML debugger interface"

	select ACPI_DEBUG
@@ -327,6 +331,7 @@ config ACPI_THERMAL 
	tristate "Thermal Zone"

	depends on ACPI_PROCESSOR

	select THERMAL

	select ACPI_THERMAL_LIB

	default y

	help

	  This driver supports ACPI thermal zones.  Most mobile and

drivers/acpi/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -89,6 +89,7 @@ obj-$(CONFIG_ACPI_TAD) += acpi_tad.o 
obj-$(CONFIG_ACPI_PCI_SLOT)	+= pci_slot.o

obj-$(CONFIG_ACPI_PROCESSOR)	+= processor.o

obj-$(CONFIG_ACPI)		+= container.o

obj-$(CONFIG_ACPI_THERMAL_LIB)	+= thermal_lib.o

obj-$(CONFIG_ACPI_THERMAL)	+= thermal.o

obj-$(CONFIG_ACPI_PLATFORM_PROFILE) 	+= platform_profile.o

obj-$(CONFIG_ACPI_NFIT)		+= nfit/

drivers/thermal/Kconfig

+0 −4
Original line number Diff line number Diff line
@@ -76,10 +76,6 @@ config THERMAL_OF 
	  Say 'Y' here if you need to build thermal infrastructure

	  based on device tree.



config THERMAL_ACPI

       depends on ACPI

       bool



config THERMAL_WRITABLE_TRIPS

	bool "Enable writable trip points"

	help

drivers/thermal/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -13,7 +13,6 @@ thermal_sys-$(CONFIG_THERMAL_NETLINK) += thermal_netlink.o 
# interface to/from other layers providing sensors

thermal_sys-$(CONFIG_THERMAL_HWMON)		+= thermal_hwmon.o

thermal_sys-$(CONFIG_THERMAL_OF)		+= thermal_of.o

thermal_sys-$(CONFIG_THERMAL_ACPI)		+= thermal_acpi.o



# governors

CFLAGS_gov_power_allocator.o			:= -I$(src)