Skip to contentSkip to conversation

usb: dwc3: gadget: remove redundant ret variable in dwc3_gadget_vbus_draw

PATCH In review [email protected] 2 participants 2 messages Nov 17, 2022 – Nov 18, 2022

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 usb: dwc3: gadget: remove redundant ret variable in dwc3_gadget_vbus_draw

From: guo ziliang <[email protected]>
Return value from dwc3_gadget_vbus_draw() directly instead of taking this in another redundant variable.

---
 drivers/usb/dwc3/gadget.c | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)
drivers/usb/dwc3/gadget.c +1 -4
index faf37c6..d984d68 100644
@@ -2904,7 +2904,6 @@ static int dwc3_gadget_vbus_draw(struct usb_gadget *g, unsigned int mA)
 {
        struct dwc3             *dwc = gadget_to_dwc(g);
        union power_supply_propval      val = {0};
-       int                             ret;
 
        if (dwc->usb2_phy)
                return usb_phy_set_power(dwc->usb2_phy, mA);
@@ -2913,9 +2912,7 @@ static int dwc3_gadget_vbus_draw(struct usb_gadget *g, unsigned int mA)
                return -EOPNOTSUPP;
 
        val.intval = 1000 * mA;
-       ret = power_supply_set_property(dwc->usb_psy, POWER_SUPPLY_PROP_INPUT_CURRENT_LIMIT, &val);
-
-       return ret;
+       return power_supply_set_property(dwc->usb_psy, POWER_SUPPLY_PROP_INPUT_CURRENT_LIMIT, &val);
 }
 
 /**

--
1.8.3.1

maintainer
#1 lore raw
Quoted 1 line · On Thu, Nov 17, 2022, [email protected] wrote:

From: guo ziliang <[email protected]>

Add new line here.

Quoted 32 lines

Return value from dwc3_gadget_vbus_draw() directly instead of taking this in another redundant variable.

---
 drivers/usb/dwc3/gadget.c | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)
drivers/usb/dwc3/gadget.c +1 -5
index faf37c6..d984d68 100644
@@ -2904,7 +2904,6 @@ static int dwc3_gadget_vbus_draw(struct usb_gadget *g, unsigned int mA)
 {
        struct dwc3             *dwc = gadget_to_dwc(g);
        union power_supply_propval      val = {0};
-       int                             ret;
 
        if (dwc->usb2_phy)
                return usb_phy_set_power(dwc->usb2_phy, mA);
@@ -2913,9 +2912,7 @@ static int dwc3_gadget_vbus_draw(struct usb_gadget *g, unsigned int mA)
                return -EOPNOTSUPP;
 
        val.intval = 1000 * mA;
-       ret = power_supply_set_property(dwc->usb_psy, POWER_SUPPLY_PROP_INPUT_CURRENT_LIMIT, &val);
-
-       return ret;
+       return power_supply_set_property(dwc->usb_psy, POWER_SUPPLY_PROP_INPUT_CURRENT_LIMIT, &val);
 }
 
 /**
--
Quoted 1 line

1.8.3.1

Looks like the patch is corrupted.

Regardless, I think it's fine as is without this change.

BR,
Thinh