ACPI / bind: Rework struct acpi_bus_type

Replace the .find_device function pointer in struct acpi_bus_type
with a new one, .find_companion, that is supposed to point to a
function returning struct acpi_device pointer (instead of an int)
and takes one argument (instead of two).  This way the role of
this callback is more clear and the implementation of it can
be more straightforward.

Update all of the users of struct acpi_bus_type (PCI, PNP/ACPI and
USB) to reflect the structure change.

Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Tested-by: Lan Tianyu <tianyu.lan@intel.com> # for USB/ACPI

1 files changed, 20 insertions, 20 deletions

diff --git a/drivers/usb/core/usb-acpi.c b/drivers/usb/core/usb-acpi.c
index 11c656976cb5..f0155a39aaa3 100644
--- a/drivers/usb/core/usb-acpi.c
+++ b/drivers/usb/core/usb-acpi.c
@@ -126,7 +126,7 @@ out:
         return ret;
 }
 
-static int usb_acpi_find_device(struct device *dev, acpi_handle *handle)
+static struct acpi_device *usb_acpi_find_companion(struct device *dev)
 {
         struct usb_device *udev;
         acpi_handle *parent_handle;
@@ -168,16 +168,15 @@ static int usb_acpi_find_device(struct device *dev, acpi_handle *handle)
                                 break;
                         }
 
-                        return -ENODEV;
+                        return NULL;
                 }
 
                 /* root hub's parent is the usb hcd. */
-                parent_handle = ACPI_HANDLE(dev->parent);
-                *handle = acpi_get_child(parent_handle, udev->portnum);
-                if (!*handle)
-                        return -ENODEV;
-                return 0;
+                return acpi_find_child_device(ACPI_COMPANION(dev->parent),
+                                              udev->portnum, false);
         } else if (is_usb_port(dev)) {
+                struct acpi_device *adev = NULL;
+
                 sscanf(dev_name(dev), "port%d", &port_num);
                 /* Get the struct usb_device point of port's hub */
                 udev = to_usb_device(dev->parent->parent);
@@ -193,26 +192,27 @@ static int usb_acpi_find_device(struct device *dev, acpi_handle *handle)
 
                         raw_port_num = usb_hcd_find_raw_port_number(hcd,
                                 port_num);
-                        *handle = acpi_get_child(ACPI_HANDLE(&udev->dev),
-                                raw_port_num);
-                        if (!*handle)
-                                return -ENODEV;
+                        adev = acpi_find_child_device(ACPI_COMPANION(&udev->dev),
+                                                      raw_port_num, false);
+                        if (!adev)
+                                return NULL;
                 } else {
                         parent_handle =
                                 usb_get_hub_port_acpi_handle(udev->parent,
                                 udev->portnum);
                         if (!parent_handle)
-                                return -ENODEV;
+                                return NULL;
 
-                        *handle = acpi_get_child(parent_handle, port_num);
-                        if (!*handle)
-                                return -ENODEV;
+                        acpi_bus_get_device(parent_handle, &adev);
+                        adev = acpi_find_child_device(adev, port_num, false);
+                        if (!adev)
+                                return NULL;
                 }
-                usb_acpi_check_port_connect_type(udev, *handle, port_num);
-        } else
-                return -ENODEV;
+                usb_acpi_check_port_connect_type(udev, adev->handle, port_num);
+                return adev;
+        }
 
-        return 0;
+        return NULL;
 }
 
 static bool usb_acpi_bus_match(struct device *dev)
@@ -223,7 +223,7 @@ static bool usb_acpi_bus_match(struct device *dev)
 static struct acpi_bus_type usb_acpi_bus = {
         .name = "USB",
         .match = usb_acpi_bus_match,
-        .find_device = usb_acpi_find_device,
+        .find_companion = usb_acpi_find_companion,
 };
 
 int usb_acpi_register(void)