diff options
| author | Viresh Kumar <viresh.kumar@st.com> | 2012-02-23 15:03:53 +0530 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@redhat.com> | 2012-03-13 12:43:13 -0400 |
| commit | 40679b3ce9d993e33e026f402cbfffb35d2c4e3c (patch) | |
| tree | 779816302b60f3d71804a15cebbf2bd3a20d1237 /drivers/ata | |
| parent | 9716387311c790de381214c03e7f1b72b91a8189 (diff) | |
| download | op-kernel-dev-40679b3ce9d993e33e026f402cbfffb35d2c4e3c.zip op-kernel-dev-40679b3ce9d993e33e026f402cbfffb35d2c4e3c.tar.gz | |
ata/pata_arasan_cf: Add Hibernation support
This patch adds in Hibernation related callbacks. Also we don't really need to
free DMA channel on suspend.
Signed-off-by: Viresh Kumar <viresh.kumar@st.com>
Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
Diffstat (limited to 'drivers/ata')
| -rw-r--r-- | drivers/ata/pata_arasan_cf.c | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/drivers/ata/pata_arasan_cf.c b/drivers/ata/pata_arasan_cf.c index 048589f..fc2db2a 100644 --- a/drivers/ata/pata_arasan_cf.c +++ b/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 }, }; |
