| Message ID | 20200902193658.20539-7-krzk@kernel.org |
|---|---|
| State | New |
| Headers | show |
| Series | mmc: Minor cleanups and compile test | expand |
On Wed, 2 Sep 2020 at 21:58, Florian Fainelli <f.fainelli@gmail.com> wrote: > > > > On 9/2/2020 12:36 PM, Krzysztof Kozlowski wrote: > > 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: Krzysztof Kozlowski <krzk@kernel.org> > > This is actually an open coded version of devm_clk_get_optional(), so > this is fine: devm_clk_get_optional() treats -ENOENT specifically, so it's not an exact open coded version. I think that's why Krzysztof prefered to get it tested on HW. > > Acked-by: Florian Fainelli <f.fainelli@gmail.com> Thanks! I am queuing this up for next, without waiting for explicit tests . There is time to get that from testing in linux-next anyway. Kind regards Uffe
diff --git a/drivers/mmc/host/sdhci-brcmstb.c b/drivers/mmc/host/sdhci-brcmstb.c index ad01f6451a95..876668827580 100644 --- a/drivers/mmc/host/sdhci-brcmstb.c +++ b/drivers/mmc/host/sdhci-brcmstb.c @@ -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;
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: Krzysztof Kozlowski <krzk@kernel.org> --- Not tested on HW. --- drivers/mmc/host/sdhci-brcmstb.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-)