[PATCH Resend] ata/pata_arasan_cf: Add Hibernation support
From: Viresh Kumar <hidden>
Date: 2012-02-27 05:45:33
Subsystem:
libata pata arasan compact flash controller, libata subsystem (serial and parallel ata drivers), the rest · Maintainers:
Viresh Kumar, Damien Le Moal, Niklas Cassel, Linus Torvalds
This patch adds in Hibernation related callbacks. Also we don't really need to free DMA channel on suspend. Signed-off-by: Viresh Kumar <redacted> --- Changes in Resend: - Moved arasan_cf_pm_ops outside of #ifdef, #endif drivers/ata/pata_arasan_cf.c | 16 +++++----------- 1 files changed, 5 insertions(+), 11 deletions(-)
diff --git a/drivers/ata/pata_arasan_cf.c b/drivers/ata/pata_arasan_cf.c
index 048589f..3239517 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); }
@@ -944,22 +943,17 @@ 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, -}; #endif +static SIMPLE_DEV_PM_OPS(arasan_cf_pm_ops, arasan_cf_suspend, arasan_cf_resume); + static struct platform_driver arasan_cf_driver = { .probe = arasan_cf_probe, .remove = __devexit_p(arasan_cf_remove), .driver = { .name = DRIVER_NAME, .owner = THIS_MODULE, -#ifdef CONFIG_PM - .pm = &arasan_cf_pm_ops, -#endif + .pm = &arasan_cf_pm_ops, }, };
--
1.7.8.110.g4cb5d