Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

ACPI / scan: always register container scan handler 



Prevent platform devices from being created for ACPI containers
if CONFIG_ACPI_CONTAINER is unset by compiling out the container
scan handler's callbacks only in that case and still compiling
its device ID list in and registering the scan handler in either
case.

This change is based on a prototype from Zhang Rui.

Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
Reviewed-by: default avatarMika Westerberg <mika.westerberg@linux.intel.com>
parent d34afa9d

drivers/acpi/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -64,7 +64,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

drivers/acpi/container.c

+15 −0
Original line number Diff line number Diff line
@@ -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);
@@ -107,7 +109,20 @@ static struct acpi_scan_handler container_handler = { 
	},

};



void __init acpi_container_init(void)

{

	acpi_scan_add_handler(&container_handler);

}



#else



static struct acpi_scan_handler container_handler = {

	.ids = container_device_ids,

};



void __init acpi_container_init(void)

{

	acpi_scan_add_handler_with_hotplug(&container_handler, "container");

}



#endif /* CONFIG_ACPI_CONTAINER */

drivers/acpi/internal.h

+0 −4
Original line number Diff line number Diff line
@@ -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);