Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

USB: ACPI: Replace usb_acpi_find_port() with acpi_find_child_by_adr()

Instead of walking the list of children of an ACPI device directly
in order to find the child matching a given bus address, use
acpi_find_child_by_adr() for this purpose.

Also notice that if acpi_find_child_by_adr() doesn't find a matching
child, acpi_find_child_device() will not find it too, so directly
replace usb_acpi_find_port() in usb_acpi_get_companion_for_port() with
acpi_find_child_by_adr() and drop it entirely.

Apart from simplifying the code, this will help to eliminate the
children list head from struct acpi_device as it is redundant and it
is used in questionable ways in some places (in particular, locking is
needed for walking the list pointed to it safely, but it is often
missing).

Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Reviewed-by: Heikki Krogerus <heikki.krogerus@linux.intel.com>

+1 -17
+1 -17
drivers/usb/core/usb-acpi.c
··· 124 124 */ 125 125 #define USB_ACPI_LOCATION_VALID (1 << 31) 126 126 127 - static struct acpi_device *usb_acpi_find_port(struct acpi_device *parent, 128 - int raw) 129 - { 130 - struct acpi_device *adev; 131 - 132 - if (!parent) 133 - return NULL; 134 - 135 - list_for_each_entry(adev, &parent->children, node) { 136 - if (acpi_device_adr(adev) == raw) 137 - return adev; 138 - } 139 - 140 - return acpi_find_child_device(parent, raw, false); 141 - } 142 - 143 127 static struct acpi_device * 144 128 usb_acpi_get_companion_for_port(struct usb_port *port_dev) 145 129 { ··· 154 170 port1 = port_dev->portnum; 155 171 } 156 172 157 - return usb_acpi_find_port(adev, port1); 173 + return acpi_find_child_by_adr(adev, port1); 158 174 } 159 175 160 176 static struct acpi_device *