usb: mtu3: get optional clock by devm_clk_get_optional()
authorChunfeng Yun <chunfeng.yun@mediatek.com>
Wed, 17 Apr 2019 08:28:21 +0000 (16:28 +0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 19 Apr 2019 12:24:26 +0000 (14:24 +0200)
Use devm_clk_get_optional() to get optional clock instead of
optional_clk_get() which uses devm_clk_get() to get clock and
checks for -EPROBE_DEFER but not -ENOENT as devm_clk_get_optional()
does, in fact, only ignoring -ENOENT will cover more errors, so
the replacement doesn't change original purpose.

Signed-off-by: Chunfeng Yun <chunfeng.yun@mediatek.com>
Reviewed-by: Matthias Brugger <matthias.bgg@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/usb/mtu3/mtu3_plat.c

index dca8bd864e6330b48cf862a9b85bffeed98e47d3..fd0f6c5dfbc179c54a68b0e9a2608102af5ffabb 100644 (file)
@@ -211,19 +211,6 @@ static void ssusb_ip_sw_reset(struct ssusb_mtk *ssusb)
        mtu3_setbits(ssusb->ippc_base, U3D_SSUSB_IP_PW_CTRL2, SSUSB_IP_DEV_PDN);
 }
 
-/* ignore the error if the clock does not exist */
-static struct clk *get_optional_clk(struct device *dev, const char *id)
-{
-       struct clk *opt_clk;
-
-       opt_clk = devm_clk_get(dev, id);
-       /* ignore error number except EPROBE_DEFER */
-       if (IS_ERR(opt_clk) && (PTR_ERR(opt_clk) != -EPROBE_DEFER))
-               opt_clk = NULL;
-
-       return opt_clk;
-}
-
 static int get_ssusb_rscs(struct platform_device *pdev, struct ssusb_mtk *ssusb)
 {
        struct device_node *node = pdev->dev.of_node;
@@ -245,15 +232,15 @@ static int get_ssusb_rscs(struct platform_device *pdev, struct ssusb_mtk *ssusb)
                return PTR_ERR(ssusb->sys_clk);
        }
 
-       ssusb->ref_clk = get_optional_clk(dev, "ref_ck");
+       ssusb->ref_clk = devm_clk_get_optional(dev, "ref_ck");
        if (IS_ERR(ssusb->ref_clk))
                return PTR_ERR(ssusb->ref_clk);
 
-       ssusb->mcu_clk = get_optional_clk(dev, "mcu_ck");
+       ssusb->mcu_clk = devm_clk_get_optional(dev, "mcu_ck");
        if (IS_ERR(ssusb->mcu_clk))
                return PTR_ERR(ssusb->mcu_clk);
 
-       ssusb->dma_clk = get_optional_clk(dev, "dma_ck");
+       ssusb->dma_clk = devm_clk_get_optional(dev, "dma_ck");
        if (IS_ERR(ssusb->dma_clk))
                return PTR_ERR(ssusb->dma_clk);