Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 41515ca2 authored by Russell King - ARM Linux's avatar Russell King - ARM Linux Committed by David Woodhouse
Browse files

mtd: sa11x0: Remove shutdown handler 



Commit c4a9f88d ([MTD] [NOR] fix ctrl-alt-del can't reboot for
intel flash bug) interferes with this work-around, causing MTD to
issue this warning:

	Flash device refused suspend due to active operation (state 0)

The commit makes our work-around in the map driver unnecessary, so
let's remove it.

Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
Signed-off-by: default avatarArtem Bityutskiy <artem.bityutskiy@linux.intel.com>
Signed-off-by: default avatarDavid Woodhouse <David.Woodhouse@intel.com>
parent 495c47d7

drivers/mtd/maps/sa1100-flash.c

+0 −12
Original line number Diff line number Diff line
@@ -373,21 +373,9 @@ static int __exit sa1100_mtd_remove(struct platform_device *pdev) 
	return 0;

}



#ifdef CONFIG_PM

static void sa1100_mtd_shutdown(struct platform_device *dev)

{

	struct sa_info *info = platform_get_drvdata(dev);

	if (info && mtd_suspend(info->mtd) == 0)

		mtd_resume(info->mtd);

}

#else

#define sa1100_mtd_shutdown NULL

#endif



static struct platform_driver sa1100_mtd_driver = {

	.probe		= sa1100_mtd_probe,

	.remove		= __exit_p(sa1100_mtd_remove),

	.shutdown	= sa1100_mtd_shutdown,

	.driver		= {

		.name	= "sa1100-mtd",

		.owner	= THIS_MODULE,