September 2018 - Alsa-devel - mailman.alsa-project.org

[alsa-devel] alsactl monitor spins at 100% cpu after unplugging USB headphones
by Thomas Gläßle 02 Oct '18

02 Oct '18

Hi, on both my desktop and laptop (archlinux), `alsactl monitor` beginns spinning at 100% cpu when I unplug my USB headset. This happens every time and can be reproduced as follows: - plug in USB headphones - start `alsactl monitor` - unplug headphones It happens only if the headphones are already plugged in when starting alsactl. The increased activity does not lead to spamming stdout or similar, alsactl continues to perform seemingly correct, i.e. reports when I change volume levels etc, but nothing apart from the ordinary. I'm sorry if this is not the right place to report this issue or if the problem is already, I couldn't find anything about it. Below is the output from alsa-info.sh: with headphones: http://www.alsa-project.org/db/?f=0dfc632e3adafb8bc78a182e0a225bcb13bea9fa after unplugging: http://www.alsa-project.org/db/?f=41dbf0735fdd7cd2416a6b4a602505715d25b44f Please let me know if you need further info. Best regards, Thomas

2 2

[alsa-devel] [PATCH linux-next 10/10] ASoC: rsnd: Add kctrl to configure dai's busif
by jiada_wang＠mentor.com 02 Oct '18

02 Oct '18

From: Jiada Wang <jiada_wang(a)mentor.com> ssi0, ssi1, ssi2, ssi3, ssi4 and ssi9 have busif0 to busif7, currently only busif0 is used by all ssi. But tdm split and tdm ex-split mode, which require busif1 to busif7. This patch adds kctrl in ssi for dai-link, to make it possible to configure the busif used by each dai-link. Also adds rsnd_dma_addr_update() interface to make it possible to update dma data address when there is change in condition of dai connection. Signed-off-by: Jiada Wang <jiada_wang(a)mentor.com> --- sound/soc/sh/rcar/dma.c | 32 ++++++++++++++++++++++++++++++++ sound/soc/sh/rcar/rsnd.h | 2 ++ sound/soc/sh/rcar/ssi.c | 31 ++++++++++++++++++++++++++++++- 3 files changed, 64 insertions(+), 1 deletion(-) diff --git a/sound/soc/sh/rcar/dma.c b/sound/soc/sh/rcar/dma.c index 6d1947515dc8..8c284fd73fc1 100644 --- a/sound/soc/sh/rcar/dma.c +++ b/sound/soc/sh/rcar/dma.c @@ -792,6 +792,38 @@ int rsnd_dma_attach(struct rsnd_dai_stream *io, struct rsnd_mod *mod, return rsnd_dai_connect(*dma_mod, io, (*dma_mod)->type); } +void rsnd_dma_addr_update(struct rsnd_dai_stream *io, + struct rsnd_mod *mod, + struct rsnd_mod *dma_mod) +{ + struct rsnd_mod *mod_from = NULL; + struct rsnd_mod *mod_to = NULL; + struct rsnd_priv *priv = rsnd_io_to_priv(io); + struct rsnd_dma_ctrl *dmac = rsnd_priv_to_dmac(priv); + struct device *dev = rsnd_priv_to_dev(priv); + int is_play = rsnd_io_is_play(io); + struct rsnd_dma *dma = rsnd_mod_to_dma(dma_mod); + + if (!dmac) + return; + + rsnd_dma_of_path(mod, io, is_play, &mod_from, &mod_to); + + dma->src_addr = rsnd_dma_addr(io, mod_from, is_play, 1); + dma->dst_addr = rsnd_dma_addr(io, mod_to, is_play, 0); + + if (mod_from && mod_to) { + struct rsnd_dmapp *dmapp = rsnd_dma_to_dmapp(dma); + + dmapp->chcr = rsnd_dmapp_get_chcr(io, mod_from, mod_to) | + PDMACHCR_DE; + } + + dev_dbg(dev, "%s[%d] %pad -> %pad\n", + rsnd_mod_name(mod), rsnd_mod_id(mod), + &dma->src_addr, &dma->dst_addr); +} + int rsnd_dma_probe(struct rsnd_priv *priv) { struct platform_device *pdev = rsnd_priv_to_pdev(priv); diff --git a/sound/soc/sh/rcar/rsnd.h b/sound/soc/sh/rcar/rsnd.h index 59b6d89d8edc..6c16d8403f7a 100644 --- a/sound/soc/sh/rcar/rsnd.h +++ b/sound/soc/sh/rcar/rsnd.h @@ -233,6 +233,8 @@ u32 rsnd_get_busif_shift(struct rsnd_dai_stream *io, struct rsnd_mod *mod); */ int rsnd_dma_attach(struct rsnd_dai_stream *io, struct rsnd_mod *mod, struct rsnd_mod **dma_mod); +void rsnd_dma_addr_update(struct rsnd_dai_stream *io, + struct rsnd_mod *mod, struct rsnd_mod *dma_mod); int rsnd_dma_probe(struct rsnd_priv *priv); struct dma_chan *rsnd_dma_request_channel(struct device_node *of_node, struct rsnd_mod *mod, char *name); diff --git a/sound/soc/sh/rcar/ssi.c b/sound/soc/sh/rcar/ssi.c index 4ac4b5b75ae2..b469db238697 100644 --- a/sound/soc/sh/rcar/ssi.c +++ b/sound/soc/sh/rcar/ssi.c @@ -160,6 +160,15 @@ int rsnd_ssi_get_busif(struct rsnd_dai_stream *io) return io->busif->val; } +static void rsnd_ssi_set_busif(struct rsnd_dai_stream *io, + struct rsnd_mod *mod) +{ + if (!rsnd_ssi_use_busif(io)) + return; + + rsnd_dma_addr_update(io, mod, io->dma); +} + static void rsnd_ssi_status_clear(struct rsnd_mod *mod) { rsnd_mod_write(mod, SSISR, 0); @@ -718,6 +727,10 @@ static int rsnd_ssi_pcm_new(struct rsnd_mod *mod, struct rsnd_dai_stream *io, struct snd_soc_pcm_runtime *rtd) { + int is_play = rsnd_io_is_play(io); + int id = rsnd_mod_id(mod); + int ret = 0; + /* * rsnd_rdai_is_clk_master() will be enabled after set_fmt, * and, pcm_new will be called after it. @@ -725,7 +738,23 @@ static int rsnd_ssi_pcm_new(struct rsnd_mod *mod, */ rsnd_ssi_parent_attach(mod, io); - return 0; + if (!rsnd_ssi_use_busif(io)) + return 0; + + if (rsnd_ssi_is_multi_slave(mod, io)) + return 0; + + /* SSI5 to SSI8 only have one BUSIF */ + if (id <= 4 || id == 9) + ret = rsnd_kctrl_new_s(mod, io, rtd, + is_play ? + "SSI Out BUSIF" : + "SSI In BUSIF", + rsnd_kctrl_accept_anytime, + rsnd_ssi_set_busif, + io->busif, 7); + + return ret; } static int rsnd_ssi_common_probe(struct rsnd_mod *mod, -- 2.17.0

3 2

[alsa-devel] [PATCH linux-next 09/10] ASoC: rsnd: add busif property to dai stream
by jiada_wang＠mentor.com 02 Oct '18

02 Oct '18

From: Jiada Wang <jiada_wang(a)mentor.com> SSI may use different busif for data transfer, this patch adds busif property to each dai stream, to indicate the busif used by playback/capture stream. Signed-off-by: Jiada Wang <jiada_wang(a)mentor.com> --- sound/soc/sh/rcar/core.c | 16 +++++++++++++++- sound/soc/sh/rcar/rsnd.h | 3 +++ sound/soc/sh/rcar/ssi.c | 5 ++++- 3 files changed, 22 insertions(+), 2 deletions(-) diff --git a/sound/soc/sh/rcar/core.c b/sound/soc/sh/rcar/core.c index 40d7dc4f7839..aee3132c72b9 100644 --- a/sound/soc/sh/rcar/core.c +++ b/sound/soc/sh/rcar/core.c @@ -560,6 +560,14 @@ struct rsnd_dai *rsnd_rdai_get(struct rsnd_priv *priv, int id) return priv->rdai + id; } +struct rsnd_kctrl_cfg_s *rsnd_busif_get(struct rsnd_priv *priv, int id) +{ + if ((id < 0) || (id >= 2 * rsnd_rdai_nr(priv))) + return NULL; + + return priv->busif + id; +} + static struct snd_soc_dai_driver *rsnd_daidrv_get(struct rsnd_priv *priv, int id) { @@ -1045,6 +1053,9 @@ static void __rsnd_dai_probe(struct rsnd_priv *priv, io_playback = &rdai->playback; io_capture = &rdai->capture; + io_playback->busif = rsnd_busif_get(priv, dai_i); + io_capture->busif = rsnd_busif_get(priv, rsnd_rdai_nr(priv) + dai_i); + snprintf(rdai->name, RSND_DAI_NAME_SIZE, "rsnd-dai.%d", dai_i); rdai->priv = priv; @@ -1108,6 +1119,7 @@ static int rsnd_dai_probe(struct rsnd_priv *priv) struct snd_soc_dai_driver *rdrv; struct device *dev = rsnd_priv_to_dev(priv); struct rsnd_dai *rdai; + struct rsnd_kctrl_cfg_s *busif; int nr; int is_graph; int dai_i; @@ -1123,12 +1135,14 @@ static int rsnd_dai_probe(struct rsnd_priv *priv) rdrv = devm_kcalloc(dev, nr, sizeof(*rdrv), GFP_KERNEL); rdai = devm_kcalloc(dev, nr, sizeof(*rdai), GFP_KERNEL); - if (!rdrv || !rdai) + busif = devm_kcalloc(dev, 2 * nr, sizeof(*busif), GFP_KERNEL); + if (!rdrv || !rdai || !busif) return -ENOMEM; priv->rdai_nr = nr; priv->daidrv = rdrv; priv->rdai = rdai; + priv->busif = busif; /* * parse all dai diff --git a/sound/soc/sh/rcar/rsnd.h b/sound/soc/sh/rcar/rsnd.h index 4464d1d0a042..59b6d89d8edc 100644 --- a/sound/soc/sh/rcar/rsnd.h +++ b/sound/soc/sh/rcar/rsnd.h @@ -456,6 +456,7 @@ struct rsnd_dai_stream { struct rsnd_mod *dma; struct rsnd_dai *rdai; struct device *dmac_dev; /* for IPMMU */ + struct rsnd_kctrl_cfg_s *busif; u32 parent_ssi_status; }; #define rsnd_io_to_mod(io, i) ((i) < RSND_MOD_MAX ? (io)->mod[(i)] : NULL) @@ -629,6 +630,8 @@ struct rsnd_priv { */ struct snd_soc_dai_driver *daidrv; struct rsnd_dai *rdai; + struct rsnd_kctrl_cfg_s *busif; + int rdai_nr; }; diff --git a/sound/soc/sh/rcar/ssi.c b/sound/soc/sh/rcar/ssi.c index 75a3d15084c2..4ac4b5b75ae2 100644 --- a/sound/soc/sh/rcar/ssi.c +++ b/sound/soc/sh/rcar/ssi.c @@ -154,7 +154,10 @@ int rsnd_ssi_use_busif(struct rsnd_dai_stream *io) int rsnd_ssi_get_busif(struct rsnd_dai_stream *io) { - return 0; /* BUSIF0 only for now */ + if (!rsnd_ssi_use_busif(io)) + return 0; + + return io->busif->val; } static void rsnd_ssi_status_clear(struct rsnd_mod *mod) -- 2.17.0

3 2

[alsa-devel] [PATCH linux-next 00/10] ASoC: rsnd: support to set different busif
by jiada_wang＠mentor.com 02 Oct '18

02 Oct '18

From: Jiada Wang <jiada_wang(a)mentor.com> Rcar audio DMA/SSIU already support to use different BUSIF to transfer data, but busif is fixed at 0. This patch set adds kctrl interface "SSI Out/In BUSIF", which enables to configure busif for each dai-stream used in transfer. device tree files are updated to use extended audio dmac register, and add dma request number for busif1 ~ busif7 Jiada Wang (10): ASoC: rsnd: ssi: Request dedicated dma channels for busif1 to 7 arm64: r8a7795: add dma request number for busif1 ~ busif7 arm64: r8a7796: add dma request number for busif1 ~ busif7 arm64: r8a774a1: add dma request number for busif1 ~ busif7 arm64: r8a7795: change to use extended audio dmac register arm64: r8a7796: change to use extended audio dmac register arm64: r8a774a1: change to use extended audio dmac register arm64: r8a77965: change to use extended audio dmac register ASoC: rsnd: add busif property to dai stream ASoC: rsnd: Add kctrl to configure dai's busif arch/arm64/boot/dts/renesas/r8a774a1.dtsi | 139 ++++++++++++++++++---- arch/arm64/boot/dts/renesas/r8a7795.dtsi | 132 +++++++++++++++++--- arch/arm64/boot/dts/renesas/r8a7796.dtsi | 138 +++++++++++++++++---- arch/arm64/boot/dts/renesas/r8a77965.dtsi | 2 +- sound/soc/sh/rcar/core.c | 16 ++- sound/soc/sh/rcar/dma.c | 32 +++++ sound/soc/sh/rcar/rsnd.h | 5 + sound/soc/sh/rcar/ssi.c | 56 +++++++-- 8 files changed, 451 insertions(+), 69 deletions(-) -- 2.17.0

3 6

[alsa-devel] i2s\pcm\spdif\slimbus
by Muni Sekhar 29 Sep '18

29 Sep '18

Hi All, Can someone share the links to i2s\pcm\spdif\slimbus bus specifications. -- Thanks, Sekhar

1 0

[alsa-devel] Fwd: Help with sound on Cherry Trail laptop with ES8316 sound chip
by Sundar Nagarajan 29 Sep '18

29 Sep '18

Hello, I have (separate) issues with two different Cherry Trail laptops that have the ES8316 chipset for sound. I already posted the following issues on Pierre Bossart's Intel UCM repository(https://github.com/plbossart/UCM): Issue 42: RDP Thinbook 1430 laptop (ES8316): Can't select between built-in speakers and headphone output (https://github.com/plbossart/UCM/issues/42) Pierre's input was as follows: The UCM file you are using gives the clue already: #Codec IC has only 1 analog out, switching SPK/HP is done externally, #probably by means of some analog switch controlled by gpio There is nothing we can do at the UCM level, this has to be handled at a lower level (i.e. the kernel) In addition, on a different laptop, I have a different problem with the ES3816 chipset. Issue 41: No sound on speakers on Chuwi Hi12 laptop - headphone sound works (es8316) (https://github.com/plbossart/UCM/issues/41) I reached out to Mark Brown, Daniel Drake and David Yang who were listed on the kernel.org commit for the ytcht_es8316.c driver (https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git/commit/…) and Mark suggested reaching out to you folks. What is the right place for me to post my issues to get your ideas and help? I have access to these machines, and I can compile kernels and perform testing, collect logs etc. Regards, Sundar ---------- Forwarded message --------- From: Mark Brown <broonie(a)kernel.org> Date: Thu, Sep 27, 2018 at 3:14 PM Subject: Re: Help with sound on Cherry Trail laptop with ES8316 sound chip To: Sundar Nagarajan <sun.nagarajan(a)gmail.com> Cc: Daniel Drake <drake(a)endlessm.com>, David Yang <yangxiaohua(a)everest-semi.com> On Wed, Sep 26, 2018 at 12:53:44PM -0700, Sundar Nagarajan wrote: > )I found your email from the kernel.org commit log for the > bytcht_es8316.c driver > (https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git/commit/…. > I have (separate) issues with two different Cherry Trail laptops that > have the ES8316 chipset. I posted the following issues on Pierre > Bossart's Intel UCM repository(https://github.com/plbossart/UCM): He's on sabbatical at the minute FWIW. > What is the right place for me to post my issues to get your ideas and help? You'd be best contacting the Intel maintainers about x86 specific issues: INTEL ASoC DRIVERS M: Pierre-Louis Bossart <pierre-louis.bossart(a)linux.intel.com> M: Liam Girdwood <liam.r.girdwood(a)linux.intel.com> M: Jie Yang <yang.jie(a)linux.intel.com> L: alsa-devel(a)alsa-project.org (moderated for non-subscribers) S: Supported F: sound/soc/intel/ That includes Pierre but also a few other people, hopefully at least one of them will be able to help or point you to someone who can. You should also copy in the alsa-devel list (alsa-devel(a)alsa-project.org) in case someone else can help and so people can google the discussion later, though that'll mean your e-mail address ends up in the archives so you might not be happy with that.

1 0

[alsa-devel] [PATCH v2] ASoC: soc-utils: Rename dummy_dma_ops to snd_dummy_dma_ops
by Matthias Kaehlcke 28 Sep '18

28 Sep '18

The symbols 'dummy_dma_ops' is declared with different data types by sound/soc/soc-utils.c and arch/arm64/include/asm/dma-mapping.h. This leads to conflicts when soc-utils.c (indirectly) includes dma-mapping.h: sound/soc/soc-utils.c:282:33: error: conflicting types for 'dummy_dma_ops' static const struct snd_pcm_ops dummy_dma_ops = { ^ ... arch/arm64/include/asm/dma-mapping.h:27:33: note: previous declaration of 'dummy_dma_ops' was here extern const struct dma_map_ops dummy_dma_ops; ^ Rename the symbol in soc-utils.c to 'snd_dummy_dma_ops' to avoid the conflict. Signed-off-by: Matthias Kaehlcke <mka(a)chromium.org> --- Changes in v2: - use 'snd_dummy_dma_ops' instead of 'snd_dummy_ops' --- sound/soc/soc-utils.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sound/soc/soc-utils.c b/sound/soc/soc-utils.c index e0c93496c0cd..e3b9dd634c6d 100644 --- a/sound/soc/soc-utils.c +++ b/sound/soc/soc-utils.c @@ -273,13 +273,13 @@ static int dummy_dma_open(struct snd_pcm_substream *substream) return 0; } -static const struct snd_pcm_ops dummy_dma_ops = { +static const struct snd_pcm_ops snd_dummy_dma_ops = { .open = dummy_dma_open, .ioctl = snd_pcm_lib_ioctl, }; static const struct snd_soc_component_driver dummy_platform = { - .ops = &dummy_dma_ops, + .ops = &snd_dummy_dma_ops, }; static const struct snd_soc_component_driver dummy_codec = { -- 2.19.0.605.g01d371f741-goog

2 1

[alsa-devel] [PATCH] ASoC: pxa: avoid AC97_BUS build warning
by Arnd Bergmann 28 Sep '18

28 Sep '18

Selecting AC97_BUS_NEW from SND_PXA2XX_SOC_AC97 leads to a Kconfig warning if any other driver selects AC97_BUS: WARNING: unmet direct dependencies detected for AC97_BUS_COMPAT Depends on [n]: SOUND [=y] && !UML && SND [=y] && AC97_BUS_NEW [=y] && !AC97_BUS [=y] Selected by [y]: - SND_SOC_WM9713 [=y] && SOUND [=y] && !UML && SND [=y] && SND_SOC [=y] && AC97_BUS_NEW [=y] I don't know if that combination is supposed to work. Assuming it is not, this adds a dependency on all users for PXA to avoids the combination. Fixes: 1c8bc7b3de5e ("ASoC: pxa: switch to new ac97 bus support") Signed-off-by: Arnd Bergmann <arnd(a)arndb.de> --- sound/soc/pxa/Kconfig | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/sound/soc/pxa/Kconfig b/sound/soc/pxa/Kconfig index 29f577e6dfc0..943b44de1464 100644 --- a/sound/soc/pxa/Kconfig +++ b/sound/soc/pxa/Kconfig @@ -79,6 +79,7 @@ config SND_PXA2XX_SOC_TOSA tristate "SoC AC97 Audio support for Tosa" depends on SND_PXA2XX_SOC && MACH_TOSA depends on MFD_TC6393XB + depends on !AC97_BUS select SND_PXA2XX_SOC_AC97 select SND_SOC_WM9712 help @@ -88,6 +89,7 @@ config SND_PXA2XX_SOC_TOSA config SND_PXA2XX_SOC_E740 tristate "SoC AC97 Audio support for e740" depends on SND_PXA2XX_SOC && MACH_E740 + depends on !AC97_BUS select SND_SOC_WM9705 select SND_PXA2XX_SOC_AC97 help @@ -97,6 +99,7 @@ config SND_PXA2XX_SOC_E740 config SND_PXA2XX_SOC_E750 tristate "SoC AC97 Audio support for e750" depends on SND_PXA2XX_SOC && MACH_E750 + depends on !AC97_BUS select SND_SOC_WM9705 select SND_PXA2XX_SOC_AC97 help @@ -106,6 +109,7 @@ config SND_PXA2XX_SOC_E750 config SND_PXA2XX_SOC_E800 tristate "SoC AC97 Audio support for e800" depends on SND_PXA2XX_SOC && MACH_E800 + depends on !AC97_BUS select SND_SOC_WM9712 select SND_PXA2XX_SOC_AC97 help @@ -116,6 +120,7 @@ config SND_PXA2XX_SOC_EM_X270 tristate "SoC Audio support for CompuLab EM-x270, eXeda and CM-X300" depends on SND_PXA2XX_SOC && (MACH_EM_X270 || MACH_EXEDA || \ MACH_CM_X300) + depends on !AC97_BUS select SND_PXA2XX_SOC_AC97 select SND_SOC_WM9712 help @@ -126,6 +131,7 @@ config SND_PXA2XX_SOC_PALM27X bool "SoC Audio support for Palm T|X, T5, E2 and LifeDrive" depends on SND_PXA2XX_SOC && (MACH_PALMLD || MACH_PALMTX || \ MACH_PALMT5 || MACH_PALMTE2) + depends on !AC97_BUS select SND_PXA2XX_SOC_AC97 select SND_SOC_WM9712 help @@ -155,6 +161,7 @@ config SND_SOC_TTC_DKB config SND_SOC_ZYLONITE tristate "SoC Audio support for Marvell Zylonite" depends on SND_PXA2XX_SOC && MACH_ZYLONITE + depends on !AC97_BUS select SND_PXA2XX_SOC_AC97 select SND_PXA_SOC_SSP select SND_SOC_WM9713 @@ -194,6 +201,7 @@ config SND_PXA2XX_SOC_MAGICIAN config SND_PXA2XX_SOC_MIOA701 tristate "SoC Audio support for MIO A701" depends on SND_PXA2XX_SOC && MACH_MIOA701 + depends on !AC97_BUS select SND_PXA2XX_SOC_AC97 select SND_SOC_WM9713 help -- 2.18.0

2 1

[alsa-devel] [PATCH] ASoC: atmel: add SND_SOC_I2C_AND_SPI dependency
by Arnd Bergmann 28 Sep '18

28 Sep '18

Selecting SND_SOC_WM8731 is only allowed when all its dependencies are already there: WARNING: unmet direct dependencies detected for SND_SOC_WM8731 Depends on [m]: SOUND [=y] && !UML && SND [=y] && SND_SOC [=y] && SND_SOC_I2C_AND_SPI [=m] Selected by [y]: - SND_SOC_MIKROE_PROTO [=y] && SOUND [=y] && !UML && SND [=y] && SND_SOC [=y] && SND_ATMEL_SOC [=y] && OF [=y] Selected by [m]: - SND_AT91_SOC_SAM9X5_WM8731 [=m] && SOUND [=y] && !UML && SND [=y] && SND_SOC [=y] && SND_ATMEL_SOC [=y] && (ARCH_AT91 [=y] || COMPILE_TEST [=y]) && ATMEL_SSC [=y] && SND_SOC_I2C_AND_SPI [=m] - SND_SOC_ALL_CODECS [=m] && SOUND [=y] && !UML && SND [=y] && SND_SOC [=y] && COMPILE_TEST [=y] && SND_SOC_I2C_AND_SPI [=m] Fixes: a45f8853a5f9 ("ASoC: Add driver for PROTO Audio CODEC (with a WM8731)") Signed-off-by: Arnd Bergmann <arnd(a)arndb.de> --- sound/soc/atmel/Kconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/sound/soc/atmel/Kconfig b/sound/soc/atmel/Kconfig index 81a0712d4f14..64f86f0b87e5 100644 --- a/sound/soc/atmel/Kconfig +++ b/sound/soc/atmel/Kconfig @@ -101,6 +101,7 @@ config SND_ATMEL_SOC_I2S config SND_SOC_MIKROE_PROTO tristate "Support for Mikroe-PROTO board" depends on OF + depends on SND_SOC_I2C_AND_SPI select SND_SOC_WM8731 help Say Y or M if you want to add support for MikroElektronika PROTO Audio -- 2.18.0

3 2

[alsa-devel] [PATCH] ASoC: wm9712: fix unused variable warning
by Arnd Bergmann 28 Sep '18

28 Sep '18

The 'ret' variable is now only used in an #ifdef, and causes a warning if it is declared outside of that block: sound/soc/codecs/wm9712.c: In function 'wm9712_soc_probe': sound/soc/codecs/wm9712.c:641:6: error: unused variable 'ret' [-Werror=unused-variable] Fixes: 2ed1a8e0ce8d ("ASoC: wm9712: add ac97 new bus support") Signed-off-by: Arnd Bergmann <arnd(a)arndb.de> --- sound/soc/codecs/wm9712.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sound/soc/codecs/wm9712.c b/sound/soc/codecs/wm9712.c index ade34c26ad2f..e873baa9e778 100644 --- a/sound/soc/codecs/wm9712.c +++ b/sound/soc/codecs/wm9712.c @@ -638,13 +638,14 @@ static int wm9712_soc_probe(struct snd_soc_component *component) { struct wm9712_priv *wm9712 = snd_soc_component_get_drvdata(component); struct regmap *regmap; - int ret; if (wm9712->mfd_pdata) { wm9712->ac97 = wm9712->mfd_pdata->ac97; regmap = wm9712->mfd_pdata->regmap; } else { #ifdef CONFIG_SND_SOC_AC97_BUS + int ret; + wm9712->ac97 = snd_soc_new_ac97_component(component, WM9712_VENDOR_ID, WM9712_VENDOR_ID_MASK); if (IS_ERR(wm9712->ac97)) { -- 2.18.0

3 2