Commit 3fe4bae8 authored by Artem Bityutskiy's avatar Artem Bityutskiy Committed by David Woodhouse

mtd: introduce mtd_suspend interface

Signed-off-by: default avatarArtem Bityutskiy <artem.bityutskiy@linux.intel.com>
Signed-off-by: default avatarDavid Woodhouse <David.Woodhouse@intel.com>
parent e95e9786
...@@ -191,7 +191,7 @@ static void physmap_flash_shutdown(struct platform_device *dev) ...@@ -191,7 +191,7 @@ static void physmap_flash_shutdown(struct platform_device *dev)
for (i = 0; i < MAX_RESOURCES && info->mtd[i]; i++) for (i = 0; i < MAX_RESOURCES && info->mtd[i]; i++)
if (info->mtd[i]->suspend && info->mtd[i]->resume) if (info->mtd[i]->suspend && info->mtd[i]->resume)
if (info->mtd[i]->suspend(info->mtd[i]) == 0) if (mtd_suspend(info->mtd[i]) == 0)
info->mtd[i]->resume(info->mtd[i]); info->mtd[i]->resume(info->mtd[i]);
} }
#else #else
......
...@@ -125,7 +125,7 @@ static void pxa2xx_flash_shutdown(struct platform_device *dev) ...@@ -125,7 +125,7 @@ static void pxa2xx_flash_shutdown(struct platform_device *dev)
{ {
struct pxa2xx_flash_info *info = platform_get_drvdata(dev); struct pxa2xx_flash_info *info = platform_get_drvdata(dev);
if (info && info->mtd->suspend(info->mtd) == 0) if (info && mtd_suspend(info->mtd) == 0)
info->mtd->resume(info->mtd); info->mtd->resume(info->mtd);
} }
#else #else
......
...@@ -120,7 +120,7 @@ static void rbtx4939_flash_shutdown(struct platform_device *dev) ...@@ -120,7 +120,7 @@ static void rbtx4939_flash_shutdown(struct platform_device *dev)
struct rbtx4939_flash_info *info = platform_get_drvdata(dev); struct rbtx4939_flash_info *info = platform_get_drvdata(dev);
if (info->mtd->suspend && info->mtd->resume) if (info->mtd->suspend && info->mtd->resume)
if (info->mtd->suspend(info->mtd) == 0) if (mtd_suspend(info->mtd) == 0)
info->mtd->resume(info->mtd); info->mtd->resume(info->mtd);
} }
#else #else
......
...@@ -377,7 +377,7 @@ static int __exit sa1100_mtd_remove(struct platform_device *pdev) ...@@ -377,7 +377,7 @@ static int __exit sa1100_mtd_remove(struct platform_device *pdev)
static void sa1100_mtd_shutdown(struct platform_device *dev) static void sa1100_mtd_shutdown(struct platform_device *dev)
{ {
struct sa_info *info = platform_get_drvdata(dev); struct sa_info *info = platform_get_drvdata(dev);
if (info && info->mtd->suspend(info->mtd) == 0) if (info && mtd_suspend(info->mtd) == 0)
info->mtd->resume(info->mtd); info->mtd->resume(info->mtd);
} }
#else #else
......
...@@ -631,7 +631,7 @@ static int concat_suspend(struct mtd_info *mtd) ...@@ -631,7 +631,7 @@ static int concat_suspend(struct mtd_info *mtd)
for (i = 0; i < concat->num_subdev; i++) { for (i = 0; i < concat->num_subdev; i++) {
struct mtd_info *subdev = concat->subdev[i]; struct mtd_info *subdev = concat->subdev[i];
if ((rc = subdev->suspend(subdev)) < 0) if ((rc = mtd_suspend(subdev)) < 0)
return rc; return rc;
} }
return rc; return rc;
......
...@@ -119,7 +119,7 @@ static int mtd_cls_suspend(struct device *dev, pm_message_t state) ...@@ -119,7 +119,7 @@ static int mtd_cls_suspend(struct device *dev, pm_message_t state)
struct mtd_info *mtd = dev_to_mtd(dev); struct mtd_info *mtd = dev_to_mtd(dev);
if (mtd && mtd->suspend) if (mtd && mtd->suspend)
return mtd->suspend(mtd); return mtd_suspend(mtd);
else else
return 0; return 0;
} }
......
...@@ -307,7 +307,7 @@ static void part_sync(struct mtd_info *mtd) ...@@ -307,7 +307,7 @@ static void part_sync(struct mtd_info *mtd)
static int part_suspend(struct mtd_info *mtd) static int part_suspend(struct mtd_info *mtd)
{ {
struct mtd_part *part = PART(mtd); struct mtd_part *part = PART(mtd);
return part->master->suspend(part->master); return mtd_suspend(part->master);
} }
static void part_resume(struct mtd_info *mtd) static void part_resume(struct mtd_info *mtd)
......
...@@ -201,7 +201,7 @@ static int nomadik_nand_suspend(struct device *dev) ...@@ -201,7 +201,7 @@ static int nomadik_nand_suspend(struct device *dev)
struct nomadik_nand_host *host = dev_get_drvdata(dev); struct nomadik_nand_host *host = dev_get_drvdata(dev);
int ret = 0; int ret = 0;
if (host) if (host)
ret = host->mtd.suspend(&host->mtd); ret = mtd_suspend(&host->mtd);
return ret; return ret;
} }
......
...@@ -1258,7 +1258,7 @@ static int pxa3xx_nand_suspend(struct platform_device *pdev, pm_message_t state) ...@@ -1258,7 +1258,7 @@ static int pxa3xx_nand_suspend(struct platform_device *pdev, pm_message_t state)
for (cs = 0; cs < pdata->num_cs; cs++) { for (cs = 0; cs < pdata->num_cs; cs++) {
mtd = info->host[cs]->mtd; mtd = info->host[cs]->mtd;
mtd->suspend(mtd); mtd_suspend(mtd);
} }
return 0; return 0;
......
...@@ -210,6 +210,7 @@ struct mtd_info { ...@@ -210,6 +210,7 @@ struct mtd_info {
int (*lock) (struct mtd_info *mtd, loff_t ofs, uint64_t len); int (*lock) (struct mtd_info *mtd, loff_t ofs, uint64_t len);
int (*unlock) (struct mtd_info *mtd, loff_t ofs, uint64_t len); int (*unlock) (struct mtd_info *mtd, loff_t ofs, uint64_t len);
int (*is_locked) (struct mtd_info *mtd, loff_t ofs, uint64_t len); int (*is_locked) (struct mtd_info *mtd, loff_t ofs, uint64_t len);
int (*suspend) (struct mtd_info *mtd);
/* Backing device capabilities for this device /* Backing device capabilities for this device
* - provides mmap capabilities * - provides mmap capabilities
...@@ -217,7 +218,6 @@ struct mtd_info { ...@@ -217,7 +218,6 @@ struct mtd_info {
struct backing_dev_info *backing_dev_info; struct backing_dev_info *backing_dev_info;
/* Power Management functions */ /* Power Management functions */
int (*suspend) (struct mtd_info *mtd);
void (*resume) (struct mtd_info *mtd); void (*resume) (struct mtd_info *mtd);
/* Bad block management functions */ /* Bad block management functions */
...@@ -398,6 +398,11 @@ static inline int mtd_is_locked(struct mtd_info *mtd, loff_t ofs, uint64_t len) ...@@ -398,6 +398,11 @@ static inline int mtd_is_locked(struct mtd_info *mtd, loff_t ofs, uint64_t len)
return mtd->is_locked(mtd, ofs, len); return mtd->is_locked(mtd, ofs, len);
} }
static inline int mtd_suspend(struct mtd_info *mtd)
{
return mtd->suspend(mtd);
}
static inline struct mtd_info *dev_to_mtd(struct device *dev) static inline struct mtd_info *dev_to_mtd(struct device *dev)
{ {
return dev ? dev_get_drvdata(dev) : NULL; return dev ? dev_get_drvdata(dev) : NULL;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment