[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <1395042580-3344-12-git-send-email-rui.zhang@intel.com>
Date: Mon, 17 Mar 2014 15:49:40 +0800
From: Zhang Rui <rui.zhang@...el.com>
To: linux-acpi@...r.kernel.org, linux-kernel@...r.kernel.org
Cc: bhelgaas@...gle.com, matthew.garrett@...ula.com,
rafael.j.wysocki@...el.com, dmitry.torokhov@...il.com,
Zhang Rui <rui.zhang@...el.com>
Subject: [PATCH V4 11/11] ACPI: introduce dummy memory hotplug scan handler
If CONFIG_ACPI_HOTPLUG_MEMORY is cleared, platform devices would be
created for ACPI hotplug memory device objects.
Introduce a dummy memory hotplug scan handler in this patch,
to prevent those platform devices from being created.
Signed-off-by: Zhang Rui <rui.zhang@...el.com>
---
drivers/acpi/Makefile | 2 +-
drivers/acpi/acpi_memhotplug.c | 45 ++++++++++++++++++++++++++++------------
drivers/acpi/internal.h | 6 +-----
3 files changed, 34 insertions(+), 19 deletions(-)
diff --git a/drivers/acpi/Makefile b/drivers/acpi/Makefile
index 871d70d..605eff7 100644
--- a/drivers/acpi/Makefile
+++ b/drivers/acpi/Makefile
@@ -65,7 +65,7 @@ obj-$(CONFIG_ACPI_PCI_SLOT) += pci_slot.o
obj-$(CONFIG_ACPI_PROCESSOR) += processor.o
obj-y += container.o
obj-$(CONFIG_ACPI_THERMAL) += thermal.o
-obj-$(CONFIG_ACPI_HOTPLUG_MEMORY) += acpi_memhotplug.o
+obj-y += acpi_memhotplug.o
obj-$(CONFIG_ACPI_BATTERY) += battery.o
obj-$(CONFIG_ACPI_SBS) += sbshc.o
obj-$(CONFIG_ACPI_SBS) += sbs.o
diff --git a/drivers/acpi/acpi_memhotplug.c b/drivers/acpi/acpi_memhotplug.c
index b67be85..ed2f6a7 100644
--- a/drivers/acpi/acpi_memhotplug.c
+++ b/drivers/acpi/acpi_memhotplug.c
@@ -44,6 +44,13 @@
ACPI_MODULE_NAME("acpi_memhotplug");
+static const struct acpi_device_id memory_device_ids[] = {
+ {ACPI_MEMORY_DEVICE_HID, 0},
+ {"", 0},
+};
+
+#ifdef CONFIG_ACPI_HOTPLUG_MEMORY
+
/* Memory Device States */
#define MEMORY_INVALID_STATE 0
#define MEMORY_POWER_ON_STATE 1
@@ -53,11 +60,6 @@ static int acpi_memory_device_add(struct acpi_device *device,
const struct acpi_device_id *not_used);
static void acpi_memory_device_remove(struct acpi_device *device);
-static const struct acpi_device_id memory_device_ids[] = {
- {ACPI_MEMORY_DEVICE_HID, 0},
- {"", 0},
-};
-
static struct acpi_scan_handler memory_device_handler = {
.ids = memory_device_ids,
.attach = acpi_memory_device_add,
@@ -362,17 +364,34 @@ static void acpi_memory_device_remove(struct acpi_device *device)
static bool __initdata acpi_no_memhotplug;
-void __init acpi_memory_hotplug_init(void)
-{
- if (acpi_no_memhotplug)
- return;
-
- acpi_scan_add_handler_with_hotplug(&memory_device_handler, "memory");
-}
-
static int __init disable_acpi_memory_hotplug(char *str)
{
acpi_no_memhotplug = true;
return 1;
}
__setup("acpi_no_memhotplug", disable_acpi_memory_hotplug);
+
+#endif
+
+static int acpi_memory_dummy_add(struct acpi_device *device,
+ const struct acpi_device_id *not_used)
+{
+ return 1;
+}
+
+static struct acpi_scan_handler memory_dummy_handler = {
+ .ids = memory_device_ids,
+ .attach = acpi_memory_dummy_add,
+};
+
+void __init acpi_memory_hotplug_init(void)
+{
+#ifdef CONFIG_ACPI_HOTPLUG_MEMORY
+ if (!acpi_no_memhotplug) {
+ acpi_scan_add_handler_with_hotplug(&memory_device_handler,
+ "memory");
+ return;
+ }
+#endif
+ acpi_scan_add_handler(&memory_dummy_handler);
+}
diff --git a/drivers/acpi/internal.h b/drivers/acpi/internal.h
index 253758a..4e96e84 100644
--- a/drivers/acpi/internal.h
+++ b/drivers/acpi/internal.h
@@ -33,16 +33,12 @@ void acpi_platform_init(void);
void acpi_pnp_init(void);
int acpi_sysfs_init(void);
void acpi_container_init(void);
+void acpi_memory_hotplug_init(void);
#ifdef CONFIG_ACPI_DOCK
void acpi_dock_init(void);
#else
static inline void acpi_dock_init(void) {}
#endif
-#ifdef CONFIG_ACPI_HOTPLUG_MEMORY
-void acpi_memory_hotplug_init(void);
-#else
-static inline void acpi_memory_hotplug_init(void) {}
-#endif
#ifdef CONFIG_X86
void acpi_cmos_rtc_init(void);
#else
--
1.7.9.5
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists