[PATCH] spi: amlogic-spisg: Use IS_ERR() instead of IS_ERR_OR_NULL()

From: Felix Gu

Date: Sun Mar 08 2026 - 03:00:07 EST


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@xxxxxxxxx>
---
drivers/spi/spi-amlogic-spisg.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/spi/spi-amlogic-spisg.c b/drivers/spi/spi-amlogic-spisg.c
index 1509df2b17ae..665f889dc8d3 100644
--- a/drivers/spi/spi-amlogic-spisg.c
+++ b/drivers/spi/spi-amlogic-spisg.c
@@ -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);
}

---
base-commit: a0ae2a256046c0c5d3778d1a194ff2e171f16e5f
change-id: 20260308-spisg-1-f342db88b67c

Best regards,
--
Felix Gu <ustc.gu@xxxxxxxxx>