]> git.karo-electronics.de Git - linux-beck.git/commitdiff
mtd: mxc-nand: no need to check for validity of platform driver data
authorUwe Kleine-König <u.kleine-koenig@pengutronix.de>
Mon, 11 Jan 2010 14:05:35 +0000 (15:05 +0100)
committerDavid Woodhouse <David.Woodhouse@intel.com>
Thu, 25 Feb 2010 11:28:06 +0000 (11:28 +0000)
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@pengutronix.de>
Reported-by: David Binderman <dcb314@hotmail.com>
Signed-off-by: Artem Bityutskiy <Artem.Bityutskiy@nokia.com>
Acked-by: Sascha Hauer <s.hauer@pengutronix.de>
Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
drivers/mtd/nand/mxc_nand.c

index 45dec5770da0b93ea560bc812b482d7e34951a56..84f363571c2453d520fab7efdb1dfbf733b9c373 100644 (file)
@@ -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;
 }