2022-11-17 02:41:26

by guo.ziliang

Subject: [PATCH linux-next] 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.

Signed-off-by: guo ziliang <[email protected]>
---
drivers/usb/dwc3/gadget.c | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/drivers/usb/dwc3/gadget.c b/drivers/usb/dwc3/gadget.c
index faf37c6..d984d68 100644
--- a/drivers/usb/dwc3/gadget.c
+++ b/drivers/usb/dwc3/gadget.c
@@ -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

2022-11-18 01:30:05

by Thinh Nguyen

Subject: Re: [PATCH linux-next] usb: dwc3: gadget: remove redundant ret variable in dwc3_gadget_vbus_draw

On Thu, Nov 17, 2022, [email protected] wrote:
> From: guo ziliang <[email protected]>

Add new line here.

> Return value from dwc3_gadget_vbus_draw() directly instead of taking
> this in another redundant variable.
>
> Signed-off-by: guo ziliang <[email protected]>
> ---
> drivers/usb/dwc3/gadget.c | 5 +----
> 1 file changed, 1 insertion(+), 4 deletions(-)
>
> diff --git a/drivers/usb/dwc3/gadget.c b/drivers/usb/dwc3/gadget.c
> index faf37c6..d984d68 100644
> --- a/drivers/usb/dwc3/gadget.c
> +++ b/drivers/usb/dwc3/gadget.c
> @@ -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

Looks like the patch is corrupted.

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

BR,
Thinh