[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <20220516084139.8864-4-wanjiabing@vivo.com>
Date: Mon, 16 May 2022 16:41:38 +0800
From: Wan Jiabing <wanjiabing@...o.com>
To: Vinod Koul <vkoul@...nel.org>, Orson Zhai <orsonzhai@...il.com>,
Baolin Wang <baolin.wang7@...il.com>,
Chunyan Zhang <zhang.lyra@...il.com>,
Linus Walleij <linus.walleij@...aro.org>,
dmaengine@...r.kernel.org, linux-kernel@...r.kernel.org,
linux-arm-kernel@...ts.infradead.org
Cc: Wan Jiabing <wanjiabing@...o.com>
Subject: [PATCH 3/4] dmaengine: ste_dma40: Remove unneeded ERROR and NULL check in ste_dma40
clk_put() already checks ERROR by using IS_ERR.
clk_disable_unprepare() already checks NULL by using IS_ERR_OR_NULL.
Remove unneeded NULL check for clk_ret and ERROR check for clk.
Signed-off-by: Wan Jiabing <wanjiabing@...o.com>
---
drivers/dma/ste_dma40.c | 10 ++++------
1 file changed, 4 insertions(+), 6 deletions(-)
diff --git a/drivers/dma/ste_dma40.c b/drivers/dma/ste_dma40.c
index e1827393143f..7d1bf4ae4495 100644
--- a/drivers/dma/ste_dma40.c
+++ b/drivers/dma/ste_dma40.c
@@ -3119,7 +3119,7 @@ static struct d40_base * __init d40_hw_detect_init(struct platform_device *pdev)
clk = clk_get(&pdev->dev, NULL);
if (IS_ERR(clk)) {
d40_err(&pdev->dev, "No matching clock found\n");
- goto check_prepare_enabled;
+ goto disable_unprepare;
}
clk_ret = clk_prepare_enable(clk);
@@ -3305,12 +3305,10 @@ static struct d40_base * __init d40_hw_detect_init(struct platform_device *pdev)
iounmap(virtbase);
release_region:
release_mem_region(res->start, resource_size(res));
- check_prepare_enabled:
- if (!clk_ret)
disable_unprepare:
- clk_disable_unprepare(clk);
- if (!IS_ERR(clk))
- clk_put(clk);
+ clk_disable_unprepare(clk);
+ clk_put(clk);
+
return NULL;
}
--
2.36.1
Powered by blists - more mailing lists