[PATCH] mmci-omap: remove bogus check for host->iclk

[PATCH] mmci-omap: remove bogus check for host->iclk

[Ladislav.Michl]

Remove check for host->iclk being NULL from error path since we already know
it is non-null and use return value from clk_get.

Signed-off-by: Ladislav Michl <ladis@linux-mips.org>

diff --git a/drivers/mmc/host/omap.c b/drivers/mmc/host/omap.c
index 5d773b8..c6d7e8e 100644
--- a/drivers/mmc/host/omap.c
+++ b/drivers/mmc/host/omap.c
@@ -1459,8 +1459,10 @@ static int __init mmc_omap_probe(struct platform_device *pdev)
 		goto err_ioremap;
 
 	host->iclk = clk_get(&pdev->dev, "ick");
-	if (IS_ERR(host->iclk))
+	if (IS_ERR(host->iclk)) {
+		ret = PTR_ERR(host->iclk);
 		goto err_free_mmc_host;
+	}
 	clk_enable(host->iclk);
 
 	host->fclk = clk_get(&pdev->dev, "fck");
@@ -1500,10 +1502,8 @@ err_free_irq:
 err_free_fclk:
 	clk_put(host->fclk);
 err_free_iclk:
-	if (host->iclk != NULL) {
-		clk_disable(host->iclk);
-		clk_put(host->iclk);
-	}
+	clk_disable(host->iclk);
+	clk_put(host->iclk);
 err_free_mmc_host:
 	iounmap(host->virt_base);
 err_ioremap:

Re: [PATCH] mmci-omap: remove bogus check for host->iclk

[Tony Lindgren]

* Ladislav.Michl@seznam.cz <Ladislav.Michl@seznam.cz> [091021 03:52]:
> Remove check for host->iclk being NULL from error path since we already know
> it is non-null and use return value from clk_get.
> 
> Signed-off-by: Ladislav Michl <ladis@linux-mips.org>

This too to the mmc list. Might not go in as a fix though.

Acked-by: Tony Lindgren <tony@atomide.com>

> 
> diff --git a/drivers/mmc/host/omap.c b/drivers/mmc/host/omap.c
> index 5d773b8..c6d7e8e 100644
> --- a/drivers/mmc/host/omap.c
> +++ b/drivers/mmc/host/omap.c
> @@ -1459,8 +1459,10 @@ static int __init mmc_omap_probe(struct platform_device *pdev)
>  		goto err_ioremap;
>  
>  	host->iclk = clk_get(&pdev->dev, "ick");
> -	if (IS_ERR(host->iclk))
> +	if (IS_ERR(host->iclk)) {
> +		ret = PTR_ERR(host->iclk);
>  		goto err_free_mmc_host;
> +	}
>  	clk_enable(host->iclk);
>  
>  	host->fclk = clk_get(&pdev->dev, "fck");
> @@ -1500,10 +1502,8 @@ err_free_irq:
>  err_free_fclk:
>  	clk_put(host->fclk);
>  err_free_iclk:
> -	if (host->iclk != NULL) {
> -		clk_disable(host->iclk);
> -		clk_put(host->iclk);
> -	}
> +	clk_disable(host->iclk);
> +	clk_put(host->iclk);
>  err_free_mmc_host:
>  	iounmap(host->virt_base);
>  err_ioremap:
> --
> To unsubscribe from this list: send the line "unsubscribe linux-omap" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html