diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2016-07-04 15:14:08 +0200 |
|---|---|---|
| committer | Vinod Koul <vinod.koul@intel.com> | 2016-07-06 19:09:43 +0200 |
| commit | 184f337e6d859c20e0d3c6954980cbb744e014fb (patch) | |
| tree | 69fafe1099b5dd8217b01b2c26bfda1fa179fe1b /drivers/dma/qcom/bam_dma.c | |
| parent | dmaengine: bcm2835: fix 64-bit warning (diff) | |
| download | linux-184f337e6d859c20e0d3c6954980cbb744e014fb.tar.xz linux-184f337e6d859c20e0d3c6954980cbb744e014fb.zip | |
dmaengine: qcom-bam-dma: add __maybe_unused annotations for PM
The bam_dma driver gained runtime PM support, but that causes build
warnings whenever CONFIG_PM is disabled:
drivers/dma/qcom/bam_dma.c:1324:12: error: 'bam_dma_runtime_resume' defined but not used [-Werror=unused-function]
static int bam_dma_runtime_resume(struct device *dev)
^~~~~~~~~~~~~~~~~~~~~~
drivers/dma/qcom/bam_dma.c:1315:12: error: 'bam_dma_runtime_suspend' defined but not used [-Werror=unused-function]
static int bam_dma_runtime_suspend(struct device *dev)
This removes the incomplete #ifdef guard and instead marks all
four PM functions as __maybe_unused, which avoids this kind of
warning.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Fixes: 7d2545599f5b ("dmaengine: qcom-bam-dma: Add pm_runtime support")
Signed-off-by: Vinod Koul <vinod.koul@intel.com>
Diffstat (limited to 'drivers/dma/qcom/bam_dma.c')
| -rw-r--r-- | drivers/dma/qcom/bam_dma.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/drivers/dma/qcom/bam_dma.c b/drivers/dma/qcom/bam_dma.c index 4754891742ad..03c4eb3fd314 100644 --- a/drivers/dma/qcom/bam_dma.c +++ b/drivers/dma/qcom/bam_dma.c @@ -1312,7 +1312,7 @@ static int bam_dma_remove(struct platform_device *pdev) return 0; } -static int bam_dma_runtime_suspend(struct device *dev) +static int __maybe_unused bam_dma_runtime_suspend(struct device *dev) { struct bam_device *bdev = dev_get_drvdata(dev); @@ -1321,7 +1321,7 @@ static int bam_dma_runtime_suspend(struct device *dev) return 0; } -static int bam_dma_runtime_resume(struct device *dev) +static int __maybe_unused bam_dma_runtime_resume(struct device *dev) { struct bam_device *bdev = dev_get_drvdata(dev); int ret; @@ -1334,8 +1334,8 @@ static int bam_dma_runtime_resume(struct device *dev) return 0; } -#ifdef CONFIG_PM_SLEEP -static int bam_dma_suspend(struct device *dev) + +static int __maybe_unused bam_dma_suspend(struct device *dev) { struct bam_device *bdev = dev_get_drvdata(dev); @@ -1346,7 +1346,7 @@ static int bam_dma_suspend(struct device *dev) return 0; } -static int bam_dma_resume(struct device *dev) +static int __maybe_unused bam_dma_resume(struct device *dev) { struct bam_device *bdev = dev_get_drvdata(dev); int ret; @@ -1359,7 +1359,6 @@ static int bam_dma_resume(struct device *dev) return 0; } -#endif static const struct dev_pm_ops bam_dma_pm_ops = { SET_LATE_SYSTEM_SLEEP_PM_OPS(bam_dma_suspend, bam_dma_resume) |