ASoC: SOF: Intel: Baytrail: fix 'defined but not used' warnings
Subsystems (3)
PATCH 1/1 ASoC: SOF: Intel: Baytrail: fix 'defined but not used' warnings
With the allmodconfig option, CONFIG_SND_SOC_SOF_BAYTRAIL is disabled due to mutual exclusion with the legacy driver. This generates 'defined by not used' warnings.
suspend/resume/remove are only supported for Baytrail for now, so move the code under the CONFIG_SND_SOC_SOF_BAYTRAIL checks.
--- sound/soc/sof/intel/byt.c | 72 +++++++++++++++++++-------------------- 1 file changed, 36 insertions(+), 36 deletions(-)
sound/soc/sof/intel/byt.c +36 -36
@@ -432,42 +432,6 @@ static void byt_set_mach_params(const struct snd_soc_acpi_mach *mach, mach_params->platform =dev_name (dev); } -static void byt_reset_dsp_disable_int (struct snd_sof_dev *sdev) -{ -/* Disable Interrupt from both sides */ -snd_sof_dsp_update_bits64 (sdev,BYT_DSP_BAR ,SHIM_IMRX ,0x3 ,0x3 ); -snd_sof_dsp_update_bits64 (sdev,BYT_DSP_BAR ,SHIM_IMRD ,0x3 ,0x3 ); - -/* Put DSP into reset, set reset vector */ -snd_sof_dsp_update_bits64 (sdev,BYT_DSP_BAR ,SHIM_CSR , -SHIM_BYT_CSR_RST |SHIM_BYT_CSR_VECTOR_SEL , -SHIM_BYT_CSR_RST |SHIM_BYT_CSR_VECTOR_SEL ); -} - -static int byt_suspend (struct snd_sof_dev *sdev,u32 target_state) -{ -byt_reset_dsp_disable_int (sdev); - -return 0 ; -} - -static int byt_resume (struct snd_sof_dev *sdev) -{ -/* enable BUSY and disable DONE Interrupt by default */ -snd_sof_dsp_update_bits64 (sdev,BYT_DSP_BAR ,SHIM_IMRX , -SHIM_IMRX_BUSY |SHIM_IMRX_DONE , -SHIM_IMRX_DONE ); - -return 0 ; -} - -static int byt_remove (struct snd_sof_dev *sdev) -{ -byt_reset_dsp_disable_int (sdev); - -return 0 ; -} -/* Baytrail DAIs */ static struct snd_soc_dai_driver byt_dai[] = { {
@@ -695,6 +659,42 @@ EXPORT_SYMBOL_NS(tng_chip_info, SND_SOC_SOF_MERRIFIELD);#if IS_ENABLED (CONFIG_SND_SOC_SOF_BAYTRAIL ) +static void byt_reset_dsp_disable_int (struct snd_sof_dev *sdev) +{ +/* Disable Interrupt from both sides */ +snd_sof_dsp_update_bits64 (sdev,BYT_DSP_BAR ,SHIM_IMRX ,0x3 ,0x3 ); +snd_sof_dsp_update_bits64 (sdev,BYT_DSP_BAR ,SHIM_IMRD ,0x3 ,0x3 ); + +/* Put DSP into reset, set reset vector */ +snd_sof_dsp_update_bits64 (sdev,BYT_DSP_BAR ,SHIM_CSR , +SHIM_BYT_CSR_RST |SHIM_BYT_CSR_VECTOR_SEL , +SHIM_BYT_CSR_RST |SHIM_BYT_CSR_VECTOR_SEL ); +} + +static int byt_suspend (struct snd_sof_dev *sdev,u32 target_state) +{ +byt_reset_dsp_disable_int (sdev); + +return 0 ; +} + +static int byt_resume (struct snd_sof_dev *sdev) +{ +/* enable BUSY and disable DONE Interrupt by default */ +snd_sof_dsp_update_bits64 (sdev,BYT_DSP_BAR ,SHIM_IMRX , +SHIM_IMRX_BUSY |SHIM_IMRX_DONE , +SHIM_IMRX_DONE ); + +return 0 ; +} + +static int byt_remove (struct snd_sof_dev *sdev) +{ +byt_reset_dsp_disable_int (sdev); + +return 0 ; +} +static const struct snd_sof_debugfs_map cht_debugfs[] = { {"dmac0" ,BYT_DSP_BAR ,DMAC0_OFFSET ,DMAC_SIZE , SOF_DEBUGFS_ACCESS_ALWAYS},
Signature · 1 line
2.20.1
Mark Brown
maintainerQuoted 6 lines · Pierre-Louis Bossart
With the allmodconfig option,
CONFIG_SND_SOC_SOF_BAYTRAILis disabled due to mutual exclusion with the legacy driver. This generates 'defined by not used' warnings.suspend/resume/remove are only supported for Baytrail for now, so move the code under the
CONFIG_SND_SOC_SOF_BAYTRAILchecks.
Applied to
https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-next
Thanks!
[1/1] ASoC: SOF: Intel: Baytrail: fix 'defined but not used' warnings
commit: af89e7dac521f5e087b6b2706bb0623107f74c83
All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted.
You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed.
If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced.
Please add any relevant lists and maintainers to the CCs when replying to this mail.
Thanks,
Mark