]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
spi: amlogic-spisg: Use IS_ERR() instead of IS_ERR_OR_NULL()
authorFelix Gu <ustc.gu@gmail.com>
Sun, 8 Mar 2026 06:59:50 +0000 (14:59 +0800)
committerMark Brown <broonie@kernel.org>
Mon, 16 Mar 2026 01:15:59 +0000 (01:15 +0000)
devm_clk_get_enabled() and devm_clk_hw_get_clk() return error pointers
on failure and never return NULL. So IS_ERR_OR_NULL() is unnecessary,
replace them with IS_ERR().

Signed-off-by: Felix Gu <ustc.gu@gmail.com>
Link: https://patch.msgid.link/20260308-spisg-1-v1-1-4e209faf228d@gmail.com
Signed-off-by: Mark Brown <broonie@kernel.org>
drivers/spi/spi-amlogic-spisg.c

index 1509df2b17aed45cb4fab6b3f170ab1a3b6d12fa..665f889dc8d39bda2ec5ebd2d1ad570469e651e8 100644 (file)
@@ -647,13 +647,13 @@ static int aml_spisg_clk_init(struct spisg_device *spisg, void __iomem *base)
        int ret, i;
 
        spisg->core = devm_clk_get_enabled(dev, "core");
-       if (IS_ERR_OR_NULL(spisg->core)) {
+       if (IS_ERR(spisg->core)) {
                dev_err(dev, "core clock request failed\n");
                return PTR_ERR(spisg->core);
        }
 
        spisg->pclk = devm_clk_get_enabled(dev, "pclk");
-       if (IS_ERR_OR_NULL(spisg->pclk)) {
+       if (IS_ERR(spisg->pclk)) {
                dev_err(dev, "pclk clock request failed\n");
                return PTR_ERR(spisg->pclk);
        }
@@ -703,7 +703,7 @@ static int aml_spisg_clk_init(struct spisg_device *spisg, void __iomem *base)
        }
 
        spisg->sclk = devm_clk_hw_get_clk(dev, &div->hw, NULL);
-       if (IS_ERR_OR_NULL(spisg->sclk)) {
+       if (IS_ERR(spisg->sclk)) {
                dev_err(dev, "get clock failed\n");
                return PTR_ERR(spisg->sclk);
        }