Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[firefly-linux-kernel-4.4.55.git] / drivers / dma / sirf-dma.c

diff --git a/drivers/dma/sirf-dma.c b/drivers/dma/sirf-dma.c
index fbe291584e8ae8735a08980805944c5cdf34caf8..3492a5f91d31553219189628148947a6af6ca4eb 100644 (file)
--- a/drivers/dma/sirf-dma.c
+++ b/drivers/dma/sirf-dma.c
@@ -834,6 +834,7 @@ static int sirfsoc_dma_runtime_resume(struct device *dev)
        return 0;
 }
 
+#ifdef CONFIG_PM_SLEEP
 static int sirfsoc_dma_pm_suspend(struct device *dev)
 {
        struct sirfsoc_dma *sdma = dev_get_drvdata(dev);
@@ -915,6 +916,7 @@ static int sirfsoc_dma_pm_resume(struct device *dev)
 
        return 0;
 }
+#endif
 
 static const struct dev_pm_ops sirfsoc_dma_pm_ops = {
        SET_RUNTIME_PM_OPS(sirfsoc_dma_runtime_suspend, sirfsoc_dma_runtime_resume, NULL)
@@ -932,7 +934,6 @@ static struct platform_driver sirfsoc_dma_driver = {
        .remove         = sirfsoc_dma_remove,
        .driver = {
                .name = DRV_NAME,
-               .owner = THIS_MODULE,
                .pm = &sirfsoc_dma_pm_ops,
                .of_match_table = sirfsoc_dma_match,
        },