Commit fb9ca0be authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'acpi-5.11-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm 

Pull ACPI fixes from Rafael Wysocki:
 "These address two build issues and drop confusing text from a couple
  of Kconfig entries.

  Specifics:

   - Drop two local variables that are never read and the code updating
     their values from the x86 suspend-to-idle code (Rafael Wysocki)

   - Add empty stub of an ACPI helper function to avoid build issues
     when CONFIG_ACPI is not set (Shawn Guo)

   - Remove confusing text regarding modules from Kconfig entries that
     correspond to non-modular code (Peter Robinson)"

* tag 'acpi-5.11-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
  ACPI: Update Kconfig help text for items that are no longer modular
  ACPI: scan: add stub acpi_create_platform_device() for !CONFIG_ACPI
  ACPI: PM: s2idle: Drop unused local variables and related code
parents be31d940 24e8ab68

drivers/acpi/Kconfig

+0 −6
Original line number Diff line number Diff line
@@ -395,9 +395,6 @@ config ACPI_CONTAINER 


	  This helps support hotplug of nodes, CPUs, and memory.



	  To compile this driver as a module, choose M here:

	  the module will be called container.



config ACPI_HOTPLUG_MEMORY

	bool "Memory Hotplug"

	depends on MEMORY_HOTPLUG
@@ -411,9 +408,6 @@ config ACPI_HOTPLUG_MEMORY 
	  removing memory devices at runtime, you need not enable

	  this driver.



	  To compile this driver as a module, choose M here:

	  the module will be called acpi_memhotplug.



config ACPI_HOTPLUG_IOAPIC

	bool

	depends on PCI

drivers/acpi/x86/s2idle.c

+1 −13
Original line number Diff line number Diff line
@@ -105,18 +105,8 @@ static void lpi_device_get_constraints_amd(void) 


	for (i = 0; i < out_obj->package.count; i++) {

		union acpi_object *package = &out_obj->package.elements[i];

		struct lpi_device_info_amd info = { };



		if (package->type == ACPI_TYPE_INTEGER) {

			switch (i) {

			case 0:

				info.revision = package->integer.value;

				break;

			case 1:

				info.count = package->integer.value;

				break;

			}

		} else if (package->type == ACPI_TYPE_PACKAGE) {

		if (package->type == ACPI_TYPE_PACKAGE) {

			lpi_constraints_table = kcalloc(package->package.count,

							sizeof(*lpi_constraints_table),

							GFP_KERNEL);
@@ -135,12 +125,10 @@ static void lpi_device_get_constraints_amd(void) 


				for (k = 0; k < info_obj->package.count; ++k) {

					union acpi_object *obj = &info_obj->package.elements[k];

					union acpi_object *obj_new;



					list = &lpi_constraints_table[lpi_constraints_table_size];

					list->min_dstate = -1;



					obj_new = &obj[k];

					switch (k) {

					case 0:

						dev_info.enabled = obj->integer.value;

include/linux/acpi.h

+7 −0
Original line number Diff line number Diff line
@@ -885,6 +885,13 @@ static inline int acpi_device_modalias(struct device *dev, 
	return -ENODEV;

}



static inline struct platform_device *

acpi_create_platform_device(struct acpi_device *adev,

			    struct property_entry *properties)

{

	return NULL;

}



static inline bool acpi_dma_supported(struct acpi_device *adev)

{

	return false;