Re: [PATCH 4/5] usb: phy: phy-msm-usb: Rename regulator_set_optimum_mode

[Felipe Balbi]

On Wed, Feb 11, 2015 at 07:35:30PM -0800, Bjorn Andersson wrote:
> The function regulator_set_optimum_mode() is changing name to
> regulator_set_load(), so update the code accordingly.
> 
> Signed-off-by: Bjorn Andersson <bjorn.andersson@xxxxxxxxxxxxxx>

since this depends on the rest of the series:

Acked-by: Felipe Balbi <balbi@xxxxxx>

> ---
>  drivers/usb/phy/phy-msm-usb.c | 15 +++++----------
>  1 file changed, 5 insertions(+), 10 deletions(-)
> 
> diff --git a/drivers/usb/phy/phy-msm-usb.c b/drivers/usb/phy/phy-msm-usb.c
> index 000fd89..6ed67ea 100644
> --- a/drivers/usb/phy/phy-msm-usb.c
> +++ b/drivers/usb/phy/phy-msm-usb.c
> @@ -142,27 +142,22 @@ static int msm_hsusb_ldo_set_mode(struct msm_otg *motg, int on)
>  	int ret = 0;
>  
>  	if (on) {
> -		ret = regulator_set_optimum_mode(motg->v1p8,
> -				USB_PHY_1P8_HPM_LOAD);
> +		ret = regulator_set_load(motg->v1p8, USB_PHY_1P8_HPM_LOAD);
>  		if (ret < 0) {
>  			pr_err("Could not set HPM for v1p8\n");
>  			return ret;
>  		}
> -		ret = regulator_set_optimum_mode(motg->v3p3,
> -				USB_PHY_3P3_HPM_LOAD);
> +		ret = regulator_set_load(motg->v3p3, USB_PHY_3P3_HPM_LOAD);
>  		if (ret < 0) {
>  			pr_err("Could not set HPM for v3p3\n");
> -			regulator_set_optimum_mode(motg->v1p8,
> -				USB_PHY_1P8_LPM_LOAD);
> +			regulator_set_load(motg->v1p8, USB_PHY_1P8_LPM_LOAD);
>  			return ret;
>  		}
>  	} else {
> -		ret = regulator_set_optimum_mode(motg->v1p8,
> -				USB_PHY_1P8_LPM_LOAD);
> +		ret = regulator_set_load(motg->v1p8, USB_PHY_1P8_LPM_LOAD);
>  		if (ret < 0)
>  			pr_err("Could not set LPM for v1p8\n");
> -		ret = regulator_set_optimum_mode(motg->v3p3,
> -				USB_PHY_3P3_LPM_LOAD);
> +		ret = regulator_set_load(motg->v3p3, USB_PHY_3P3_LPM_LOAD);
>  		if (ret < 0)
>  			pr_err("Could not set LPM for v3p3\n");
>  	}
> -- 
> 1.8.2.2
> 

-- 
balbi

Attachment: signature.asc
Description: Digital signature