mtd: introduce mtd_suspend interface

Signed-off-by: Artem Bityutskiy <artem.bityutskiy@linux.intel.com>
Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>

diff --git a/drivers/mtd/maps/physmap.c b/drivers/mtd/maps/physmap.c
index 1f749d58ae6f80f583fcba93d8c2c8e874124c07..b7f0cd14ae2b4fccf2c3c3fc85325b3a06695db9 100644 (file)
--- a/drivers/mtd/maps/physmap.c
+++ b/drivers/mtd/maps/physmap.c
@@ -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

diff --git a/drivers/mtd/maps/pxa2xx-flash.c b/drivers/mtd/maps/pxa2xx-flash.c
index 274e39914332fa8fa2015e42d530f342032dbf3b..9cb427320c04ffb319dc17eb9979874ee70a6133 100644 (file)
--- a/drivers/mtd/maps/pxa2xx-flash.c
+++ b/drivers/mtd/maps/pxa2xx-flash.c
@@ -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

diff --git a/drivers/mtd/maps/rbtx4939-flash.c b/drivers/mtd/maps/rbtx4939-flash.c
index bb7d2042affa0dd238be64a02886d1e63c88801b..5856aa2d99f72670247e7b11bd758c583c9970a5 100644 (file)
--- a/drivers/mtd/maps/rbtx4939-flash.c
+++ b/drivers/mtd/maps/rbtx4939-flash.c
@@ -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

diff --git a/drivers/mtd/maps/sa1100-flash.c b/drivers/mtd/maps/sa1100-flash.c
index ac3a290748cd431c72b96b7158bc0c358fafdbaa..20944f054867291776143f3a6a37965c771799b8 100644 (file)
--- a/drivers/mtd/maps/sa1100-flash.c
+++ b/drivers/mtd/maps/sa1100-flash.c
@@ -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

diff --git a/drivers/mtd/mtdconcat.c b/drivers/mtd/mtdconcat.c
index 272ebc01f95beb8fb011ae08114581fde8d2466f..36bb1c99925b3c48bba68184ceacccf1ac6ad754 100644 (file)
--- a/drivers/mtd/mtdconcat.c
+++ b/drivers/mtd/mtdconcat.c
@@ -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;

diff --git a/drivers/mtd/mtdcore.c b/drivers/mtd/mtdcore.c
index 4a2155748fa370383d038134e77fba2d6ac5991d..0db455d311484f4db617795e2cfdf4056625d11e 100644 (file)
--- a/drivers/mtd/mtdcore.c
+++ b/drivers/mtd/mtdcore.c
@@ -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;
 }

diff --git a/drivers/mtd/mtdpart.c b/drivers/mtd/mtdpart.c
index ad487fcd423fb015e1f936006f9856b588cb269d..c5e556a92641f64c9f6a26a8ad2906108d06274d 100644 (file)
--- a/drivers/mtd/mtdpart.c
+++ b/drivers/mtd/mtdpart.c
@@ -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)

diff --git a/drivers/mtd/nand/nomadik_nand.c b/drivers/mtd/nand/nomadik_nand.c
index 673dc6c68f9ad396cd3a436bca8c042219b3de4b..9461babdb3086a5bf2b9429b9646b77f921aaefe 100644 (file)
--- a/drivers/mtd/nand/nomadik_nand.c
+++ b/drivers/mtd/nand/nomadik_nand.c
@@ -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;
 }
 

diff --git a/drivers/mtd/nand/pxa3xx_nand.c b/drivers/mtd/nand/pxa3xx_nand.c
index 90d60169ae4064ce1b5635507bc2eba27944c314..7a028cf1206e3980a6f8584e3f5e1da22701b100 100644 (file)
--- a/drivers/mtd/nand/pxa3xx_nand.c
+++ b/drivers/mtd/nand/pxa3xx_nand.c
@@ -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;

diff --git a/include/linux/mtd/mtd.h b/include/linux/mtd/mtd.h
index 8b9901986c862fee751893ccfb42da3e0c203412..8e01bad44e2538369a839338be715ad235d19d99 100644 (file)
--- a/include/linux/mtd/mtd.h
+++ b/include/linux/mtd/mtd.h
@@ -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;