Prefer using IS_ERR_OR_NULL() over using IS_ERR() and a manual NULL check. Change generated with coccinelle.
To: Sylwester Nawrocki <[email protected]> To: Liam Girdwood <[email protected]> To: Mark Brown <[email protected]> To: Jaroslav Kysela <[email protected]> To: Takashi Iwai <[email protected]> To: Max Filippov <[email protected]> Cc: [email protected] Cc: [email protected] Signed-off-by: Philipp Hahn <[email protected]> --- sound/soc/samsung/i2s.c | 4 ++-- sound/soc/xtensa/xtfpga-i2s.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/sound/soc/samsung/i2s.c b/sound/soc/samsung/i2s.c index e9964f0e010aee549cced75d8fe2023e8271d443..6e86f3a0a52dd3f8fc728d634594eb81f9945c57 100644 --- a/sound/soc/samsung/i2s.c +++ b/sound/soc/samsung/i2s.c @@ -559,7 +559,7 @@ static int i2s_set_sysclk(struct snd_soc_dai *dai, int clk_id, unsigned int rfs, clk_id = 1; if (!any_active(i2s)) { - if (priv->op_clk && !IS_ERR(priv->op_clk)) { + if (!IS_ERR_OR_NULL(priv->op_clk)) { if ((clk_id && !(mod & rsrc_mask)) || (!clk_id && (mod & rsrc_mask))) { clk_disable_unprepare(priv->op_clk); @@ -812,7 +812,7 @@ static int i2s_hw_params(struct snd_pcm_substream *substream, i2s->frmclk = params_rate(params); rclksrc = priv->clk_table[CLK_I2S_RCLK_SRC]; - if (rclksrc && !IS_ERR(rclksrc)) + if (!IS_ERR_OR_NULL(rclksrc)) priv->rclk_srcrate = clk_get_rate(rclksrc); return 0; diff --git a/sound/soc/xtensa/xtfpga-i2s.c b/sound/soc/xtensa/xtfpga-i2s.c index 678ded059b959d475b6be3766867c8a78bdd4e54..698905257b690457a5d3d315e77d99d487d91f77 100644 --- a/sound/soc/xtensa/xtfpga-i2s.c +++ b/sound/soc/xtensa/xtfpga-i2s.c @@ -609,7 +609,7 @@ static void xtfpga_i2s_remove(struct platform_device *pdev) { struct xtfpga_i2s *i2s = dev_get_drvdata(&pdev->dev); - if (i2s->regmap && !IS_ERR(i2s->regmap)) { + if (!IS_ERR_OR_NULL(i2s->regmap)) { regmap_write(i2s->regmap, XTFPGA_I2S_CONFIG, 0); regmap_write(i2s->regmap, XTFPGA_I2S_INT_MASK, 0); regmap_write(i2s->regmap, XTFPGA_I2S_INT_STATUS, -- 2.43.0
