[PATCH v2] phy: rockchip-emmc: emmc_phy_init() always return 0

Doug Anderson dianders at chromium.org
Wed Dec 9 12:48:29 EST 2020


Hi,

On Tue, Dec 8, 2020 at 6:08 PM Chris Ruehl <chris.ruehl at gtsys.com.hk> wrote:
>
> rockchip_emmc_phy_init() return variable is not set with the error value
> if clk_get() failed. 'emmcclk' is optional, thus use clk_get_optional()
> and if the return value != NULL make error processing and set the
> return code accordingly.
>
> Fixes: 52c0624a10cce phy: rockchip-emmc: Set phyctrl_frqsel based on card clock
>
> Signed-off-by: Chris Ruehl <chris.ruehl at gtsys.com.hk>
> ---
>  drivers/phy/rockchip/phy-rockchip-emmc.c | 10 ++++++----
>  1 file changed, 6 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/phy/rockchip/phy-rockchip-emmc.c b/drivers/phy/rockchip/phy-rockchip-emmc.c
> index 48e2d75b1004..a23034416481 100644
> --- a/drivers/phy/rockchip/phy-rockchip-emmc.c
> +++ b/drivers/phy/rockchip/phy-rockchip-emmc.c
> @@ -245,15 +245,17 @@ static int rockchip_emmc_phy_init(struct phy *phy)
>          * - SDHCI driver to get the PHY
>          * - SDHCI driver to init the PHY
>          *
> -        * The clock is optional, so upon any error we just set to NULL.
> +        * The clock is optional, using clk_get_optional() to get the clock
> +        * and do error processing if the return value != NULL
>          *
>          * NOTE: we don't do anything special for EPROBE_DEFER here.  Given the
>          * above expected use case, EPROBE_DEFER isn't sensible to expect, so
>          * it's just like any other error.
>          */
> -       rk_phy->emmcclk = clk_get(&phy->dev, "emmcclk");
> -       if (IS_ERR(rk_phy->emmcclk)) {
> -               dev_dbg(&phy->dev, "Error getting emmcclk: %d\n", ret);
> +       rk_phy->emmcclk = clk_get_optional(&phy->dev, "emmcclk");
> +       if (rk_phy->emmcclk && IS_ERR(rk_phy->emmcclk)) {

nit: no need to check for "rk_phy->emmcclk".  IS_ERR() will return
false for NULL.

Other than that, this looks fine to me.

Reviewed-by: Douglas Anderson <dianders at chromium.org>



More information about the linux-arm-kernel mailing list