On Tue, Dec 16, 2014 at 11:40:01AM +0200, Andy Shevchenko wrote: > In case of the PCI driver we will get a warning: > dw_dmac_pci 0000:00:18.0: Unbalanced pm_runtime_enable! > dw_dmac_pci 0000:00:18.0: DesignWare DMA Controller, 8 channels > > This happens due to pm_runtime_enable() call from the driver when PM runtime is > enabled by core. > > This patch moves that call to the platform driver where it might make sense. Hmmm, sorry but it is not clear to me how moving it from core to platform helps solve the problem. Also this make more sense in core as it can be common acorss various devices -- ~Vinod > > Fixes: bb32baf76e56 (dmaengine: dw: enable runtime PM) > Signed-off-by: Andy Shevchenko <andriy.shevchenko@xxxxxxxxxxxxxxx> > --- > Vinod, this is a material for v3.19-rc1. Could you, please, review and apply? > > drivers/dma/dw/core.c | 2 -- > drivers/dma/dw/platform.c | 5 +++++ > 2 files changed, 5 insertions(+), 2 deletions(-) > > diff --git a/drivers/dma/dw/core.c b/drivers/dma/dw/core.c > index bbae202..dcf19f0 100644 > --- a/drivers/dma/dw/core.c > +++ b/drivers/dma/dw/core.c > @@ -1569,7 +1569,6 @@ int dw_dma_probe(struct dw_dma_chip *chip, struct dw_dma_platform_data *pdata) > dw->type = chip->type; > chip->dw = dw; > > - pm_runtime_enable(chip->dev); > pm_runtime_get_sync(chip->dev); > > dw_params = dma_read_byaddr(chip->regs, DW_PARAMS); > @@ -1768,7 +1767,6 @@ int dw_dma_remove(struct dw_dma_chip *chip) > } > > pm_runtime_put_sync_suspend(chip->dev); > - pm_runtime_disable(chip->dev); > return 0; > } > EXPORT_SYMBOL_GPL(dw_dma_remove); > diff --git a/drivers/dma/dw/platform.c b/drivers/dma/dw/platform.c > index 42036dd..7edc99f 100644 > --- a/drivers/dma/dw/platform.c > +++ b/drivers/dma/dw/platform.c > @@ -15,6 +15,7 @@ > #include <linux/module.h> > #include <linux/device.h> > #include <linux/clk.h> > +#include <linux/pm_runtime.h> > #include <linux/platform_device.h> > #include <linux/dmaengine.h> > #include <linux/dma-mapping.h> > @@ -187,6 +188,8 @@ static int dw_probe(struct platform_device *pdev) > if (err) > return err; > > + pm_runtime_enable(&pdev->dev); > + > err = dw_dma_probe(chip, pdata); > if (err) > goto err_dw_dma_probe; > @@ -207,6 +210,7 @@ static int dw_probe(struct platform_device *pdev) > return 0; > > err_dw_dma_probe: > + pm_runtime_disable(&pdev->dev); > clk_disable_unprepare(chip->clk); > return err; > } > @@ -219,6 +223,7 @@ static int dw_remove(struct platform_device *pdev) > of_dma_controller_free(pdev->dev.of_node); > > dw_dma_remove(chip); > + pm_runtime_disable(&pdev->dev); > clk_disable_unprepare(chip->clk); > > return 0; > -- > 2.1.3 > -- -- To unsubscribe from this list: send the line "unsubscribe dmaengine" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
