Skip to content

Commit

Permalink
mtd: mxc_nand: dont call suspend and resume explicitly
Browse files Browse the repository at this point in the history
The mtd layer is responsible to call mtd->{suspend,resume}.  Doing it
again in the driver is wrong and results in a warning:

	nand_resume called for a chip which is not in suspended state

at resume time.  Removing the calls from the resume and suspend
functions makes them empty allowing them to be deleted completely.

Signed-off-by: Eric Bénard <eric@eukrea.com>
Acked-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
  • Loading branch information
Eric Bénard authored and David Woodhouse committed Aug 4, 2010
1 parent c9fb677 commit 04dd0d3
Showing 1 changed file with 1 addition and 42 deletions.
43 changes: 1 addition & 42 deletions drivers/mtd/nand/mxc_nand.c
Original file line number Diff line number Diff line change
Expand Up @@ -871,52 +871,11 @@ static int __devexit mxcnd_remove(struct platform_device *pdev)
return 0;
}

#ifdef CONFIG_PM
static int mxcnd_suspend(struct platform_device *pdev, pm_message_t state)
{
struct mtd_info *mtd = platform_get_drvdata(pdev);
struct nand_chip *nand_chip = mtd->priv;
struct mxc_nand_host *host = nand_chip->priv;
int ret = 0;

DEBUG(MTD_DEBUG_LEVEL0, "MXC_ND : NAND suspend\n");

ret = mtd->suspend(mtd);

/*
* nand_suspend locks the device for exclusive access, so
* the clock must already be off.
*/
BUG_ON(!ret && host->clk_act);

return ret;
}

static int mxcnd_resume(struct platform_device *pdev)
{
struct mtd_info *mtd = platform_get_drvdata(pdev);
struct nand_chip *nand_chip = mtd->priv;
int ret = 0;

DEBUG(MTD_DEBUG_LEVEL0, "MXC_ND : NAND resume\n");

mtd->resume(mtd);

return ret;
}

#else
# define mxcnd_suspend NULL
# define mxcnd_resume NULL
#endif /* CONFIG_PM */

static struct platform_driver mxcnd_driver = {
.driver = {
.name = DRIVER_NAME,
},
},
.remove = __devexit_p(mxcnd_remove),
.suspend = mxcnd_suspend,
.resume = mxcnd_resume,
};

static int __init mxc_nd_init(void)
Expand Down

0 comments on commit 04dd0d3

Please sign in to comment.