phy: rockchip-emmc: emmc_phy_init() always return 0

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@gtsys.com.hk>
Reviewed-by: Douglas Anderson <dianders@chromium.org>
Link: https://lore.kernel.org/r/20201210080454.17379-1-chris.ruehl@gtsys.com.hk
Signed-off-by: Vinod Koul <vkoul@kernel.org>

diff --git a/drivers/phy/rockchip/phy-rockchip-emmc.c b/drivers/phy/rockchip/phy-rockchip-emmc.c
index 1e424f2..496d199 100644 (file)
--- a/drivers/phy/rockchip/phy-rockchip-emmc.c
+++ b/drivers/phy/rockchip/phy-rockchip-emmc.c
@@ -248,15 +248,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");
+       rk_phy->emmcclk = clk_get_optional(&phy->dev, "emmcclk");
        if (IS_ERR(rk_phy->emmcclk)) {
-               dev_dbg(&phy->dev, "Error getting emmcclk: %d\n", ret);
+               ret = PTR_ERR(rk_phy->emmcclk);
+               dev_err(&phy->dev, "Error getting emmcclk: %d\n", ret);
                rk_phy->emmcclk = NULL;
        }