redonkable
/
alistair23-linux
1
0
Fork 0
Code Releases Activity

mtd: introduce mtd_suspend interface 

Signed-off-by: Artem Bityutskiy <artem.bityutskiy@linux.intel.com>
Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
hifive-unleashed-5.1
Artem Bityutskiy 2011-12-23 19:25:16 +02:00 committed by David Woodhouse
parent e95e978645
commit 3fe4bae884
10 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/mtd/maps/physmap.c
View File

@ -191,7 +191,7 @@ static void physmap_flash_shutdown(struct platform_device *dev)
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]) == 0)
if (mtd_suspend(info->mtd[i]) == 0)
info->mtd[i]->resume(info->mtd[i]);
}
#else

2
drivers/mtd/maps/pxa2xx-flash.c
View File

@ -125,7 +125,7 @@ static void pxa2xx_flash_shutdown(struct platform_device *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);
}
#else

2
drivers/mtd/maps/rbtx4939-flash.c
View File

@ -120,7 +120,7 @@ static void rbtx4939_flash_shutdown(struct platform_device *dev)
struct rbtx4939_flash_info *info = platform_get_drvdata(dev);
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);
}
#else

2
drivers/mtd/maps/sa1100-flash.c
View File

@ -377,7 +377,7 @@ static int __exit sa1100_mtd_remove(struct platform_device *pdev)
static void sa1100_mtd_shutdown(struct platform_device *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);
}
#else

2
drivers/mtd/mtdconcat.c
View File

@ -631,7 +631,7 @@ static int concat_suspend(struct mtd_info *mtd)
for (i = 0; i < concat->num_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;

2
drivers/mtd/mtdcore.c
View File

@ -119,7 +119,7 @@ static int mtd_cls_suspend(struct device *dev, pm_message_t state)
struct mtd_info *mtd = dev_to_mtd(dev);
if (mtd && mtd->suspend)
return mtd->suspend(mtd);
return mtd_suspend(mtd);
else
return 0;
}

2
drivers/mtd/mtdpart.c
View File

@ -307,7 +307,7 @@ static void part_sync(struct mtd_info *mtd)
static int part_suspend(struct mtd_info *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)

2
drivers/mtd/nand/nomadik_nand.c
View File

@ -201,7 +201,7 @@ static int nomadik_nand_suspend(struct device *dev)
struct nomadik_nand_host *host = dev_get_drvdata(dev);
int ret = 0;
if (host)
ret = host->mtd.suspend(&host->mtd);
ret = mtd_suspend(&host->mtd);
return ret;
}

2
drivers/mtd/nand/pxa3xx_nand.c
View File

@ -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++) {
mtd = info->host[cs]->mtd;
mtd->suspend(mtd);
mtd_suspend(mtd);
}
return 0;

7
include/linux/mtd/mtd.h
View File

@ -210,6 +210,7 @@ struct mtd_info {
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 (*is_locked) (struct mtd_info *mtd, loff_t ofs, uint64_t len);
int (*suspend) (struct mtd_info *mtd);
/* Backing device capabilities for this device
* - provides mmap capabilities
@ -217,7 +218,6 @@ struct mtd_info {
struct backing_dev_info *backing_dev_info;
/* Power Management functions */
int (*suspend) (struct mtd_info *mtd);
void (*resume) (struct mtd_info *mtd);
/* Bad block management functions */
@ -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);
}
static inline int mtd_suspend(struct mtd_info *mtd)
{
return mtd->suspend(mtd);
}
static inline struct mtd_info *dev_to_mtd(struct device *dev)
{
return dev ? dev_get_drvdata(dev) : NULL;