From patchwork Thu Mar  1 08:04:39 2012
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: ata/pata_arasan_cf: Move arasan_cf_pm_ops out of #ifdef, #endif macros
Date: Wed, 29 Feb 2012 22:04:39 -0000
From: Viresh KUMAR <viresh.kumar@st.com>
X-Patchwork-Id: 143947
Message-Id: <427196876874fef7e956b10d035d06eed5895743.1330588911.git.viresh.kumar@st.com>
To: <jgarzik@pobox.com>
Cc: <linux-ide@vger.kernel.org>, <spear-devel@list.st.com>,
 <viresh.linux@gmail.com>, Viresh Kumar <viresh.kumar@st.com>

#ifdef, #endif is not required in definition/usage of arasan_cf_pm_ops. So, move
this definition and its usage outside of them.

Signed-off-by: Viresh Kumar <viresh.kumar@st.com>

---
drivers/ata/pata_arasan_cf.c |    4 +---
 1 files changed, 1 insertions(+), 3 deletions(-)

diff --git a/drivers/ata/pata_arasan_cf.c b/drivers/ata/pata_arasan_cf.c
index fc2db2a..3239517 100644
--- a/drivers/ata/pata_arasan_cf.c
+++ b/drivers/ata/pata_arasan_cf.c
@@ -943,9 +943,9 @@ static int arasan_cf_resume(struct device *dev)
 
 	return 0;
 }
+#endif
 
 static SIMPLE_DEV_PM_OPS(arasan_cf_pm_ops, arasan_cf_suspend, arasan_cf_resume);
-#endif
 
 static struct platform_driver arasan_cf_driver = {
 	.probe		= arasan_cf_probe,
@@ -953,9 +953,7 @@ static struct platform_driver arasan_cf_driver = {
 	.driver		= {
 		.name	= DRIVER_NAME,
 		.owner	= THIS_MODULE,
-#ifdef CONFIG_PM
 		.pm	= &arasan_cf_pm_ops,
-#endif
 	},
 };