From: Zhang Rui <rui.zhang@intel.com>
To: linux-acpi@vger.kernel.org, linux-kernel@vger.kernel.org
Cc: bhelgaas@google.com, matthew.garrett@nebula.com,
rafael.j.wysocki@intel.com, dmitry.torokhov@gmail.com,
Zhang Rui <rui.zhang@intel.com>
Subject: [PATCH V3 10/11] ACPI: introduce dummy container scan handler
Date: Mon, 17 Mar 2014 01:03:16 +0800 [thread overview]
Message-ID: <1394989397-2733-11-git-send-email-rui.zhang@intel.com> (raw)
In-Reply-To: <1394989397-2733-1-git-send-email-rui.zhang@intel.com>
When CONFIG_ACPI_CONTAINER is cleared, platform devices would be
created for ACPI container objects.
Introduce a dummy container scan handler in this patch to prevent
these platform devices from being created.
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(-)
diff --git a/drivers/acpi/Makefile b/drivers/acpi/Makefile
index 2173e30..871d70d 100644
--- a/drivers/acpi/Makefile
+++ b/drivers/acpi/Makefile
@@ -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
diff --git a/drivers/acpi/container.c b/drivers/acpi/container.c
index 368f9dd..c2ec401 100644
--- a/drivers/acpi/container.c
+++ b/drivers/acpi/container.c
@@ -43,6 +43,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);
@@ -110,3 +112,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 */
diff --git a/drivers/acpi/internal.h b/drivers/acpi/internal.h
index a0c9368..253758a 100644
--- a/drivers/acpi/internal.h
+++ b/drivers/acpi/internal.h
@@ -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 acpi_dock_init(void);
#else
--
1.7.9.5
next prev parent reply other threads:[~2014-03-16 17:04 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-03-16 17:03 [PATCH V3 00/11] ACPI: change the way of enumerating PNPACPI/Platform devices Zhang Rui
2014-03-16 17:03 ` [PATCH V3 01/11] ACPI: introduce .match() callback for ACPI scan handler Zhang Rui
2014-03-16 17:03 ` [PATCH V3 02/11] PNPACPI: use whilte list for pnpacpi device enumeration Zhang Rui
2014-03-16 17:03 ` [PATCH V3 03/11] ACPI: remove ids that does not comply with the ACPI PNP id rule Zhang Rui
2014-03-16 17:03 ` [PATCH V3 04/11] ACPI: remove unsupported serial PNP ids from acpi pnp scan handler id lsit Zhang Rui
2014-03-16 17:03 ` [PATCH V3 05/11] ACPI: check and enumerate CMOS RTC devices explicitly Zhang Rui
2014-03-16 17:03 ` [PATCH V3 06/11] ACPI: introduce platform_id flag Zhang Rui
2014-03-16 17:03 ` [PATCH V3 07/11] ACPI: use platform bus as the default bus for _HID enumeration Zhang Rui
2014-03-16 17:03 ` [PATCH V3 08/11] ACPI: introduce dummy lpss scan handler Zhang Rui
2014-03-16 17:03 ` [PATCH V3 09/11] ACPI: introduce acpi platform exclude id list Zhang Rui
2014-03-16 17:03 ` Zhang Rui [this message]
2014-03-16 17:03 ` [PATCH V3 11/11] ACPI: introduce dummy memory hotplug scan handler Zhang Rui
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1394989397-2733-11-git-send-email-rui.zhang@intel.com \
--to=rui.zhang@intel.com \
--cc=bhelgaas@google.com \
--cc=dmitry.torokhov@gmail.com \
--cc=linux-acpi@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=matthew.garrett@nebula.com \
--cc=rafael.j.wysocki@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).