| Message ID | 20221006110935.59695-1-angelogioacchino.delregno@collabora.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | soc: mediatek: mtk-devapc: Switch to devm_clk_get_enabled() | expand |
On 06/10/2022 13:09, AngeloGioacchino Del Regno wrote: > This driver does exactly devm_clk_get() and clk_prepare_enable() right > after, which is exactly what devm_clk_get_enabled() does: clean that > up by switching to the latter. > > This commit brings no functional changes. > > Signed-off-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com> Applied, sorry for the delay. Matthias > --- > drivers/soc/mediatek/mtk-devapc.c | 11 ++--------- > 1 file changed, 2 insertions(+), 9 deletions(-) > > diff --git a/drivers/soc/mediatek/mtk-devapc.c b/drivers/soc/mediatek/mtk-devapc.c > index fc13334db1b1..bad139cb117e 100644 > --- a/drivers/soc/mediatek/mtk-devapc.c > +++ b/drivers/soc/mediatek/mtk-devapc.c > @@ -276,19 +276,14 @@ static int mtk_devapc_probe(struct platform_device *pdev) > if (!devapc_irq) > return -EINVAL; > > - ctx->infra_clk = devm_clk_get(&pdev->dev, "devapc-infra-clock"); > + ctx->infra_clk = devm_clk_get_enabled(&pdev->dev, "devapc-infra-clock"); > if (IS_ERR(ctx->infra_clk)) > return -EINVAL; > > - if (clk_prepare_enable(ctx->infra_clk)) > - return -EINVAL; > - > ret = devm_request_irq(&pdev->dev, devapc_irq, devapc_violation_irq, > IRQF_TRIGGER_NONE, "devapc", ctx); > - if (ret) { > - clk_disable_unprepare(ctx->infra_clk); > + if (ret) > return ret; > - } > > platform_set_drvdata(pdev, ctx); > > @@ -303,8 +298,6 @@ static int mtk_devapc_remove(struct platform_device *pdev) > > stop_devapc(ctx); > > - clk_disable_unprepare(ctx->infra_clk); > - > return 0; > } >
diff --git a/drivers/soc/mediatek/mtk-devapc.c b/drivers/soc/mediatek/mtk-devapc.c index fc13334db1b1..bad139cb117e 100644 --- a/drivers/soc/mediatek/mtk-devapc.c +++ b/drivers/soc/mediatek/mtk-devapc.c @@ -276,19 +276,14 @@ static int mtk_devapc_probe(struct platform_device *pdev) if (!devapc_irq) return -EINVAL; - ctx->infra_clk = devm_clk_get(&pdev->dev, "devapc-infra-clock"); + ctx->infra_clk = devm_clk_get_enabled(&pdev->dev, "devapc-infra-clock"); if (IS_ERR(ctx->infra_clk)) return -EINVAL; - if (clk_prepare_enable(ctx->infra_clk)) - return -EINVAL; - ret = devm_request_irq(&pdev->dev, devapc_irq, devapc_violation_irq, IRQF_TRIGGER_NONE, "devapc", ctx); - if (ret) { - clk_disable_unprepare(ctx->infra_clk); + if (ret) return ret; - } platform_set_drvdata(pdev, ctx); @@ -303,8 +298,6 @@ static int mtk_devapc_remove(struct platform_device *pdev) stop_devapc(ctx); - clk_disable_unprepare(ctx->infra_clk); - return 0; }
This driver does exactly devm_clk_get() and clk_prepare_enable() right after, which is exactly what devm_clk_get_enabled() does: clean that up by switching to the latter. This commit brings no functional changes. Signed-off-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com> --- drivers/soc/mediatek/mtk-devapc.c | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-)