ASoC: tegra: s/IS_ERR_OR_NULL/IS_ERR/ for clk_get_sys

[karo-tx-linux.git] / sound / soc / tegra / tegra_asoc_utils.c

diff --git a/sound/soc/tegra/tegra_asoc_utils.c b/sound/soc/tegra/tegra_asoc_utils.c
index 711ab7ff5cedda4594db20400b8c73af7b895926..cfe2ea890dc0fc4e77b35305f9b7e5ec2d935f6f 100644 (file)
--- a/sound/soc/tegra/tegra_asoc_utils.c
+++ b/sound/soc/tegra/tegra_asoc_utils.c
@@ -113,35 +113,33 @@ int tegra_asoc_utils_init(void)
        int ret;
 
        clk_pll_a = clk_get_sys(NULL, "pll_a");
-       if (IS_ERR_OR_NULL(clk_pll_a)) {
+       if (IS_ERR(clk_pll_a)) {
                pr_err(PREFIX "Can't retrieve clk pll_a\n");
                ret = PTR_ERR(clk_pll_a);
                goto err;
        }
 
        clk_pll_a_out0 = clk_get_sys(NULL, "pll_a_out0");
-       if (IS_ERR_OR_NULL(clk_pll_a_out0)) {
+       if (IS_ERR(clk_pll_a_out0)) {
                pr_err(PREFIX "Can't retrieve clk pll_a_out0\n");
                ret = PTR_ERR(clk_pll_a_out0);
-               goto err;
+               goto err_put_pll_a;
        }
 
        clk_cdev1 = clk_get_sys(NULL, "cdev1");
-       if (IS_ERR_OR_NULL(clk_cdev1)) {
+       if (IS_ERR(clk_cdev1)) {
                pr_err(PREFIX "Can't retrieve clk cdev1\n");
                ret = PTR_ERR(clk_cdev1);
-               goto err;
+               goto err_put_pll_a_out0;
        }
 
        return 0;
 
+err_put_pll_a_out0:
+       clk_put(clk_pll_a_out0);
+err_put_pll_a:
+       clk_put(clk_pll_a);
 err:
-       if (!IS_ERR_OR_NULL(clk_cdev1))
-               clk_put(clk_cdev1);
-       if (!IS_ERR_OR_NULL(clk_pll_a_out0))
-               clk_put(clk_pll_a_out0);
-       if (!IS_ERR_OR_NULL(clk_pll_a))
-               clk_put(clk_pll_a);
        return ret;
 }