Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history 
yaml
---
r: 153767
b: refs/heads/master
c: ccd9385
h: refs/heads/master
i:
  153765: 02f8e19
  153763: ca30f16
  153759: 5064963
v: v3
  • Loading branch information
David Woodhouse authored and David Woodhouse committed May 26, 2009
1 parent 6cefbd5 commit 9b6acd5
Show file tree
Hide file tree
Showing 6 changed files with 1 addition and 114 deletions.
2 changes: 1 addition & 1 deletion [refs]
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 15bce40cb3133bcc07d548013df97e4653d363c1
refs/heads/master: ccd93854d44710adaa02cecf0ef5f24ab383dd20
40 changes: 0 additions & 40 deletions trunk/drivers/mtd/maps/physmap.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -195,42 +195,6 @@ static int physmap_flash_probe(struct platform_device *dev)
}

#ifdef CONFIG_PM
static int physmap_flash_suspend(struct platform_device *dev, pm_message_t state)
{
struct physmap_flash_info *info = platform_get_drvdata(dev);
int ret = 0;
int i;

for (i = 0; i < MAX_RESOURCES && info->mtd[i]; i++)
if (info->mtd[i]->suspend) {
ret = info->mtd[i]->suspend(info->mtd[i]);
if (ret)
goto fail;
}

return 0;
fail:
for (--i; i >= 0; --i)
if (info->mtd[i]->suspend) {
BUG_ON(!info->mtd[i]->resume);
info->mtd[i]->resume(info->mtd[i]);
}

return ret;
}

static int physmap_flash_resume(struct platform_device *dev)
{
struct physmap_flash_info *info = platform_get_drvdata(dev);
int i;

for (i = 0; i < MAX_RESOURCES && info->mtd[i]; i++)
if (info->mtd[i]->resume)
info->mtd[i]->resume(info->mtd[i]);

return 0;
}

static void physmap_flash_shutdown(struct platform_device *dev)
{
struct physmap_flash_info *info = platform_get_drvdata(dev);
Expand All @@ -242,16 +206,12 @@ static void physmap_flash_shutdown(struct platform_device *dev)
info->mtd[i]->resume(info->mtd[i]);
}
#else
#define physmap_flash_suspend NULL
#define physmap_flash_resume NULL
#define physmap_flash_shutdown NULL
#endif

static struct platform_driver physmap_flash_driver = {
.probe = physmap_flash_probe,
.remove = physmap_flash_remove,
.suspend = physmap_flash_suspend,
.resume = physmap_flash_resume,
.shutdown = physmap_flash_shutdown,
.driver = {
.name = "physmap-flash",
Expand Down
22 changes: 0 additions & 22 deletions trunk/drivers/mtd/maps/pxa2xx-flash.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -140,24 +140,6 @@ static int __devexit pxa2xx_flash_remove(struct platform_device *dev)
}

#ifdef CONFIG_PM
static int pxa2xx_flash_suspend(struct platform_device *dev, pm_message_t state)
{
struct pxa2xx_flash_info *info = platform_get_drvdata(dev);
int ret = 0;

if (info->mtd && info->mtd->suspend)
ret = info->mtd->suspend(info->mtd);
return ret;
}

static int pxa2xx_flash_resume(struct platform_device *dev)
{
struct pxa2xx_flash_info *info = platform_get_drvdata(dev);

if (info->mtd && info->mtd->resume)
info->mtd->resume(info->mtd);
return 0;
}
static void pxa2xx_flash_shutdown(struct platform_device *dev)
{
struct pxa2xx_flash_info *info = platform_get_drvdata(dev);
Expand All @@ -166,8 +148,6 @@ static void pxa2xx_flash_shutdown(struct platform_device *dev)
info->mtd->resume(info->mtd);
}
#else
#define pxa2xx_flash_suspend NULL
#define pxa2xx_flash_resume NULL
#define pxa2xx_flash_shutdown NULL
#endif

Expand All @@ -178,8 +158,6 @@ static struct platform_driver pxa2xx_flash_driver = {
},
.probe = pxa2xx_flash_probe,
.remove = __devexit_p(pxa2xx_flash_remove),
.suspend = pxa2xx_flash_suspend,
.resume = pxa2xx_flash_resume,
.shutdown = pxa2xx_flash_shutdown,
};

Expand Down
23 changes: 0 additions & 23 deletions trunk/drivers/mtd/maps/rbtx4939-flash.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -145,25 +145,6 @@ static int rbtx4939_flash_probe(struct platform_device *dev)
}

#ifdef CONFIG_PM
static int rbtx4939_flash_suspend(struct platform_device *dev,
pm_message_t state)
{
struct rbtx4939_flash_info *info = platform_get_drvdata(dev);

if (info->mtd->suspend)
return info->mtd->suspend(info->mtd);
return 0;
}

static int rbtx4939_flash_resume(struct platform_device *dev)
{
struct rbtx4939_flash_info *info = platform_get_drvdata(dev);

if (info->mtd->resume)
info->mtd->resume(info->mtd);
return 0;
}

static void rbtx4939_flash_shutdown(struct platform_device *dev)
{
struct rbtx4939_flash_info *info = platform_get_drvdata(dev);
Expand All @@ -173,16 +154,12 @@ static void rbtx4939_flash_shutdown(struct platform_device *dev)
info->mtd->resume(info->mtd);
}
#else
#define rbtx4939_flash_suspend NULL
#define rbtx4939_flash_resume NULL
#define rbtx4939_flash_shutdown NULL
#endif

static struct platform_driver rbtx4939_flash_driver = {
.probe = rbtx4939_flash_probe,
.remove = rbtx4939_flash_remove,
.suspend = rbtx4939_flash_suspend,
.resume = rbtx4939_flash_resume,
.shutdown = rbtx4939_flash_shutdown,
.driver = {
.name = "rbtx4939-flash",
Expand Down
23 changes: 0 additions & 23 deletions trunk/drivers/mtd/maps/sa1100-flash.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -415,42 +415,19 @@ static int __exit sa1100_mtd_remove(struct platform_device *pdev)
}

#ifdef CONFIG_PM
static int sa1100_mtd_suspend(struct platform_device *dev, pm_message_t state)
{
struct sa_info *info = platform_get_drvdata(dev);
int ret = 0;

if (info)
ret = info->mtd->suspend(info->mtd);

return ret;
}

static int sa1100_mtd_resume(struct platform_device *dev)
{
struct sa_info *info = platform_get_drvdata(dev);
if (info)
info->mtd->resume(info->mtd);
return 0;
}

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)
info->mtd->resume(info->mtd);
}
#else
#define sa1100_mtd_suspend NULL
#define sa1100_mtd_resume NULL
#define sa1100_mtd_shutdown NULL
#endif

static struct platform_driver sa1100_mtd_driver = {
.probe = sa1100_mtd_probe,
.remove = __exit_p(sa1100_mtd_remove),
.suspend = sa1100_mtd_suspend,
.resume = sa1100_mtd_resume,
.shutdown = sa1100_mtd_shutdown,
.driver = {
.name = "sa1100-mtd",
Expand Down
5 changes: 0 additions & 5 deletions trunk/drivers/mtd/nand/mxc_nand.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1015,8 +1015,6 @@ static int mxcnd_suspend(struct platform_device *pdev, pm_message_t state)
int ret = 0;

DEBUG(MTD_DEBUG_LEVEL0, "MXC_ND : NAND suspend\n");
if (info)
ret = info->suspend(info);

/* Disable the NFC clock */
clk_disable(nfc_clk); /* FIXME */
Expand All @@ -1033,9 +1031,6 @@ static int mxcnd_resume(struct platform_device *pdev)
/* Enable the NFC clock */
clk_enable(nfc_clk); /* FIXME */

if (info)
info->resume(info);

return ret;
}

Expand Down

0 comments on commit 9b6acd5

Please sign in to comment.