]> git.karo-electronics.de Git - linux-beck.git/commitdiff
thermal: ti-soc-thermal: clean up the error handling a bit
authorDan Carpenter <dan.carpenter@oracle.com>
Wed, 2 Mar 2016 10:00:55 +0000 (13:00 +0300)
committerEduardo Valentin <edubezval@gmail.com>
Tue, 8 Mar 2016 19:57:37 +0000 (11:57 -0800)
We don't need to initialize "ret".  We can move the IS_ERR() checks into
the if condition instead of doing an assignment first.  Also there is a
check for "ret" when we know it is zero so we can remove that.

Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Eduardo Valentin <edubezval@gmail.com>
drivers/thermal/ti-soc-thermal/ti-bandgap.c

index 1e34a1efc55431f3e05ebacba315756e8a9cd958..06ea9766a70af431d12e72dfb7c6bfedb5179511 100644 (file)
@@ -1265,7 +1265,7 @@ static
 int ti_bandgap_probe(struct platform_device *pdev)
 {
        struct ti_bandgap *bgp;
-       int clk_rate, ret = 0, i;
+       int clk_rate, ret, i;
 
        bgp = ti_bandgap_build(pdev);
        if (IS_ERR(bgp)) {
@@ -1288,16 +1288,14 @@ int ti_bandgap_probe(struct platform_device *pdev)
        }
 
        bgp->fclock = clk_get(NULL, bgp->conf->fclock_name);
-       ret = IS_ERR(bgp->fclock);
-       if (ret) {
+       if (IS_ERR(bgp->fclock)) {
                dev_err(&pdev->dev, "failed to request fclock reference\n");
                ret = PTR_ERR(bgp->fclock);
                goto free_irqs;
        }
 
        bgp->div_clk = clk_get(NULL, bgp->conf->div_ck_name);
-       ret = IS_ERR(bgp->div_clk);
-       if (ret) {
+       if (IS_ERR(bgp->div_clk)) {
                dev_err(&pdev->dev, "failed to request div_ts_ck clock ref\n");
                ret = PTR_ERR(bgp->div_clk);
                goto free_irqs;
@@ -1314,7 +1312,7 @@ int ti_bandgap_probe(struct platform_device *pdev)
                 * may not be accurate
                 */
                val = ti_bandgap_readl(bgp, tsr->bgap_efuse);
-               if (ret || !val)
+               if (!val)
                        dev_info(&pdev->dev,
                                 "Non-trimmed BGAP, Temp not accurate\n");
        }