usb: phy: Factor out the usb charger initialization

Factor out the guts of usb charger initialization into usb_charger_init()
function, to make the usb_add_extcon() only do the extcon related things.
Meanwhile we also should initialize the USB charger before registering
the extcon device, in case the extcon notification was issued earlier than
usb charger initialization.

Signed-off-by: Baolin Wang <baolin.wang@linaro.org>
Signed-off-by: Felipe Balbi <felipe.balbi@linux.intel.com>

1 files changed, 10 insertions, 4 deletions

diff --git a/drivers/usb/phy/phy.c b/drivers/usb/phy/phy.c
index f97cb47577fc..bceb2c9988dd 100644
--- a/drivers/usb/phy/phy.c
+++ b/drivers/usb/phy/phy.c
@@ -323,6 +323,14 @@ static int devm_usb_phy_match(struct device *dev, void *res, void *match_data)
         return *phy == match_data;
 }
 
+static void usb_charger_init(struct usb_phy *usb_phy)
+{
+        usb_phy->chg_type = UNKNOWN_TYPE;
+        usb_phy->chg_state = USB_CHARGER_DEFAULT;
+        usb_phy_set_default_current(usb_phy);
+        INIT_WORK(&usb_phy->chg_work, usb_phy_notify_charger_work);
+}
+
 static int usb_add_extcon(struct usb_phy *x)
 {
         int ret;
@@ -406,10 +414,6 @@ static int usb_add_extcon(struct usb_phy *x)
                 }
         }
 
-        usb_phy_set_default_current(x);
-        INIT_WORK(&x->chg_work, usb_phy_notify_charger_work);
-        x->chg_type = UNKNOWN_TYPE;
-        x->chg_state = USB_CHARGER_DEFAULT;
         if (x->type_nb.notifier_call)
                 __usb_phy_get_charger_type(x);
 
@@ -704,6 +708,7 @@ int usb_add_phy(struct usb_phy *x, enum usb_phy_type type)
                 return -EINVAL;
         }
 
+        usb_charger_init(x);
         ret = usb_add_extcon(x);
         if (ret)
                 return ret;
@@ -749,6 +754,7 @@ int usb_add_phy_dev(struct usb_phy *x)
                 return -EINVAL;
         }
 
+        usb_charger_init(x);
         ret = usb_add_extcon(x);
         if (ret)
                 return ret;