From 3b8cde23955f1bb62161f977370e40a56b29444a Mon Sep 17 00:00:00 2001
From: Viresh Kumar <viresh.kumar@st.com>
Date: Thu, 23 Feb 2012 15:03:53 +0530
Subject: [PATCH] --- yaml --- r: 294047 b: refs/heads/master c:
 40679b3ce9d993e33e026f402cbfffb35d2c4e3c h: refs/heads/master i:   294045:
 1007871c69882649c0d9d14c49347e4eb86c1d67   294043:
 e243b308f9f97e0a80c42b407343cd72b574667b   294039:
 263f79369ae24d718d24c65134a3c303124fe1a8   294031:
 9308c4299c2cfa177914e3c862a13d527cccbfa0   294015:
 6c666e74385ab5920f66cdc525fc06046d5f7050 v: v3

---
 [refs]                             |  2 +-
 trunk/drivers/ata/pata_arasan_cf.c | 12 ++++--------
 2 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/[refs] b/[refs]
index a64639798697..d33c3abd0754 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9716387311c790de381214c03e7f1b72b91a8189
+refs/heads/master: 40679b3ce9d993e33e026f402cbfffb35d2c4e3c
diff --git a/trunk/drivers/ata/pata_arasan_cf.c b/trunk/drivers/ata/pata_arasan_cf.c
index 048589fad2ca..fc2db2a89a6b 100644
--- a/trunk/drivers/ata/pata_arasan_cf.c
+++ b/trunk/drivers/ata/pata_arasan_cf.c
@@ -925,11 +925,10 @@ static int arasan_cf_suspend(struct device *dev)
 	struct ata_host *host = dev_get_drvdata(dev);
 	struct arasan_cf_dev *acdev = host->ports[0]->private_data;
 
-	if (acdev->dma_chan) {
+	if (acdev->dma_chan)
 		acdev->dma_chan->device->device_control(acdev->dma_chan,
 				DMA_TERMINATE_ALL, 0);
-		dma_release_channel(acdev->dma_chan);
-	}
+
 	cf_exit(acdev);
 	return ata_host_suspend(host, PMSG_SUSPEND);
 }
@@ -945,10 +944,7 @@ static int arasan_cf_resume(struct device *dev)
 	return 0;
 }
 
-static const struct dev_pm_ops arasan_cf_pm_ops = {
-	.suspend	= arasan_cf_suspend,
-	.resume		= arasan_cf_resume,
-};
+static SIMPLE_DEV_PM_OPS(arasan_cf_pm_ops, arasan_cf_suspend, arasan_cf_resume);
 #endif
 
 static struct platform_driver arasan_cf_driver = {
@@ -958,7 +954,7 @@ static struct platform_driver arasan_cf_driver = {
 		.name	= DRIVER_NAME,
 		.owner	= THIS_MODULE,
 #ifdef CONFIG_PM
-		.pm		= &arasan_cf_pm_ops,
+		.pm	= &arasan_cf_pm_ops,
 #endif
 	},
 };