dmaengine: dw: always export dw_dma_{en,dis}able

Instead of conditional exporing of dw_dma_suspend() / dw_dma_resume() let's
export dw_dma_disable() / dw_dma_enable(). Since dw_dma_shutdown() repeats
dw_dma_disable() we may safely remove it at all.

Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: Vinod Koul <vinod.koul@intel.com>

diff --git a/drivers/dma/dw/core.c b/drivers/dma/dw/core.c
index e94de0045aaf6d6fbae3e1941583132f38c96d6f..48126380e036bb111eb8fb3ee8afb6c637f05421 100644 (file)
--- a/drivers/dma/dw/core.c
+++ b/drivers/dma/dw/core.c
@@ -1687,35 +1687,23 @@ int dw_dma_remove(struct dw_dma_chip *chip)
 }
 EXPORT_SYMBOL_GPL(dw_dma_remove);
 
-void dw_dma_shutdown(struct dw_dma_chip *chip)
-{
-       struct dw_dma *dw = chip->dw;
-
-       dw_dma_off(dw);
-}
-EXPORT_SYMBOL_GPL(dw_dma_shutdown);
-
-#ifdef CONFIG_PM_SLEEP
-
-int dw_dma_suspend(struct dw_dma_chip *chip)
+int dw_dma_disable(struct dw_dma_chip *chip)
 {
        struct dw_dma *dw = chip->dw;
 
        dw_dma_off(dw);
        return 0;
 }
-EXPORT_SYMBOL_GPL(dw_dma_suspend);
+EXPORT_SYMBOL_GPL(dw_dma_disable);
 
-int dw_dma_resume(struct dw_dma_chip *chip)
+int dw_dma_enable(struct dw_dma_chip *chip)
 {
        struct dw_dma *dw = chip->dw;
 
        dw_dma_on(dw);
        return 0;
 }
-EXPORT_SYMBOL_GPL(dw_dma_resume);
-
-#endif /* CONFIG_PM_SLEEP */
+EXPORT_SYMBOL_GPL(dw_dma_enable);
 
 MODULE_LICENSE("GPL v2");
 MODULE_DESCRIPTION("Synopsys DesignWare DMA Controller core driver");

diff --git a/drivers/dma/dw/internal.h b/drivers/dma/dw/internal.h
index 9a886e3c31d313782982f347c5367bc7de0fa5fc..c55c3e0bf1fe02008b9819a260b2557b1f32dcab 100644 (file)
--- a/drivers/dma/dw/internal.h
+++ b/drivers/dma/dw/internal.h
@@ -38,14 +38,8 @@ struct dw_dma_chip {
 int dw_dma_probe(struct dw_dma_chip *chip, struct dw_dma_platform_data *pdata);
 int dw_dma_remove(struct dw_dma_chip *chip);
 
-void dw_dma_shutdown(struct dw_dma_chip *chip);
-
-#ifdef CONFIG_PM_SLEEP
-
-int dw_dma_suspend(struct dw_dma_chip *chip);
-int dw_dma_resume(struct dw_dma_chip *chip);
-
-#endif /* CONFIG_PM_SLEEP */
+int dw_dma_disable(struct dw_dma_chip *chip);
+int dw_dma_enable(struct dw_dma_chip *chip);
 
 extern bool dw_dma_filter(struct dma_chan *chan, void *param);
 

diff --git a/drivers/dma/dw/pci.c b/drivers/dma/dw/pci.c
index 9c88828426895e0cee0eba551d1955e50f30b5c3..b144706b3d857443945f58a2d0d3fb23a98e74cf 100644 (file)
--- a/drivers/dma/dw/pci.c
+++ b/drivers/dma/dw/pci.c
@@ -82,7 +82,7 @@ static int dw_pci_suspend_late(struct device *dev)
        struct pci_dev *pci = to_pci_dev(dev);
        struct dw_dma_chip *chip = pci_get_drvdata(pci);
 
-       return dw_dma_suspend(chip);
+       return dw_dma_disable(chip);
 };
 
 static int dw_pci_resume_early(struct device *dev)
@@ -90,7 +90,7 @@ static int dw_pci_resume_early(struct device *dev)
        struct pci_dev *pci = to_pci_dev(dev);
        struct dw_dma_chip *chip = pci_get_drvdata(pci);
 
-       return dw_dma_resume(chip);
+       return dw_dma_enable(chip);
 };
 
 #endif /* CONFIG_PM_SLEEP */

diff --git a/drivers/dma/dw/platform.c b/drivers/dma/dw/platform.c
index d50077e481871a487fc21970a3c26106e80f2fef..a630161473a4fa69c2586a257949d7f0956d4db7 100644 (file)
--- a/drivers/dma/dw/platform.c
+++ b/drivers/dma/dw/platform.c
@@ -226,7 +226,7 @@ static void dw_shutdown(struct platform_device *pdev)
 {
        struct dw_dma_chip *chip = platform_get_drvdata(pdev);
 
-       dw_dma_shutdown(chip);
+       dw_dma_disable(chip);
        clk_disable_unprepare(chip->clk);
 }
 
@@ -253,7 +253,7 @@ static int dw_suspend_late(struct device *dev)
        struct platform_device *pdev = to_platform_device(dev);
        struct dw_dma_chip *chip = platform_get_drvdata(pdev);
 
-       dw_dma_suspend(chip);
+       dw_dma_disable(chip);
        clk_disable_unprepare(chip->clk);
 
        return 0;
@@ -265,7 +265,7 @@ static int dw_resume_early(struct device *dev)
        struct dw_dma_chip *chip = platform_get_drvdata(pdev);
 
        clk_prepare_enable(chip->clk);
-       return dw_dma_resume(chip);
+       return dw_dma_enable(chip);
 }
 
 #endif /* CONFIG_PM_SLEEP */
@@ -277,7 +277,7 @@ static const struct dev_pm_ops dw_dev_pm_ops = {
 static struct platform_driver dw_driver = {
        .probe          = dw_probe,
        .remove         = dw_remove,
-       .shutdown       = dw_shutdown,
+       .shutdown       = dw_shutdown,
        .driver = {
                .name   = "dw_dmac",
                .pm     = &dw_dev_pm_ops,