diff options
author | Artem Bityutskiy <artem.bityutskiy@linux.intel.com> | 2011-12-23 12:31:25 -0500 |
---|---|---|
committer | David Woodhouse <David.Woodhouse@intel.com> | 2012-01-09 13:25:46 -0500 |
commit | ead995f8d4da1e2f1ef40b0e5f4133fee38a3d3d (patch) | |
tree | 349a7f56a4cdc1220a96af3c59285d8e28e0836c /drivers | |
parent | 3fe4bae88460869a8e553397cd9057a4ee7ca341 (diff) |
mtd: introduce mtd_resume interface
Signed-off-by: Artem Bityutskiy <artem.bityutskiy@linux.intel.com>
Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/mtd/maps/physmap.c | 2 | ||||
-rw-r--r-- | drivers/mtd/maps/pxa2xx-flash.c | 2 | ||||
-rw-r--r-- | drivers/mtd/maps/rbtx4939-flash.c | 2 | ||||
-rw-r--r-- | drivers/mtd/maps/sa1100-flash.c | 2 | ||||
-rw-r--r-- | drivers/mtd/mtdconcat.c | 2 | ||||
-rw-r--r-- | drivers/mtd/mtdcore.c | 2 | ||||
-rw-r--r-- | drivers/mtd/mtdpart.c | 2 | ||||
-rw-r--r-- | drivers/mtd/nand/nomadik_nand.c | 2 | ||||
-rw-r--r-- | drivers/mtd/nand/pxa3xx_nand.c | 2 |
9 files changed, 9 insertions, 9 deletions
diff --git a/drivers/mtd/maps/physmap.c b/drivers/mtd/maps/physmap.c index b7f0cd14ae2b..d94cc62186c1 100644 --- a/drivers/mtd/maps/physmap.c +++ b/drivers/mtd/maps/physmap.c | |||
@@ -192,7 +192,7 @@ static void physmap_flash_shutdown(struct platform_device *dev) | |||
192 | for (i = 0; i < MAX_RESOURCES && info->mtd[i]; i++) | 192 | for (i = 0; i < MAX_RESOURCES && info->mtd[i]; i++) |
193 | if (info->mtd[i]->suspend && info->mtd[i]->resume) | 193 | if (info->mtd[i]->suspend && info->mtd[i]->resume) |
194 | if (mtd_suspend(info->mtd[i]) == 0) | 194 | if (mtd_suspend(info->mtd[i]) == 0) |
195 | info->mtd[i]->resume(info->mtd[i]); | 195 | mtd_resume(info->mtd[i]); |
196 | } | 196 | } |
197 | #else | 197 | #else |
198 | #define physmap_flash_shutdown NULL | 198 | #define physmap_flash_shutdown NULL |
diff --git a/drivers/mtd/maps/pxa2xx-flash.c b/drivers/mtd/maps/pxa2xx-flash.c index 9cb427320c04..436d121185b1 100644 --- a/drivers/mtd/maps/pxa2xx-flash.c +++ b/drivers/mtd/maps/pxa2xx-flash.c | |||
@@ -126,7 +126,7 @@ static void pxa2xx_flash_shutdown(struct platform_device *dev) | |||
126 | struct pxa2xx_flash_info *info = platform_get_drvdata(dev); | 126 | struct pxa2xx_flash_info *info = platform_get_drvdata(dev); |
127 | 127 | ||
128 | if (info && mtd_suspend(info->mtd) == 0) | 128 | if (info && mtd_suspend(info->mtd) == 0) |
129 | info->mtd->resume(info->mtd); | 129 | mtd_resume(info->mtd); |
130 | } | 130 | } |
131 | #else | 131 | #else |
132 | #define pxa2xx_flash_shutdown NULL | 132 | #define pxa2xx_flash_shutdown NULL |
diff --git a/drivers/mtd/maps/rbtx4939-flash.c b/drivers/mtd/maps/rbtx4939-flash.c index 5856aa2d99f7..717628312040 100644 --- a/drivers/mtd/maps/rbtx4939-flash.c +++ b/drivers/mtd/maps/rbtx4939-flash.c | |||
@@ -121,7 +121,7 @@ static void rbtx4939_flash_shutdown(struct platform_device *dev) | |||
121 | 121 | ||
122 | if (info->mtd->suspend && info->mtd->resume) | 122 | if (info->mtd->suspend && info->mtd->resume) |
123 | if (mtd_suspend(info->mtd) == 0) | 123 | if (mtd_suspend(info->mtd) == 0) |
124 | info->mtd->resume(info->mtd); | 124 | mtd_resume(info->mtd); |
125 | } | 125 | } |
126 | #else | 126 | #else |
127 | #define rbtx4939_flash_shutdown NULL | 127 | #define rbtx4939_flash_shutdown NULL |
diff --git a/drivers/mtd/maps/sa1100-flash.c b/drivers/mtd/maps/sa1100-flash.c index 20944f054867..502821997707 100644 --- a/drivers/mtd/maps/sa1100-flash.c +++ b/drivers/mtd/maps/sa1100-flash.c | |||
@@ -378,7 +378,7 @@ static void sa1100_mtd_shutdown(struct platform_device *dev) | |||
378 | { | 378 | { |
379 | struct sa_info *info = platform_get_drvdata(dev); | 379 | struct sa_info *info = platform_get_drvdata(dev); |
380 | if (info && mtd_suspend(info->mtd) == 0) | 380 | if (info && mtd_suspend(info->mtd) == 0) |
381 | info->mtd->resume(info->mtd); | 381 | mtd_resume(info->mtd); |
382 | } | 382 | } |
383 | #else | 383 | #else |
384 | #define sa1100_mtd_shutdown NULL | 384 | #define sa1100_mtd_shutdown NULL |
diff --git a/drivers/mtd/mtdconcat.c b/drivers/mtd/mtdconcat.c index 36bb1c99925b..4b7f825ce015 100644 --- a/drivers/mtd/mtdconcat.c +++ b/drivers/mtd/mtdconcat.c | |||
@@ -644,7 +644,7 @@ static void concat_resume(struct mtd_info *mtd) | |||
644 | 644 | ||
645 | for (i = 0; i < concat->num_subdev; i++) { | 645 | for (i = 0; i < concat->num_subdev; i++) { |
646 | struct mtd_info *subdev = concat->subdev[i]; | 646 | struct mtd_info *subdev = concat->subdev[i]; |
647 | subdev->resume(subdev); | 647 | mtd_resume(subdev); |
648 | } | 648 | } |
649 | } | 649 | } |
650 | 650 | ||
diff --git a/drivers/mtd/mtdcore.c b/drivers/mtd/mtdcore.c index 0db455d31148..376fbfdb09aa 100644 --- a/drivers/mtd/mtdcore.c +++ b/drivers/mtd/mtdcore.c | |||
@@ -129,7 +129,7 @@ static int mtd_cls_resume(struct device *dev) | |||
129 | struct mtd_info *mtd = dev_to_mtd(dev); | 129 | struct mtd_info *mtd = dev_to_mtd(dev); |
130 | 130 | ||
131 | if (mtd && mtd->resume) | 131 | if (mtd && mtd->resume) |
132 | mtd->resume(mtd); | 132 | mtd_resume(mtd); |
133 | return 0; | 133 | return 0; |
134 | } | 134 | } |
135 | 135 | ||
diff --git a/drivers/mtd/mtdpart.c b/drivers/mtd/mtdpart.c index c5e556a92641..8610750852ac 100644 --- a/drivers/mtd/mtdpart.c +++ b/drivers/mtd/mtdpart.c | |||
@@ -313,7 +313,7 @@ static int part_suspend(struct mtd_info *mtd) | |||
313 | static void part_resume(struct mtd_info *mtd) | 313 | static void part_resume(struct mtd_info *mtd) |
314 | { | 314 | { |
315 | struct mtd_part *part = PART(mtd); | 315 | struct mtd_part *part = PART(mtd); |
316 | part->master->resume(part->master); | 316 | mtd_resume(part->master); |
317 | } | 317 | } |
318 | 318 | ||
319 | static int part_block_isbad(struct mtd_info *mtd, loff_t ofs) | 319 | static int part_block_isbad(struct mtd_info *mtd, loff_t ofs) |
diff --git a/drivers/mtd/nand/nomadik_nand.c b/drivers/mtd/nand/nomadik_nand.c index 9461babdb308..a86aa812ca13 100644 --- a/drivers/mtd/nand/nomadik_nand.c +++ b/drivers/mtd/nand/nomadik_nand.c | |||
@@ -209,7 +209,7 @@ static int nomadik_nand_resume(struct device *dev) | |||
209 | { | 209 | { |
210 | struct nomadik_nand_host *host = dev_get_drvdata(dev); | 210 | struct nomadik_nand_host *host = dev_get_drvdata(dev); |
211 | if (host) | 211 | if (host) |
212 | host->mtd.resume(&host->mtd); | 212 | mtd_resume(&host->mtd); |
213 | return 0; | 213 | return 0; |
214 | } | 214 | } |
215 | 215 | ||
diff --git a/drivers/mtd/nand/pxa3xx_nand.c b/drivers/mtd/nand/pxa3xx_nand.c index 7a028cf1206e..8544d6bf50a0 100644 --- a/drivers/mtd/nand/pxa3xx_nand.c +++ b/drivers/mtd/nand/pxa3xx_nand.c | |||
@@ -1291,7 +1291,7 @@ static int pxa3xx_nand_resume(struct platform_device *pdev) | |||
1291 | nand_writel(info, NDSR, NDSR_MASK); | 1291 | nand_writel(info, NDSR, NDSR_MASK); |
1292 | for (cs = 0; cs < pdata->num_cs; cs++) { | 1292 | for (cs = 0; cs < pdata->num_cs; cs++) { |
1293 | mtd = info->host[cs]->mtd; | 1293 | mtd = info->host[cs]->mtd; |
1294 | mtd->resume(mtd); | 1294 | mtd_resume(mtd); |
1295 | } | 1295 | } |
1296 | 1296 | ||
1297 | return 0; | 1297 | return 0; |