[PATCH] mxc-nand: no need to check for validity of platform drive data

[Sascha Hauer]

On Mon, Jan 11, 2010 at 03:05:35PM +0100, Uwe Kleine-König wrote:
> The probe function calls platform_set_drvdata with a valid pointer when
> the probe is successful.  As mxcnd_suspend and mxcnd_resume are only
> called on bound devices, platform_get_drvdata always returns non-NULL.
> 
> This fix isn't critical as the pointer is always valid so it doesn't
> matter if the compiler generated code for it or not.
> 
> Signed-off-by: Uwe Kleine-König <u.kleine-koenig at pengutronix.de>
> Reported-by: David Binderman <dcb314 at hotmail.com>
> Cc: David Woodhouse <dwmw2 at infradead.org>
> Cc: Sascha Hauer <s.hauer at pengutronix.de>
> Cc: Artem Bityutskiy <Artem.Bityutskiy at nokia.com>
> Cc: Vladimir Barinov <vova.barinov at gmail.com>

Acked-by: Sascha Hauer <s.hauer at pengutronix.de>

> ---
>  drivers/mtd/nand/mxc_nand.c |   17 +++++++----------
>  1 files changed, 7 insertions(+), 10 deletions(-)
> 
> diff --git a/drivers/mtd/nand/mxc_nand.c b/drivers/mtd/nand/mxc_nand.c
> index 45dec57..84f3635 100644
> --- a/drivers/mtd/nand/mxc_nand.c
> +++ b/drivers/mtd/nand/mxc_nand.c
> @@ -886,11 +886,10 @@ static int mxcnd_suspend(struct platform_device *pdev, pm_message_t state)
>  	int ret = 0;
>  
>  	DEBUG(MTD_DEBUG_LEVEL0, "MXC_ND : NAND suspend\n");
> -	if (mtd) {
> -		ret = mtd->suspend(mtd);
> -		/* Disable the NFC clock */
> -		clk_disable(host->clk);
> -	}
> +
> +	ret = mtd->suspend(mtd);
> +	/* Disable the NFC clock */
> +	clk_disable(host->clk);
>  
>  	return ret;
>  }
> @@ -904,11 +903,9 @@ static int mxcnd_resume(struct platform_device *pdev)
>  
>  	DEBUG(MTD_DEBUG_LEVEL0, "MXC_ND : NAND resume\n");
>  
> -	if (mtd) {
> -		/* Enable the NFC clock */
> -		clk_enable(host->clk);
> -		mtd->resume(mtd);
> -	}
> +	/* Enable the NFC clock */
> +	clk_enable(host->clk);
> +	mtd->resume(mtd);
>  
>  	return ret;
>  }
> -- 
> 1.6.5.2
> 
> 

-- 
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |