Merge branch 'for-3.9-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq

[~andy/linux] / drivers / usb / core / usb-acpi.c

diff --git a/drivers/usb/core/usb-acpi.c b/drivers/usb/core/usb-acpi.c
index 8d304b0b5abf483cf87652485a84b57baf838b25..b6f4bad3f756eefb173097767ffde6970e06220e 100644 (file)
--- a/drivers/usb/core/usb-acpi.c
+++ b/drivers/usb/core/usb-acpi.c
@@ -210,29 +210,16 @@ static int usb_acpi_find_device(struct device *dev, acpi_handle *handle)
        return 0;
 }
 
-static struct acpi_bus_type usb_acpi_bus = {
-       .bus = &usb_bus_type,
-       .find_bridge = usb_acpi_find_device,
-       .find_device = usb_acpi_find_device,
-};
-
-int usb_acpi_register_power_resources(struct device *dev)
+static bool usb_acpi_bus_match(struct device *dev)
 {
-       acpi_handle port_handle = DEVICE_ACPI_HANDLE(dev);
-
-       if (!port_handle)
-               return -ENODEV;
-
-       return acpi_power_resource_register_device(dev, port_handle);
+       return is_usb_device(dev) || is_usb_port(dev);
 }
 
-void usb_acpi_unregister_power_resources(struct device *dev)
-{
-       acpi_handle port_handle = DEVICE_ACPI_HANDLE(dev);
-
-       if (port_handle)
-               acpi_power_resource_unregister_device(dev, port_handle);
-}
+static struct acpi_bus_type usb_acpi_bus = {
+       .name = "USB",
+       .match = usb_acpi_bus_match,
+       .find_device = usb_acpi_find_device,
+};
 
 int usb_acpi_register(void)
 {