ACPI / scan: use platform bus type by default for _HID enumeration

Because of the growing demand for enumerating ACPI devices to
platform bus, change the code to enumerate ACPI device objects to
platform bus by default.  Namely, create platform devices for the
ACPI device objects that
 1. Have pnp.type.platform_id set (device objects with _HID currently).
 2. Do not have a scan handler attached.
 3. Are not SPI/I2C slave devices (that should be enumerated to the
    appropriate buses bus by their parent).

Signed-off-by: Zhang Rui <rui.zhang@intel.com>
[rjw: Subject and changelog, rebase and code cleanup]
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Reviewed-by: Mika Westerberg <mika.westerberg@linux.intel.com>

1 files changed, 8 insertions, 36 deletions

diff --git a/drivers/acpi/acpi_platform.c b/drivers/acpi/acpi_platform.c
index 3bb89def2292..2bf9082f7523 100644
--- a/drivers/acpi/acpi_platform.c
+++ b/drivers/acpi/acpi_platform.c
@@ -22,25 +22,11 @@
 
 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" },
-        { "VPC2004" },
-        { "BCM4752" },
-        { "LNV4752" },
-        { "BCM2E1A" },
-        { "BCM2E39" },
-        { "BCM2E3D" },
-
-        /* Intel Smart Sound Technology */
-        { "INT33C8" },
-        { "80860F28" },
-
-        { }
+static const struct acpi_device_id forbidden_id_list[] = {
+        {"PNP0000", 0}, /* PIC */
+        {"PNP0100", 0}, /* Timer */
+        {"PNP0200", 0}, /* AT DMA Controller */
+        {"", 0},
 };
 
 /**
@@ -67,6 +53,9 @@ struct platform_device *acpi_create_platform_device(struct acpi_device *adev)
         if (adev->physical_node_count)
                 return NULL;
 
+        if (!acpi_match_device_ids(adev, forbidden_id_list))
+                return ERR_PTR(-EINVAL);
+
         INIT_LIST_HEAD(&resource_list);
         count = acpi_dev_get_resources(adev, &resource_list, NULL, NULL);
         if (count < 0) {
@@ -124,20 +113,3 @@ struct platform_device *acpi_create_platform_device(struct acpi_device *adev)
         kfree(resources);
         return pdev;
 }
-
-static int acpi_platform_attach(struct acpi_device *adev,
-                                const struct acpi_device_id *id)
-{
-        acpi_create_platform_device(adev);
-        return 1;
-}
-
-static struct acpi_scan_handler platform_handler = {
-        .ids = acpi_platform_device_ids,
-        .attach = acpi_platform_attach,
-};
-
-void __init acpi_platform_init(void)
-{
-        acpi_scan_add_handler(&platform_handler);
-}