Skip to content

Commit

Permalink
thermal: ti-soc-thermal: clean up the error handling a bit
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Dan Carpenter authored and Eduardo Valentin committed Mar 8, 2016
1 parent 8255e4e commit 1336919
Showing 1 changed file with 4 additions and 6 deletions.
10 changes: 4 additions & 6 deletions drivers/thermal/ti-soc-thermal/ti-bandgap.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)) {
Expand All @@ -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;
Expand All @@ -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");
}
Expand Down

0 comments on commit 1336919

Please sign in to comment.