ASoC: hisilicon: Use IS_ERR() instead of IS_ERR_OR_NULL()
authorTang Bin <tangbin@cmss.chinamobile.com>
Mon, 27 Apr 2020 09:11:45 +0000 (17:11 +0800)
committerMark Brown <broonie@kernel.org>
Mon, 27 Apr 2020 13:08:40 +0000 (14:08 +0100)
In the function hi6210_i2s_probe(), devm_clk_get() doesn't return NULL.
Thus use IS_ERR() to validate the return value instead of IS_ERR_OR_NULL().

Signed-off-by: Zhang Shengju <zhangshengju@cmss.chinamobile.com>
Signed-off-by: Tang Bin <tangbin@cmss.chinamobile.com>
Link: https://lore.kernel.org/r/20200427091145.4268-1-tangbin@cmss.chinamobile.com
Signed-off-by: Mark Brown <broonie@kernel.org>
sound/soc/hisilicon/hi6210-i2s.c

index ab3b76d..f14ce02 100644 (file)
@@ -570,12 +570,12 @@ static int hi6210_i2s_probe(struct platform_device *pdev)
                return PTR_ERR(i2s->sysctrl);
 
        i2s->clk[CLK_DACODEC] = devm_clk_get(&pdev->dev, "dacodec");
-       if (IS_ERR_OR_NULL(i2s->clk[CLK_DACODEC]))
+       if (IS_ERR(i2s->clk[CLK_DACODEC]))
                return PTR_ERR(i2s->clk[CLK_DACODEC]);
        i2s->clocks++;
 
        i2s->clk[CLK_I2S_BASE] = devm_clk_get(&pdev->dev, "i2s-base");
-       if (IS_ERR_OR_NULL(i2s->clk[CLK_I2S_BASE]))
+       if (IS_ERR(i2s->clk[CLK_I2S_BASE]))
                return PTR_ERR(i2s->clk[CLK_I2S_BASE]);
        i2s->clocks++;