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 V4 07/11] ACPI: use platform bus as the default bus for _HID enumeration
Date: Mon, 17 Mar 2014 15:49:36 +0800 [thread overview]
Message-ID: <1395042580-3344-8-git-send-email-rui.zhang@intel.com> (raw)
In-Reply-To: <1395042580-3344-1-git-send-email-rui.zhang@intel.com>
Because of the growing demand for enumerating ACPI devices to platform bus,
this patch changes the code to enumerate ACPI devices with _HID to
platform bus by default, unless the device already has a scan handler attached.
Signed-off-by: Zhang Rui <rui.zhang@intel.com>
---
drivers/acpi/acpi_platform.c | 28 ----------------------------
drivers/acpi/scan.c | 12 ++++++------
2 files changed, 6 insertions(+), 34 deletions(-)
diff --git a/drivers/acpi/acpi_platform.c b/drivers/acpi/acpi_platform.c
index dbfe49e..33376a9 100644
--- a/drivers/acpi/acpi_platform.c
+++ b/drivers/acpi/acpi_platform.c
@@ -22,24 +22,6 @@
ACPI_MODULE_NAME("platform");
-/*
- * The following ACPI IDs are known to be suitable for representing as
- * platform devices.
- */
-static const struct acpi_device_id acpi_platform_device_ids[] = {
-
- { "PNP0D40" },
- { "ACPI0003" },
- { "VPC2004" },
- { "BCM4752" },
-
- /* Intel Smart Sound Technology */
- { "INT33C8" },
- { "80860F28" },
-
- { }
-};
-
/**
* acpi_create_platform_device - Create platform device for ACPI device node
* @adev: ACPI device node to create a platform device for.
@@ -125,13 +107,3 @@ int acpi_create_platform_device(struct acpi_device *adev,
kfree(resources);
return 1;
}
-
-static struct acpi_scan_handler platform_handler = {
- .ids = acpi_platform_device_ids,
- .attach = acpi_create_platform_device,
-};
-
-void __init acpi_platform_init(void)
-{
- acpi_scan_add_handler(&platform_handler);
-}
diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c
index e41b5e6..c0456e7 100644
--- a/drivers/acpi/scan.c
+++ b/drivers/acpi/scan.c
@@ -2028,14 +2028,15 @@ static int acpi_scan_attach_handler(struct acpi_device *device)
handler = acpi_scan_match_handler(hwid->id, &devid);
if (handler) {
ret = handler->attach(device, devid);
- if (ret > 0) {
+ if (ret > 0)
device->handler = handler;
- break;
- } else if (ret < 0) {
- break;
- }
+ if (ret)
+ goto end;
}
}
+end:
+ if (device->pnp.type.platform_id && !device->handler)
+ acpi_create_platform_device(device, NULL);
return ret;
}
@@ -2191,7 +2192,6 @@ int __init acpi_scan_init(void)
acpi_pci_root_init();
acpi_pci_link_init();
acpi_processor_init();
- acpi_platform_init();
acpi_lpss_init();
acpi_cmos_rtc_init();
acpi_container_init();
--
1.7.9.5
next prev parent reply other threads:[~2014-03-17 7:52 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-03-17 7:49 [PATCH V4 00/11] ACPI: change the way of enumerating PNPACPI/Platform devices Zhang Rui
2014-03-17 7:49 ` [PATCH V4 01/11] ACPI: introduce .match() callback for ACPI scan handler Zhang Rui
2014-03-17 7:49 ` [PATCH V4 02/11] PNPACPI: use whilte list for pnpacpi device enumeration Zhang Rui
2014-03-17 7:49 ` [PATCH V4 03/11] ACPI: remove ids that does not comply with the ACPI PNP id rule Zhang Rui
2014-03-17 7:49 ` [PATCH V4 04/11] ACPI: remove unsupported serial PNP ids from acpi pnp scan handler id lsit Zhang Rui
2014-03-17 7:49 ` [PATCH V4 05/11] ACPI: check and enumerate CMOS RTC devices explicitly Zhang Rui
2014-03-17 7:49 ` [PATCH V4 06/11] ACPI: introduce platform_id flag Zhang Rui
2014-03-17 7:49 ` Zhang Rui [this message]
2014-03-24 2:00 ` [PATCH V4 07/11] ACPI: use platform bus as the default bus for _HID enumeration Rafael J. Wysocki
2014-03-24 4:06 ` Zhang Rui
2014-03-31 5:24 ` Zhang Rui
2014-03-17 7:49 ` [PATCH V4 08/11] ACPI: introduce dummy lpss scan handler Zhang Rui
2014-03-17 7:49 ` [PATCH V4 09/11] ACPI: introduce acpi platform exclude id list Zhang Rui
2014-03-17 7:49 ` [PATCH V4 10/11] ACPI: introduce dummy container scan handler Zhang Rui
2014-03-17 7:49 ` [PATCH V4 11/11] ACPI: introduce dummy memory hotplug " 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=1395042580-3344-8-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).