Revert "UBUNTU: SAUCE: ACPI / scan: do not enumerate Indirect IO host children"

BugLink: https://bugs.launchpad.net/bugs/1762758
Replacing with the upstream version of this series.

This reverts commit 008cf8ab391e66c87cd6d1676404a5e5601979f9.

Signed-off-by: dann frazier <dann.frazier@canonical.com>
Signed-off-by: Seth Forshee <seth.forshee@canonical.com>

diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c
index 12a5bdf9dcf3b2cc42f1436b1e8e20f8b170bc28..b0fe5272c76aadfa59493bc954c6a545bbbc2008 100644 (file)
--- a/drivers/acpi/scan.c
+++ b/drivers/acpi/scan.c
@@ -1524,25 +1524,11 @@ static int acpi_check_serial_bus_slave(struct acpi_resource *ares, void *data)
        return -1;
 }
 
-static bool acpi_is_indirect_io_slave(struct acpi_device *device)
-{
-       struct acpi_device *parent = device->parent;
-       const struct acpi_device_id indirect_io_hosts[] = {
-               {"HISI0191", 0},
-               {}
-       };
-
-       return parent && !acpi_match_device_ids(parent, indirect_io_hosts);
-}
-
 static bool acpi_is_serial_bus_slave(struct acpi_device *device)
 {
        struct list_head resource_list;
        bool is_serial_bus_slave = false;
 
-       if (acpi_is_indirect_io_slave(device))
-               return true;
-
        /* Macs use device properties in lieu of _CRS resources */
        if (x86_apple_machine &&
            (fwnode_property_present(&device->fwnode, "spiSclkPeriod") ||