Merge tag 'usb-3.15-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb

[pandora-kernel.git] / drivers / usb / core / hub.c

diff --git a/drivers/usb/core/hub.c b/drivers/usb/core/hub.c
index d670aaf..090469e 100644 (file)
--- a/drivers/usb/core/hub.c
+++ b/drivers/usb/core/hub.c
@@ -1049,7 +1049,7 @@ static void hub_activate(struct usb_hub *hub, enum hub_activation_type type)
                 */
                if (type == HUB_INIT) {
                        delay = hub_power_on(hub, false);
-                       PREPARE_DELAYED_WORK(&hub->init_work, hub_init_func2);
+                       INIT_DELAYED_WORK(&hub->init_work, hub_init_func2);
                        queue_delayed_work(system_power_efficient_wq,
                                        &hub->init_work,
                                        msecs_to_jiffies(delay));
@@ -1204,7 +1204,7 @@ static void hub_activate(struct usb_hub *hub, enum hub_activation_type type)
 
                /* Don't do a long sleep inside a workqueue routine */
                if (type == HUB_INIT2) {
-                       PREPARE_DELAYED_WORK(&hub->init_work, hub_init_func3);
+                       INIT_DELAYED_WORK(&hub->init_work, hub_init_func3);
                        queue_delayed_work(system_power_efficient_wq,
                                        &hub->init_work,
                                        msecs_to_jiffies(delay));
@@ -1800,7 +1800,7 @@ hub_ioctl(struct usb_interface *intf, unsigned int code, void *user_data)
  * to one of these "claimed" ports, the program will "own" the device.
  */
 static int find_port_owner(struct usb_device *hdev, unsigned port1,
-               struct dev_state ***ppowner)
+               struct usb_dev_state ***ppowner)
 {
        struct usb_hub *hub = usb_hub_to_struct_hub(hdev);
 
@@ -1818,10 +1818,10 @@ static int find_port_owner(struct usb_device *hdev, unsigned port1,
 
 /* In the following three functions, the caller must hold hdev's lock */
 int usb_hub_claim_port(struct usb_device *hdev, unsigned port1,
-                      struct dev_state *owner)
+                      struct usb_dev_state *owner)
 {
        int rc;
-       struct dev_state **powner;
+       struct usb_dev_state **powner;
 
        rc = find_port_owner(hdev, port1, &powner);
        if (rc)
@@ -1831,12 +1831,13 @@ int usb_hub_claim_port(struct usb_device *hdev, unsigned port1,
        *powner = owner;
        return rc;
 }
+EXPORT_SYMBOL_GPL(usb_hub_claim_port);
 
 int usb_hub_release_port(struct usb_device *hdev, unsigned port1,
-                        struct dev_state *owner)
+                        struct usb_dev_state *owner)
 {
        int rc;
-       struct dev_state **powner;
+       struct usb_dev_state **powner;
 
        rc = find_port_owner(hdev, port1, &powner);
        if (rc)
@@ -1846,8 +1847,9 @@ int usb_hub_release_port(struct usb_device *hdev, unsigned port1,
        *powner = NULL;
        return rc;
 }
+EXPORT_SYMBOL_GPL(usb_hub_release_port);
 
-void usb_hub_release_all_ports(struct usb_device *hdev, struct dev_state *owner)
+void usb_hub_release_all_ports(struct usb_device *hdev, struct usb_dev_state *owner)
 {
        struct usb_hub *hub = usb_hub_to_struct_hub(hdev);
        int n;