[PATCH 1/2] MTD: sa11x0: Remove shutdown handler

[PATCH 1/2] MTD: sa11x0: Remove shutdown handler

[Russell King - ARM Linux]

Commit c4a9f88daf ([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: Russell King <rmk+kernel@arm.linux.org.uk>
---
 drivers/mtd/maps/sa1100-flash.c |   12 ------------
 1 files changed, 0 insertions(+), 12 deletions(-)

diff --git a/drivers/mtd/maps/sa1100-flash.c b/drivers/mtd/maps/sa1100-flash.c
index 5028219..c735569 100644
--- a/drivers/mtd/maps/sa1100-flash.c
+++ b/drivers/mtd/maps/sa1100-flash.c
@@ -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,
-- 
1.7.4.4

[PATCH 1/2] MTD: sa11x0: Remove shutdown handler

[Artem Bityutskiy]

On Fri, 2012-01-20 at 10:42 +0000, Russell King - ARM Linux wrote:
> Commit c4a9f88daf ([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: Russell King <rmk+kernel@arm.linux.org.uk>

Pushed both to l2-mtd tree, thanks!

-- 
Best Regards,
Artem Bityutskiy
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 836 bytes
Desc: This is a digitally signed message part
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20120127/fce11d65/attachment-0001.sig>