Commit b41123f4 authored by Krzysztof Kozlowski's avatar Krzysztof Kozlowski Committed by Ulf Hansson
Browse files

mmc: sdhci-brcmstb: Simplify with optional clock and dev_err_probe() 



Only -ENOENT from devm_clk_get() means that clock is not present in
device tree.  Other errors have their own meaning and should not be
ignored.

Simplify getting the clock which is in fact optional and also use
dev_err_probe() for handling deferred.

Signed-off-by: default avatarKrzysztof Kozlowski <krzk@kernel.org>
Acked-by: default avatarFlorian Fainelli <f.fainelli@gmail.com>
Link: https://lore.kernel.org/r/20200902193658.20539-7-krzk@kernel.org


Signed-off-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
parent b5f9a2c6

drivers/mmc/host/sdhci-brcmstb.c

+5 −7
Original line number Diff line number Diff line
@@ -235,13 +235,11 @@ static int sdhci_brcmstb_probe(struct platform_device *pdev) 


	dev_dbg(&pdev->dev, "Probe found match for %s\n",  match->compatible);



	clk = devm_clk_get(&pdev->dev, NULL);

	if (IS_ERR(clk)) {

		if (PTR_ERR(clk) == -EPROBE_DEFER)

			return -EPROBE_DEFER;

		dev_err(&pdev->dev, "Clock not found in Device Tree\n");

		clk = NULL;

	}

	clk = devm_clk_get_optional(&pdev->dev, NULL);

	if (IS_ERR(clk))

		return dev_err_probe(&pdev->dev, PTR_ERR(clk),

				     "Failed to get clock from Device Tree\n");



	res = clk_prepare_enable(clk);

	if (res)

		return res;