Commit 610395de authored by Krzysztof Kozlowski's avatar Krzysztof Kozlowski

memory: pl172: simplify with devm_clk_get_enabled()

Use devm_clk_get_enabled() to drop clock prepare/unprepare parts and
make code simpler.  Change to dev_err_probe() in handling clk_get_rate()
error to make it even simpler.
Reviewed-by: default avatarJonathan Cameron <Jonathan.Cameron@huawei.com>
Reviewed-by: default avatarVladimir Zapolskiy <vz@mleia.com>
Link: https://lore.kernel.org/r/20240823-b4-cleanup-h-guard-v1-5-01668915bd55@linaro.orgSigned-off-by: default avatarKrzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
parent 8f3cb397
...@@ -216,28 +216,20 @@ static int pl172_probe(struct amba_device *adev, const struct amba_id *id) ...@@ -216,28 +216,20 @@ static int pl172_probe(struct amba_device *adev, const struct amba_id *id)
if (!pl172) if (!pl172)
return -ENOMEM; return -ENOMEM;
pl172->clk = devm_clk_get(dev, "mpmcclk"); pl172->clk = devm_clk_get_enabled(dev, "mpmcclk");
if (IS_ERR(pl172->clk)) if (IS_ERR(pl172->clk))
return dev_err_probe(dev, PTR_ERR(pl172->clk), return dev_err_probe(dev, PTR_ERR(pl172->clk),
"no mpmcclk provided clock\n"); "no mpmcclk provided clock\n");
ret = clk_prepare_enable(pl172->clk);
if (ret) {
dev_err(dev, "unable to mpmcclk enable clock\n");
return ret;
}
pl172->rate = clk_get_rate(pl172->clk) / MSEC_PER_SEC; pl172->rate = clk_get_rate(pl172->clk) / MSEC_PER_SEC;
if (!pl172->rate) { if (!pl172->rate)
dev_err(dev, "unable to get mpmcclk clock rate\n"); return dev_err_probe(dev, -EINVAL,
ret = -EINVAL; "unable to get mpmcclk clock rate\n");
goto err_clk_enable;
}
ret = amba_request_regions(adev, NULL); ret = amba_request_regions(adev, NULL);
if (ret) { if (ret) {
dev_err(dev, "unable to request AMBA regions\n"); dev_err(dev, "unable to request AMBA regions\n");
goto err_clk_enable; return ret;
} }
pl172->base = devm_ioremap(dev, adev->res.start, pl172->base = devm_ioremap(dev, adev->res.start,
...@@ -267,16 +259,11 @@ static int pl172_probe(struct amba_device *adev, const struct amba_id *id) ...@@ -267,16 +259,11 @@ static int pl172_probe(struct amba_device *adev, const struct amba_id *id)
err_no_ioremap: err_no_ioremap:
amba_release_regions(adev); amba_release_regions(adev);
err_clk_enable:
clk_disable_unprepare(pl172->clk);
return ret; return ret;
} }
static void pl172_remove(struct amba_device *adev) static void pl172_remove(struct amba_device *adev)
{ {
struct pl172_data *pl172 = amba_get_drvdata(adev);
clk_disable_unprepare(pl172->clk);
amba_release_regions(adev); amba_release_regions(adev);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment