On Mon, 28 Aug 2023 12:16:49 +0200, Mark Brown wrote: > > The following changes since commit ab0b5072d184bdb013c9c2419cb21c593fa3802a: > > ASoC: cs35l56: Update ACPI HID and property (2023-08-17 18:36:28 +0100) > > are available in the Git repository at: > > https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git tags/asoc-v6.6 > > for you to fetch changes up to 199cd64140f222c66b68ebe288a3fcd0570e2e41: > > ASoC: soc-core.c: Do not error if a DAI link component is not found (2023-08-24 21:10:45 +0100) > > ---------------------------------------------------------------- > ASoC: Updates for v6.6 > > The rest of the updates for v6.6, some of the highlights include: > > - A big API cleanup from Morimoto-san, rationalising the places we put > functions. > - Lots of work on the SOF framework, AMD and Intel drivers, including a > lot of cleanup and new device support. > - Standardisation of the presentation of jacks from drivers. > - Provision of some generic sound card DT properties. > - Conversion oof more drivers to the maple tree register cache. > - New drivers for AMD Van Gogh, AWInic AW88261, Cirrus Logic cs42l43, > various Intel platforms, Mediatek MT7986, RealTek RT1017 and StarFive > JH7110. This resulted in the build error on x86 without CONFIG_OF. sound/soc/dwc/dwc-i2s.c:908:12: error: ʽjh7110_i2stx0_clk_cfgʼ defined but not used [-Werror=unused-function] static int jh7110_i2stx0_clk_cfg(struct i2s_clk_config_data *config) ^~~~~~~~~~~~~~~~~~~~~ sound/soc/dwc/dwc-i2s.c:891:12: error: ʽjh7110_i2srx_crg_initʼ defined but not used [-Werror=unused-function] static int jh7110_i2srx_crg_init(struct dw_i2s_dev *dev) ^~~~~~~~~~~~~~~~~~~~~ sound/soc/dwc/dwc-i2s.c:733:12: error: ʽjh7110_i2s_crg_master_initʼ defined but not used [-Werror=unused-function] static int jh7110_i2s_crg_master_init(struct dw_i2s_dev *dev) ^~~~~~~~~~~~~~~~~~~~~~~~~~ The fix below seems working. If you don't mind, I'll apply it (after submitting properly) on my sound.git tree. Let me know. We can put __maybe_unused instead, but there are many functions involved, so I took ifdef that need smaller changes. thanks, Takashi -- 8< -- From: Takashi Iwai <tiwai@xxxxxxx> Subject: [PATCH] ASoC: dwc: i2s: Fix unused functions A few newly added functions aren't built unless CONFIG_OF is set, which result in the build failure due to defined-but-not-used errors. Put "#ifdef CONFIG_OF" around those functions to suppress the build error. Fixes: 52ea7c0543f8 ("ASoC: dwc: i2s: Add StarFive JH7110 SoC support") Signed-off-by: Takashi Iwai <tiwai@xxxxxxx> --- sound/soc/dwc/dwc-i2s.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sound/soc/dwc/dwc-i2s.c b/sound/soc/dwc/dwc-i2s.c index 5ab1b3eb2d28..22c004179214 100644 --- a/sound/soc/dwc/dwc-i2s.c +++ b/sound/soc/dwc/dwc-i2s.c @@ -729,6 +729,7 @@ static int dw_configure_dai_by_dt(struct dw_i2s_dev *dev, } +#ifdef CONFIG_OF /* clocks initialization with master mode on JH7110 SoC */ static int jh7110_i2s_crg_master_init(struct dw_i2s_dev *dev) { @@ -912,6 +913,7 @@ static int jh7110_i2stx0_clk_cfg(struct i2s_clk_config_data *config) return clk_set_rate(dev->clk, bclk_rate); } +#endif /* CONFIG_OF */ static int dw_i2s_probe(struct platform_device *pdev) { -- 2.35.3
