@@ -892,8 +892,7 @@ static int davinci_i2s_probe(struct platform_device *pdev)
err_unregister_component:
snd_soc_unregister_component(&pdev->dev);
err_disable_ext_clk:
- if (dev->ext_clk)
- clk_disable_unprepare(dev->ext_clk);
+ clk_disable_unprepare(dev->ext_clk);
err_disable_clk:
clk_disable_unprepare(dev->clk);
@@ -908,8 +907,7 @@ static void davinci_i2s_remove(struct platform_device *pdev)
clk_disable_unprepare(dev->clk);
- if (dev->ext_clk)
- clk_disable_unprepare(dev->ext_clk);
+ clk_disable_unprepare(dev->ext_clk);
}
static const struct of_device_id davinci_i2s_match[] __maybe_unused = {
clk_disable_unprepare() already checks NULL by using IS_ERR_OR_NULL. Remove unneeded NULL check for dev->ext_clk here. Signed-off-by: Chen Ni <nichen@iscas.ac.cn> --- sound/soc/ti/davinci-i2s.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)