Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9d918dce authored by Chunfeng Yun's avatar Chunfeng Yun Committed by Greg Kroah-Hartman
Browse files

usb: xhci-mtk: get optional clock by devm_clk_get_optional() 



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: default avatarChunfeng Yun <chunfeng.yun@mediatek.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 48242e30

drivers/usb/host/xhci-mtk.c

+3 −16
Original line number Diff line number Diff line
@@ -206,19 +206,6 @@ static int xhci_mtk_ssusb_config(struct xhci_hcd_mtk *mtk) 
	return xhci_mtk_host_enable(mtk);

}



/* ignore the error if the clock does not exist */

static struct clk *optional_clk_get(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 xhci_mtk_clks_get(struct xhci_hcd_mtk *mtk)

{

	struct device *dev = mtk->dev;
@@ -229,15 +216,15 @@ static int xhci_mtk_clks_get(struct xhci_hcd_mtk *mtk) 
		return PTR_ERR(mtk->sys_clk);

	}



	mtk->ref_clk = optional_clk_get(dev, "ref_ck");

	mtk->ref_clk = devm_clk_get_optional(dev, "ref_ck");

	if (IS_ERR(mtk->ref_clk))

		return PTR_ERR(mtk->ref_clk);



	mtk->mcu_clk = optional_clk_get(dev, "mcu_ck");

	mtk->mcu_clk = devm_clk_get_optional(dev, "mcu_ck");

	if (IS_ERR(mtk->mcu_clk))

		return PTR_ERR(mtk->mcu_clk);



	mtk->dma_clk = optional_clk_get(dev, "dma_ck");

	mtk->dma_clk = devm_clk_get_optional(dev, "dma_ck");

	return PTR_ERR_OR_ZERO(mtk->dma_clk);

}