@@ -63,7 +63,7 @@ obj-$(CONFIG_ACPI_FAN) += fan.o
obj-$(CONFIG_ACPI_VIDEO) += video.o
obj-$(CONFIG_ACPI_PCI_SLOT) += pci_slot.o
obj-$(CONFIG_ACPI_PROCESSOR) += processor.o
-obj-$(CONFIG_ACPI_CONTAINER) += container.o
+obj-y += container.o
obj-$(CONFIG_ACPI_THERMAL) += thermal.o
obj-$(CONFIG_ACPI_HOTPLUG_MEMORY) += acpi_memhotplug.o
obj-$(CONFIG_ACPI_BATTERY) += battery.o
@@ -41,6 +41,8 @@ static const struct acpi_device_id container_device_ids[] = {
{"", 0},
};
+#ifdef CONFIG_ACPI_CONTAINER
+
static int acpi_container_offline(struct container_dev *cdev)
{
struct acpi_device *adev = ACPI_COMPANION(&cdev->dev);
@@ -111,3 +113,22 @@ void __init acpi_container_init(void)
{
acpi_scan_add_handler_with_hotplug(&container_handler, "container");
}
+
+#else
+
+static inline int container_device_attach(struct acpi_device *adev,
+ const struct acpi_device_id *not_used)
+{
+ return 1;
+}
+
+static struct acpi_scan_handler container_handler = {
+ .ids = container_device_ids,
+ .attach = container_device_attach,
+};
+
+void __init acpi_container_init(void)
+{
+ acpi_scan_add_handler(&container_handler);
+}
+#endif /* CONFIG_ACPI_CONTAINER */
@@ -32,11 +32,7 @@ void acpi_processor_init(void);
void acpi_platform_init(void);
void acpi_pnp_init(void);
int acpi_sysfs_init(void);
-#ifdef CONFIG_ACPI_CONTAINER
void acpi_container_init(void);
-#else
-static inline void acpi_container_init(void) {}
-#endif
#ifdef CONFIG_ACPI_DOCK
void register_dock_dependent_device(struct acpi_device *adev,
acpi_handle dshandle);
The new ACPI device enumeration mechanism, which will be introduced in a later patch, will enumerate the _HID devices w/o any scan handler attached to platform bus. This means that, for the devices that are attached to a configurable scan handler, we should make sure no platform devices would be created for them even if the scan handler is compiled out. Fix this problem for container devices by introducing a dummy container scan handler in this patch. Signed-off-by: Zhang Rui <rui.zhang@intel.com> --- drivers/acpi/Makefile | 2 +- drivers/acpi/container.c | 21 +++++++++++++++++++++ drivers/acpi/internal.h | 4 ---- 3 files changed, 22 insertions(+), 5 deletions(-)