diff options
| author | Russell King - ARM Linux <linux@arm.linux.org.uk> | 2012-01-20 10:42:16 +0000 |
|---|---|---|
| committer | David Woodhouse <David.Woodhouse@intel.com> | 2012-03-27 00:15:01 +0100 |
| commit | 41515ca262d5b75220f48afd21214dbe3ccfef8c (patch) | |
| tree | 98a2057a7e688eaf8a9ac641a6a4dee4f9442848 /drivers/mtd/maps | |
| parent | 495c47d799d93ad688db9db170200eb71525ff45 (diff) | |
| download | linux-3.10-41515ca262d5b75220f48afd21214dbe3ccfef8c.tar.gz linux-3.10-41515ca262d5b75220f48afd21214dbe3ccfef8c.tar.bz2 linux-3.10-41515ca262d5b75220f48afd21214dbe3ccfef8c.zip | |
mtd: sa11x0: Remove shutdown handler
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>
Signed-off-by: Artem Bityutskiy <artem.bityutskiy@linux.intel.com>
Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
Diffstat (limited to 'drivers/mtd/maps')
| -rw-r--r-- | 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 50282199770..c7355692ea8 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, |