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

A recent discussion on linux-arm-kernel noted that the value returned by
clk_get_sys is an opaque token, and not strictly a pointer; it is
meaningful only to the clock API, clients should not dereference the value,
and the clock API must accept any non-IS_ERR value it returned.

Hence, only IS_ERR is appropriate to interpret the result, not
IS_ERR_OR_NULL.

I checked that clk_get_sys in both ASoC's for-next and Tegra's for-next
do behave as described; NULL is not returned in the case of error.

Signed-off-by: Stephen Warren <swarren@nvidia.com>
Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>

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;
 }
 

diff --git a/sound/soc/tegra/tegra_i2s.c b/sound/soc/tegra/tegra_i2s.c
index 1730509c8ac26ed070c751c3749410bf4c367337..6d668785e9afe2522bf2dd9be3f87e069517d57e 100644 (file)
--- a/sound/soc/tegra/tegra_i2s.c
+++ b/sound/soc/tegra/tegra_i2s.c
@@ -385,7 +385,7 @@ static __devinit int tegra_i2s_platform_probe(struct platform_device *pdev)
 
        snprintf(clk_name, sizeof(clk_name), DRV_NAME ".%d", pdev->id);
        i2s->clk_i2s = clk_get_sys(clk_name, NULL);
-       if (IS_ERR_OR_NULL(i2s->clk_i2s)) {
+       if (IS_ERR(i2s->clk_i2s)) {
                pr_err("Can't retrieve i2s clock\n");
                ret = PTR_ERR(i2s->clk_i2s);
                goto err_free;