From: akpm@linux-foundation.org <akpm@linux-foundation.org>
Date: Sun, 3 Feb 2008 20:56:03 +0000 (-0800)
Subject: [MTD] Fix maps/physmap.c compilation with CONFIG_PM
X-Git-Tag: v2.6.25-rc1~296^2~3
X-Git-Url: http://ftp.safe.ca/?a=commitdiff_plain;h=d5476689afd48e71395602698409e9f48cbba413;p=safe%2Fjmp%2Flinux-2.6

[MTD] Fix maps/physmap.c compilation with CONFIG_PM

Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: David Woodhouse <dwmw2@infradead.org>
---

diff --git a/drivers/mtd/maps/physmap.c b/drivers/mtd/maps/physmap.c
index 5a83ae7..f00e04e 100644
--- a/drivers/mtd/maps/physmap.c
+++ b/drivers/mtd/maps/physmap.c
@@ -204,7 +204,7 @@ static int physmap_flash_suspend(struct platform_device *dev, pm_message_t state
 
 	if (info)
 		for (i = 0; i < MAX_RESOURCES; i++)
-			ret |= info->mtd[i].suspend(info->mtd[i]);
+			ret |= info->mtd[i]->suspend(info->mtd[i]);
 
 	return ret;
 }
@@ -216,7 +216,7 @@ static int physmap_flash_resume(struct platform_device *dev)
 
 	if (info)
 		for (i = 0; i < MAX_RESOURCES; i++)
-			info->mtd[i].resume(info->mtd[i]);
+			info->mtd[i]->resume(info->mtd[i]);
 	return 0;
 }
 
@@ -226,19 +226,21 @@ static void physmap_flash_shutdown(struct platform_device *dev)
 	int i;
 
 	for (i = 0; i < MAX_RESOURCES; i++)
-		if (info && info->mtd[i].suspend(info->mtd[i]) == 0)
-			info->mtd[i].resume(info->mtd[i]);
+		if (info && info->mtd[i]->suspend(info->mtd[i]) == 0)
+			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,
-#ifdef CONFIG_PM
 	.suspend	= physmap_flash_suspend,
 	.resume		= physmap_flash_resume,
 	.shutdown	= physmap_flash_shutdown,
-#endif
 	.driver		= {
 		.name	= "physmap-flash",
 	},