diff options
| author | Uwe Kleine-König <u.kleine-koenig@pengutronix.de> | 2010-01-11 15:05:35 +0100 |
|---|---|---|
| committer | David Woodhouse <David.Woodhouse@intel.com> | 2010-02-25 11:28:06 +0000 |
| commit | b840bc11b5062803c204d8a9625a1a1c5812d6d6 (patch) | |
| tree | 8d082b6b3846b3dbaafa6f347957cf41137c8f20 | |
| parent | 17fabf156507ec0f688f1e58be02f38e04de0c6e (diff) | |
| download | kernel_samsung_espresso10-b840bc11b5062803c204d8a9625a1a1c5812d6d6.zip kernel_samsung_espresso10-b840bc11b5062803c204d8a9625a1a1c5812d6d6.tar.gz kernel_samsung_espresso10-b840bc11b5062803c204d8a9625a1a1c5812d6d6.tar.bz2 | |
mtd: mxc-nand: no need to check for validity of platform driver data
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>
| -rw-r--r-- | 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; } |