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
Unified · Split
| @@ -395,9 +395,6 @@ config ACPI_CONTAINER · 394 unmodified lines | |||
| 395 | 395 | ||
| 396 | This helps support hotplug of nodes, CPUs, and memory. | 396 | This helps support hotplug of nodes, CPUs, and memory. |
| 397 | 397 | ||
| 398 | To compile this driver as a module, choose M here: | ||
| 399 | the module will be called container. | ||
| 400 | |||
| 401 | config ACPI_HOTPLUG_MEMORY | 398 | config ACPI_HOTPLUG_MEMORY |
| 402 | bool "Memory Hotplug" | 399 | bool "Memory Hotplug" |
| 403 | depends on MEMORY_HOTPLUG | 400 | depends on MEMORY_HOTPLUG |
| @@ -411,9 +408,6 @@ config ACPI_HOTPLUG_MEMORY · 7 unmodified lines | |||
| 411 | removing memory devices at runtime, you need not enable | 408 | removing memory devices at runtime, you need not enable |
| 412 | this driver. | 409 | this driver. |
| 413 | 410 | ||
| 414 | To compile this driver as a module, choose M here: | ||
| 415 | the module will be called acpi_memhotplug. | ||
| 416 | |||
| 417 | config ACPI_HOTPLUG_IOAPIC | 411 | config ACPI_HOTPLUG_IOAPIC |
| 418 | bool | 412 | bool |
| 419 | depends on PCI | 413 | depends on PCI |
| @@ -105,18 +105,8 @@ static void lpi_device_get_constraints_amd(void) · 104 unmodified lines | |||
| 105 | 105 | ||
| 106 | for (i = 0; i < out_obj->package.count; i++) { | 106 | for (i = 0; i < out_obj->package.count; i++) { |
| 107 | union acpi_object *package = &out_obj->package.elements[i]; | 107 | union acpi_object *package = &out_obj->package.elements[i]; |
| 108 | struct lpi_device_info_amd info = { }; | ||
| 109 | 108 | ||
| 110 | if (package->type == ACPI_TYPE_INTEGER) { | 109 | if (package->type == ACPI_TYPE_PACKAGE) { |
| 111 | switch (i) { | ||
| 112 | case 0: | ||
| 113 | info.revision = package->integer.value; | ||
| 114 | break; | ||
| 115 | case 1: | ||
| 116 | info.count = package->integer.value; | ||
| 117 | break; | ||
| 118 | } | ||
| 119 | } else if (package->type == ACPI_TYPE_PACKAGE) { | ||
| 120 | lpi_constraints_table = kcalloc(package->package.count, | 110 | lpi_constraints_table = kcalloc(package->package.count, |
| 121 | sizeof(*lpi_constraints_table), | 111 | sizeof(*lpi_constraints_table), |
| 122 | GFP_KERNEL); | 112 | GFP_KERNEL); |
| @@ -135,12 +125,10 @@ static void lpi_device_get_constraints_amd(void) · 12 unmodified lines | |||
| 135 | 125 | ||
| 136 | for (k = 0; k < info_obj->package.count; ++k) { | 126 | for (k = 0; k < info_obj->package.count; ++k) { |
| 137 | union acpi_object *obj = &info_obj->package.elements[k]; | 127 | union acpi_object *obj = &info_obj->package.elements[k]; |
| 138 | union acpi_object *obj_new; | ||
| 139 | 128 | ||
| 140 | list = &lpi_constraints_table[lpi_constraints_table_size]; | 129 | list = &lpi_constraints_table[lpi_constraints_table_size]; |
| 141 | list->min_dstate = -1; | 130 | list->min_dstate = -1; |
| 142 | 131 | ||
| 143 | obj_new = &obj[k]; | ||
| 144 | switch (k) { | 132 | switch (k) { |
| 145 | case 0: | 133 | case 0: |
| 146 | dev_info.enabled = obj->integer.value; | 134 | dev_info.enabled = obj->integer.value; |
| @@ -885,6 +885,13 @@ static inline int acpi_device_modalias(struct device *dev, · 884 unmodified lines | |||
| 885 | return -ENODEV; | 885 | return -ENODEV; |
| 886 | } | 886 | } |
| 887 | 887 | ||
| 888 | static inline struct platform_device * | ||
| 889 | acpi_create_platform_device(struct acpi_device *adev, | ||
| 890 | struct property_entry *properties) | ||
| 891 | { | ||
| 892 | return NULL; | ||
| 893 | } | ||
| 894 | |||
| 888 | static inline bool acpi_dma_supported(struct acpi_device *adev) | 895 | static inline bool acpi_dma_supported(struct acpi_device *adev) |
| 889 | { | 896 | { |
| 890 | return false; | 897 | return false; |