Skip to content

Commit

Permalink
ASoC: fsl_easrc: mark PM functions __maybe_unused
Browse files Browse the repository at this point in the history
ifdefs are hard, and in this driver the suspend/resume functions are
the only callers of some other helpers that trigger a harmless warning
when CONFIG_PM is disabled:

sound/soc/fsl/fsl_easrc.c:1807:12: warning: 'fsl_easrc_get_firmware' defined but not used [-Wunused-function]
 1807 | static int fsl_easrc_get_firmware(struct fsl_asrc *easrc)
      |            ^~~~~~~~~~~~~~~~~~~~~~
sound/soc/fsl/fsl_easrc.c:303:12: warning: 'fsl_easrc_resampler_config' defined but not used [-Wunused-function]
  303 | static int fsl_easrc_resampler_config(struct fsl_asrc *easrc)
      |            ^~~~~~~~~~~~~~~~~~~~~~~~~~

Remove the #ifdef and just mark the callers as __maybe_unused to
suppress the warnings altogether.

Fixes: 955ac62 ("ASoC: fsl_easrc: Add EASRC ASoC CPU DAI drivers")
Signed-off-by: Arnd Bergmann <[email protected]>
Acked-by: Nicolin Chen <[email protected]>
Link: https://lore.kernel.org/r/[email protected]
Signed-off-by: Mark Brown <[email protected]>
  • Loading branch information
arndb authored and broonie committed Apr 29, 2020
1 parent da33574 commit 087e390
Showing 1 changed file with 2 additions and 4 deletions.
6 changes: 2 additions & 4 deletions sound/soc/fsl/fsl_easrc.c
Original file line number Diff line number Diff line change
Expand Up @@ -1997,8 +1997,7 @@ static int fsl_easrc_remove(struct platform_device *pdev)
return 0;
}

#ifdef CONFIG_PM
static int fsl_easrc_runtime_suspend(struct device *dev)
static __maybe_unused int fsl_easrc_runtime_suspend(struct device *dev)
{
struct fsl_asrc *easrc = dev_get_drvdata(dev);
struct fsl_easrc_priv *easrc_priv = easrc->private;
Expand All @@ -2015,7 +2014,7 @@ static int fsl_easrc_runtime_suspend(struct device *dev)
return 0;
}

static int fsl_easrc_runtime_resume(struct device *dev)
static __maybe_unused int fsl_easrc_runtime_resume(struct device *dev)
{
struct fsl_asrc *easrc = dev_get_drvdata(dev);
struct fsl_easrc_priv *easrc_priv = easrc->private;
Expand Down Expand Up @@ -2094,7 +2093,6 @@ static int fsl_easrc_runtime_resume(struct device *dev)
clk_disable_unprepare(easrc->mem_clk);
return ret;
}
#endif /* CONFIG_PM */

static const struct dev_pm_ops fsl_easrc_pm_ops = {
SET_RUNTIME_PM_OPS(fsl_easrc_runtime_suspend,
Expand Down

0 comments on commit 087e390

Please sign in to comment.