Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2540f74b authored by Andy Shevchenko's avatar Andy Shevchenko Committed by Vinod Koul
Browse files

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: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: default avatarVinod Koul <vinod.koul@intel.com>
parent 7a83c045

drivers/dma/dw/core.c

+4 −16
Original line number Diff line number Diff line
@@ -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");

drivers/dma/dw/internal.h

+2 −8
Original line number Diff line number Diff line
@@ -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);

drivers/dma/dw/pci.c

+2 −2
Original line number Diff line number Diff line
@@ -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 */

drivers/dma/dw/platform.c

+4 −4
Original line number Diff line number Diff line
@@ -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 */