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

aplay doesn't play audio sometimes "unable to open slave"
by GitHub issues - opened 05 Dec '24

05 Dec '24

alsa-project/alsa-lib issue #426 was opened from haoyi-codes: I have initially thought it was a bug that was related to chromium as stated in #425. However, now I realize it has to be something else that is wrong. `aplay -D default /dev/zero` ``` ALSA lib /var/tmp/portage/media-libs/alsa-lib-1.2.13/work/alsa-lib-1.2.13/src/pcm/pcm_dmix.c:1000:(snd_pcm_dmix_open) unable to open slave aplay: main:850: audio open error: No such file or directory ``` `aplay -D plughw:0 /dev/zero` ``` aplay: main:850: audio open error: No such file or directory ``` `aplay -l` ``` **** List of PLAYBACK Hardware Devices **** card 0: NVidia [HDA NVidia], device 3: Generic Digital [Generic Digital] Subdevices: 1/1 Subdevice #0: subdevice #0 card 1: HDMI [HDA ATI HDMI], device 3: Generic Digital [Generic Digital] Subdevices: 1/1 Subdevice #0: subdevice #0 card 2: Audio [SA9123 USB Audio], device 0: USB Audio [USB Audio] Subdevices: 1/1 Subdevice #0: subdevice #0 ``` `cat /proc/asound/cards` ``` 0 [NVidia ]: HDA-Intel - HDA NVidia HDA NVidia at 0x81080000 irq 17 1 [HDMI ]: HDA-Intel - HDA ATI HDMI HDA ATI HDMI at 0x81220000 irq 165 2 [Audio ]: USB-Audio - SA9123 USB Audio SYC SA9123 USB Audio at usb-0000:00:14.0-3.2, full speed 3 [Edition ]: USB-Audio - Logi 4K Stream Edition Logi 4K Stream Edition at usb-0000:00:14.0-3.3, super speed ``` `ls -la /dev/snd/*` ``` crw-rw----+ 1 root audio 116, 0 Dec 4 23:18 /dev/snd/controlC0 crw-rw----+ 1 root audio 116, 32 Dec 4 23:18 /dev/snd/controlC1 crw-rw----+ 1 root audio 116, 64 Dec 4 23:18 /dev/snd/controlC2 crw-rw----+ 1 root audio 116, 96 Dec 4 23:18 /dev/snd/controlC3 crw-rw----+ 1 root audio 116, 19 Dec 4 23:18 /dev/snd/pcmC0D3p crw-rw----+ 1 root audio 116, 51 Dec 4 23:18 /dev/snd/pcmC1D3p crw-rw----+ 1 root audio 116, 80 Dec 4 23:18 /dev/snd/pcmC2D0p crw-rw----+ 1 root audio 116, 120 Dec 4 23:18 /dev/snd/pcmC3D0c crw-rw----+ 1 root audio 116, 1 Dec 4 23:18 /dev/snd/seq crw-rw----+ 1 root audio 116, 33 Dec 4 23:18 /dev/snd/timer /dev/snd/by-id: total 0 drwxr-xr-x 2 root root 80 Dec 4 23:18 . drwxr-xr-x 4 root root 280 Dec 4 23:17 .. lrwxrwxrwx 1 root root 12 Dec 4 23:18 usb-046d_Logi_4K_Stream_Edition_51C07EAF-03 -> ../controlC3 lrwxrwxrwx 1 root root 12 Dec 4 23:18 usb-SYC_SA9123_USB_Audio-01 -> ../controlC2 /dev/snd/by-path: total 0 drwxr-xr-x 2 root root 160 Dec 4 23:18 . drwxr-xr-x 4 root root 280 Dec 4 23:17 .. lrwxrwxrwx 1 root root 12 Dec 4 23:18 pci-0000:00:14.0-usb-0:3.2:1.1 -> ../controlC2 lrwxrwxrwx 1 root root 12 Dec 4 23:18 pci-0000:00:14.0-usb-0:3.3:1.3 -> ../controlC3 lrwxrwxrwx 1 root root 12 Dec 4 23:18 pci-0000:00:14.0-usbv2-0:3.2:1.1 -> ../controlC2 lrwxrwxrwx 1 root root 12 Dec 4 23:18 pci-0000:00:14.0-usbv3-0:3.3:1.3 -> ../controlC3 lrwxrwxrwx 1 root root 12 Dec 4 23:18 pci-0000:01:00.1 -> ../controlC0 lrwxrwxrwx 1 root root 12 Dec 4 23:18 pci-0000:05:00.1 -> ../controlC1 ``` For reference I am still able to play audio on my system as pulseaudio is running but for applications that use alsa directly it does not work. ``` Server String: /run/user/1011/pulse/native Library Protocol Version: 35 Server Protocol Version: 35 Is Local: yes Client Index: 59 Tile Size: 65472 User Name: user Host Name: system Server Name: PulseAudio (on PipeWire 1.2.7) Server Version: 15.0.0 Default Sample Specification: float32le 2ch 48000Hz Default Channel Map: front-left,front-right Default Sink: alsa_output.usb-SYC_SA9123_USB_Audio-01.iec958-stereo Default Source: alsa_output.usb-SYC_SA9123_USB_Audio-01.iec958-stereo.monitor Cookie: XXXX:XXXX ``` Issue URL : https://github.com/alsa-project/alsa-lib/issues/426 Repository URL: https://github.com/alsa-project/alsa-lib

1 0

pulseaudio bails out on 1.2.13 (SIGSEGV), with MOTU Ultralite mk5
by GitHub issues - opened 04 Dec '24

04 Dec '24

alsa-project/alsa-ucm-conf issue #483 was opened from karolyi: Hey, I have this sound card and with the latest update (1.2.13), pulseaudio started to SIGSEGV and I have no sound. Upon going to the pulseaudio IRC channel and talking to the devs, we've managed to point out that it's the UCM configuration that makes pulseaudio crash. Reverting to 1.2.12 made the crash cease. It seems that the newly added configuration for the Ultralite makes pulseaudio crash. According to the below gdb traces, it seems the configuration drives pulseaudio into an infinite loop. Beginning of the trace: ``` Debuginfod has been enabled. To make this setting permanent, add 'set debuginfod enabled on' to .gdbinit. [Thread debugging using libthread_db enabled] Using host libthread_db library "/usr/lib/libthread_db.so.1". Program received signal SIGSEGV, Segmentation fault. 0x00007ffff7ae98df in _int_malloc (av=av@entry=0x7ffff7c2dac0 <main_arena>, bytes=bytes@entry=2080) at malloc.c:4059 4059 size_t tc_idx = csize2tidx (nb); Thread 1 (Thread 0x7ffff73298c0 (LWP 40542) "pulseaudio"): #0 0x00007ffff7ae98df in _int_malloc (av=av@entry=0x7ffff7c2dac0 <main_arena>, bytes=bytes@entry=2080) at malloc.c:4059 #1 0x00007ffff7aec069 in __libc_calloc (n=<optimized out>, elem_size=<optimized out>) at malloc.c:3754 #2 0x00007ffff7e5e366 in pa_xmalloc0 (size=2080) at ../src/pulse/xmalloc.c:74 #3 0x00007ffff7e7d3d4 in pa_idxset_new (hash_func=0x7ffff7e7d371 <pa_idxset_trivial_hash_func>, compare_func=0x7ffff7e7d37f <pa_idxset_trivial_compare_func>) at ../src/pulsecore/idxset.c:86 #4 0x00007ffff7e7f5a9 in pa_idxset_copy (s=0x5555556f5890, copy_func=0x0) at ../src/pulsecore/idxset.c:623 #5 0x00007ffff6b93ff0 in iterate_device_subsets (devices=0x5555556f5060, state=0x7fffffffca38) at ../src/modules/alsa/alsa-ucm.c:1399 #6 0x00007ffff6b94108 in iterate_maximal_device_subsets (devices=0x5555556f5060, state=0x7fffffffca38) at ../src/modules/alsa/alsa-ucm.c:1412 #7 0x00007ffff6b9418a in iterate_maximal_device_subsets (devices=0x5555556f5060, state=0x7fffffffca38) at ../src/modules/alsa/alsa-ucm.c:1422 #8 0x00007ffff6b9418a in iterate_maximal_device_subsets (devices=0x5555556f5060, state=0x7fffffffca38) at ../src/modules/alsa/alsa-ucm.c:1422 ``` Inbetween there's just a lot of recursive calls. End of the trace: ``` #130916 0x00007ffff6b9418a in iterate_maximal_device_subsets (devices=0x5555556f5060, state=0x7fffffffca38) at ../src/modules/alsa/alsa-ucm.c:1422 #130917 0x00007ffff6b9418a in iterate_maximal_device_subsets (devices=0x5555556f5060, state=0x7fffffffca38) at ../src/modules/alsa/alsa-ucm.c:1422 #130918 0x00007ffff6b9418a in iterate_maximal_device_subsets (devices=0x5555556f5060, state=0x7fffffffca38) at ../src/modules/alsa/alsa-ucm.c:1422 #130919 0x00007ffff6b9418a in iterate_maximal_device_subsets (devices=0x5555556f5060, state=0x7fffffffca38) at ../src/modules/alsa/alsa-ucm.c:1422 #130920 0x00007ffff6b96635 in ucm_create_verb_profiles (ucm=0x55555567bc60, ps=0x5555556ca560, verb=0x5555556c8970, verb_name=0x5555556c6d60 "HiFi", verb_desc=0x5555556a3120 "Default") at ../src/modules/alsa/alsa-ucm.c:2042 #130921 0x00007ffff6b973bf in pa_alsa_ucm_add_profile_set (ucm=0x55555567bc60, default_channel_map=0x555555570de0) at ../src/modules/alsa/alsa-ucm.c:2305 #130922 0x00007ffff6c6bb43 in module_alsa_card_LTX_pa__init (m=0x55555566d9d0) at ../src/modules/alsa/module-alsa-card.c:966 #130923 0x00007ffff7f26919 in pa_module_load (module=0x7fffffffccf0, c=0x555555570d20, name=0x7ffff6c7747d "module-alsa-card", argument=0x555555587f10 "device_id=\"2\" name=\"usb-MOTU_UltraLite-mk5_UL5LFF34E6-00\" card_name=\"alsa_card.usb-MOTU_UltraLite-mk5_UL5LFF34E6-00\" namereg_fail=false tsched=yes fixed_latency_range=no ignore_dB=no deferred_volume=y"...) at ../src/pulsecore/module.c:208 #130924 0x00007ffff6c74260 in verify_access (u=0x55555566ae40, d=0x55555566e430) at ../src/modules/module-udev-detect.c:342 #130925 0x00007ffff6c7488f in card_changed (u=0x55555566ae40, dev=0x55555568ae50) at ../src/modules/module-udev-detect.c:437 #130926 0x00007ffff6c74c6f in process_device (u=0x55555566ae40, dev=0x55555568ae50) at ../src/modules/module-udev-detect.c:479 #130927 0x00007ffff6c74cf8 in process_path (u=0x55555566ae40, path=0x5555556879b0 "/sys/devices/pci0000:00/0000:00:01.2/0000:02:00.0/0000:03:08.0/0000:07:00.1/usb1/1-1/1-1.1/1-1.1:1.0/sound/card2") at ../src/modules/module-udev-detect.c:496 #130928 0x00007ffff6c75ed0 in module_udev_detect_LTX_pa__init (m=0x555555666220) at ../src/modules/module-udev-detect.c:812 #130929 0x00007ffff7f26919 in pa_module_load (module=0x7fffffffcf28, c=0x555555570d20, name=0x555555668c20 "module-udev-detect", argument=0x0) at ../src/pulsecore/module.c:208 #130930 0x00007ffff7f073ba in pa_cli_command_load (c=0x555555570d20, t=0x555555668c40, buf=0x5555555717b0, fail=0x55555556f6b5) at ../src/pulsecore/cli-command.c:440 #130931 0x00007ffff7f0fac4 in pa_cli_command_execute_line_stateful (c=0x555555570d20, s=0x7fffffffd100 "load-module module-udev-detect", buf=0x5555555717b0, fail=0x55555556f6b5, ifstate=0x7fffffffd0f8) at ../src/pulsecore/cli-command.c:2207 #130932 0x00007ffff7f0fda2 in pa_cli_command_execute_file_stream (c=0x555555570d20, f=0x55555556fce0, buf=0x5555555717b0, fail=0x55555556f6b5) at ../src/pulsecore/cli-command.c:2247 #130933 0x00007ffff7f10031 in pa_cli_command_execute_file (c=0x555555570d20, fn=0x555555570c70 "/home/karolyi/Work/opensource/pulseaudio/build/src/daemon/default.pa", buf=0x5555555717b0, fail=0x55555556f6b5) at ../src/pulsecore/cli-command.c:2278 #130934 0x00007ffff7f0f7d8 in pa_cli_command_execute_line_stateful (c=0x555555570d20, s=0x555555570560 ".include /home/karolyi/Work/opensource/pulseaudio/build/src/daemon/default.pa", buf=0x5555555717b0, fail=0x55555556f6b5, ifstate=0x7fffffffdb1c) at ../src/pulsecore/cli-command.c:2170 #130935 0x00007ffff7f10239 in pa_cli_command_execute (c=0x555555570d20, s=0x555555577bc0 ".include /home/karolyi/Work/opensource/pulseaudio/build/src/daemon/default.pa\n", buf=0x5555555717b0, fail=0x55555556f6b5) at ../src/pulsecore/cli-command.c:2304 #130936 0x0000555555564162 in main (argc=7, argv=0x7fffffffde98) at ../src/daemon/main.c:1267 Continuing. Program terminated with signal SIGSEGV, Segmentation fault. The program no longer exists. ``` Requested debug output from the pulseaudio project: https://termbin.com/n04r Please investigate. Issue URL : https://github.com/alsa-project/alsa-ucm-conf/issues/483 Repository URL: https://github.com/alsa-project/alsa-ucm-conf

1 0

Should SOF ucm2/blobs/sof user_configs and product_configs be without .conf suffix?
by GitHub issues - edited 04 Dec '24

04 Dec '24

alsa-project/alsa-ucm-conf issue #482 was edited from singalsu: It seems updates have dropped .conf from looked up SOF blobs customization files. Is the change intentional? Then the example in ucm2/blobs/sof/product_configs/AAEON/UPX-TGL01.conf should be renamed to be without .conf to work and to be applied correctly. Issue URL : https://github.com/alsa-project/alsa-ucm-conf/issues/482 Repository URL: https://github.com/alsa-project/alsa-ucm-conf

1 0

Should SOF ucm2/blobs/sof user_configs and product_configs be without .conf suffix?
by GitHub issues - opened 04 Dec '24

04 Dec '24

alsa-project/alsa-ucm-conf issue #482 was opened from singalsu: It seems updates have dropped .conf from looked up SOF blobs customization files. Is the change intentional? Then the example in ucm2/blobs/sof/product_configs/AAEON/UPX-TGL01.conf should be renamed to be without .conf to work and be applied correctly. Issue URL : https://github.com/alsa-project/alsa-ucm-conf/issues/482 Repository URL: https://github.com/alsa-project/alsa-ucm-conf

1 0

axfer-transfer.1: Some remarks and editorial changes for this man page
by Bjarni Ingi Gislason 04 Dec '24

04 Dec '24

Package: alsa-utils Version: 1.2.12-1 Severity: minor Tags: patch * What led up to the situation? Checking for defects with test-[g|n]roff -mandoc -t -K utf8 -rF0 -rHY=0 -ww -b -z < "man page" [Use "groff -e ' $' <file>" to find trailing spaces.] ["test-groff" is a script in the repository for "groff"; is not shipped] (local copy and "troff" slightly changed by me). [The fate of "test-nroff" was decided in groff bug #55941.] * What was the outcome of this action? troff: backtrace: file '<stdin>':1006 troff:<stdin>:1006: warning: trailing space in the line * What outcome did you expect instead? No output (no warnings). -.- General remarks and further material, if a diff-file exist, are in the attachments. -- System Information: Debian Release: trixie/sid APT prefers testing APT policy: (500, 'testing') Architecture: amd64 (x86_64) Kernel: Linux 6.11.10-amd64 (SMP w/2 CPU threads; PREEMPT) Locale: LANG=is_IS.iso88591, LC_CTYPE=is_IS.iso88591 (charmap=ISO-8859-1), LANGUAGE not set Shell: /bin/sh linked to /usr/bin/dash Init: sysvinit (via /sbin/init) Versions of packages alsa-utils depends on: ii kmod 33+20240816-2 ii libasound2t64 1.2.12-1+b1 ii libatopology2t64 1.2.12-1+b1 ii libc6 2.40-3 ii libfftw3-single3 3.3.10-1+b3 ii libncursesw6 6.5-2+b1 ii libsamplerate0 0.2.2-4+b2 ii libtinfo6 6.5-2+b1 alsa-utils recommends no packages. Versions of packages alsa-utils suggests: pn dialog <none> -- no debconf information

1 0

[PATCH 1/2] ASoC: amd: ps: update mach params subsystem_rev variable
by Vijendar Mukunda 03 Dec '24

03 Dec '24

Update mach_params subsystem_rev with acp_rev variable for ACP6.3 platform. Signed-off-by: Vijendar Mukunda <Vijendar.Mukunda(a)amd.com> --- sound/soc/amd/ps/pci-ps.c | 1 + 1 file changed, 1 insertion(+) diff --git a/sound/soc/amd/ps/pci-ps.c b/sound/soc/amd/ps/pci-ps.c index aef73ec6f7ef..4ed50cebadb3 100644 --- a/sound/soc/amd/ps/pci-ps.c +++ b/sound/soc/amd/ps/pci-ps.c @@ -312,6 +312,7 @@ static struct snd_soc_acpi_mach *acp63_sdw_machine_select(struct device *dev) if (mach && mach->link_mask) { mach->mach_params.links = mach->links; mach->mach_params.link_mask = mach->link_mask; + mach->mach_params.subsystem_rev = acp_data->acp_rev; return mach; } } -- 2.34.1

2 2

UCM2: Intel: sof-hda-dsp: Enable Dmic0 DRC and TDFB pre-processing
by GitHub pull_request - opened 03 Dec '24

03 Dec '24

alsa-project/alsa-ucm-conf pull request #481 was opened from singalsu: This patch adds enable of the microphone capture pre-processing features as BootSequence inital values if the controls for them are available. If the user later switches these off, they will remain off. The DRC is dynamic range control that boosts the capture level, and the TDFB (time-domain fixed beamformer) improves capture signa-to-noise ratio for set beam angle direction. The used 0 degrees angle is defined as angle towards notebook computer user. Request URL : https://github.com/alsa-project/alsa-ucm-conf/pull/481 Patch URL : https://github.com/alsa-project/alsa-ucm-conf/pull/481.patch Repository URL: https://github.com/alsa-project/alsa-ucm-conf

1 0

Re: native DSD on PCI linux driver
by Takashi Iwai 03 Dec '24

03 Dec '24

On Tue, 26 Nov 2024 10:41:21 +0100, Filip Van Lunteren wrote: > > > Hello, > > I am currently developing PCI audio output hardware and driver and want to > integrate native DSD playback. I am struggling to find documentation on this. > Is there DSD native support in ALSA? And how do I incorporate it? PCM is > already set up and works. AFAIK, in the driver side, there is not much special; it assumes that DSD samples are passed over the standard PCM stream, and the driver uses special formats SNDRV_PCM_FORMAT_DSD_U8, *_U16 and *_U32 (with _LE and _BE suffix) for 8, 16 and 32bit, instead of the standard SNDRV_PCM_FORMAT_U8, *_S16, etc. For those formats, the silence data is assumed to be 0x69, 0x6969, etc. Takashi

1 1

[PATCH RESEND] soundwire: amd: clear wake enable register for
by Vijendar Mukunda 03 Dec '24

03 Dec '24

As per design for power off mode, clear the wake enable register during resume sequence. Signed-off-by: Vijendar Mukunda <Vijendar.Mukunda(a)amd.com> --- drivers/soundwire/amd_manager.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/soundwire/amd_manager.c b/drivers/soundwire/amd_manager.c index 5a4bfaef65fb..96a3aa6da711 100644 --- a/drivers/soundwire/amd_manager.c +++ b/drivers/soundwire/amd_manager.c @@ -1190,6 +1190,7 @@ static int __maybe_unused amd_resume_runtime(struct device *dev) if (amd_manager->power_mode_mask & AMD_SDW_CLK_STOP_MODE) { return amd_sdw_clock_stop_exit(amd_manager); } else if (amd_manager->power_mode_mask & AMD_SDW_POWER_OFF_MODE) { + writel(0x00, amd_manager->acp_mmio + ACP_SW_WAKE_EN(amd_manager->instance)); val = readl(amd_manager->mmio + ACP_SW_CLK_RESUME_CTRL); if (val) { val |= AMD_SDW_CLK_RESUME_REQ; -- 2.34.1

2 1

[PATCH] ASoC: tas2781: Fix redundant logical jump
by Tang Bin 02 Dec '24

02 Dec '24

In these functions, some logical jump of "goto" and variable are redundant, thus remove them. Signed-off-by: Tang Bin <tangbin(a)cmss.chinamobile.com> --- sound/soc/codecs/tas2781-i2c.c | 68 +++++++++++++--------------------- 1 file changed, 25 insertions(+), 43 deletions(-) diff --git a/sound/soc/codecs/tas2781-i2c.c b/sound/soc/codecs/tas2781-i2c.c index 68887799e..27f2f84a4 100644 --- a/sound/soc/codecs/tas2781-i2c.c +++ b/sound/soc/codecs/tas2781-i2c.c @@ -489,14 +489,11 @@ static int tas2563_calib_start_put(struct snd_kcontrol *kcontrol, struct snd_soc_component *comp = snd_soc_kcontrol_component(kcontrol); struct tasdevice_priv *tas_priv = snd_soc_component_get_drvdata(comp); const int sum = ARRAY_SIZE(tas2563_cali_start_reg); - int rc = 1; int i, j; guard(mutex)(&tas_priv->codec_lock); - if (tas_priv->chip_id != TAS2563) { - rc = -1; - goto out; - } + if (tas_priv->chip_id != TAS2563) + return -1; for (i = 0; i < tas_priv->ndev; i++) { struct tasdevice *tasdev = tas_priv->tasdevice; @@ -523,8 +520,8 @@ static int tas2563_calib_start_put(struct snd_kcontrol *kcontrol, q[j].val, 4); } } -out: - return rc; + + return 1; } static void tas2563_calib_stop_put(struct tasdevice_priv *tas_priv) @@ -576,7 +573,7 @@ static int tasdev_cali_data_put(struct snd_kcontrol *kcontrol, struct cali_reg *p = &cali_data->cali_reg_array; unsigned char *src = ucontrol->value.bytes.data; unsigned char *dst = cali_data->data; - int rc = 1, i = 0; + int i = 0; int j; guard(mutex)(&priv->codec_lock); @@ -605,7 +602,7 @@ static int tasdev_cali_data_put(struct snd_kcontrol *kcontrol, i += 3; memcpy(dst, &src[i], cali_data->total_sz); - return rc; + return 1; } static int tas2781_latch_reg_get(struct snd_kcontrol *kcontrol, @@ -1115,25 +1112,21 @@ static int tasdevice_dsp_create_ctrls(struct tasdevice_priv *tas_priv) char *conf_name, *prog_name; int nr_controls = 4; int mix_index = 0; - int ret; /* Alloc kcontrol via devm_kzalloc, which don't manually * free the kcontrol */ dsp_ctrls = devm_kcalloc(tas_priv->dev, nr_controls, sizeof(dsp_ctrls[0]), GFP_KERNEL); - if (!dsp_ctrls) { - ret = -ENOMEM; - goto out; - } + if (!dsp_ctrls) + return -ENOMEM; /* Create mixer items for selecting the active Program and Config */ prog_name = devm_kstrdup(tas_priv->dev, "Speaker Program Id", GFP_KERNEL); - if (!prog_name) { - ret = -ENOMEM; - goto out; - } + if (!prog_name) + return -ENOMEM; + dsp_ctrls[mix_index].name = prog_name; dsp_ctrls[mix_index].iface = SNDRV_CTL_ELEM_IFACE_MIXER; dsp_ctrls[mix_index].info = tasdevice_info_programs; @@ -1143,10 +1136,9 @@ static int tasdevice_dsp_create_ctrls(struct tasdevice_priv *tas_priv) conf_name = devm_kstrdup(tas_priv->dev, "Speaker Config Id", GFP_KERNEL); - if (!conf_name) { - ret = -ENOMEM; - goto out; - } + if (!conf_name) + return -ENOMEM; + dsp_ctrls[mix_index].name = conf_name; dsp_ctrls[mix_index].iface = SNDRV_CTL_ELEM_IFACE_MIXER; dsp_ctrls[mix_index].info = tasdevice_info_configurations; @@ -1156,10 +1148,9 @@ static int tasdevice_dsp_create_ctrls(struct tasdevice_priv *tas_priv) active_dev_num = devm_kstrdup(tas_priv->dev, "Activate Tasdevice Num", GFP_KERNEL); - if (!active_dev_num) { - ret = -ENOMEM; - goto out; - } + if (!active_dev_num) + return -ENOMEM; + dsp_ctrls[mix_index].name = active_dev_num; dsp_ctrls[mix_index].iface = SNDRV_CTL_ELEM_IFACE_MIXER; dsp_ctrls[mix_index].info = tasdevice_info_active_num; @@ -1168,21 +1159,17 @@ static int tasdevice_dsp_create_ctrls(struct tasdevice_priv *tas_priv) mix_index++; chip_id = devm_kstrdup(tas_priv->dev, "Tasdevice Chip Id", GFP_KERNEL); - if (!chip_id) { - ret = -ENOMEM; - goto out; - } + if (!chip_id) + return -ENOMEM; + dsp_ctrls[mix_index].name = chip_id; dsp_ctrls[mix_index].iface = SNDRV_CTL_ELEM_IFACE_MIXER; dsp_ctrls[mix_index].info = tasdevice_info_chip_id; dsp_ctrls[mix_index].get = tasdevice_get_chip_id; mix_index++; - ret = snd_soc_add_component_controls(tas_priv->codec, dsp_ctrls, + return snd_soc_add_component_controls(tas_priv->codec, dsp_ctrls, nr_controls < mix_index ? nr_controls : mix_index); - -out: - return ret; } static int tasdevice_create_cali_ctrls(struct tasdevice_priv *priv) @@ -1469,7 +1456,6 @@ static int tasdevice_hw_params(struct snd_pcm_substream *substream, unsigned int slot_width; unsigned int fsrate; int bclk_rate; - int rc = 0; fsrate = params_rate(params); switch (fsrate) { @@ -1479,8 +1465,7 @@ static int tasdevice_hw_params(struct snd_pcm_substream *substream, default: dev_err(tas_priv->dev, "%s: incorrect sample rate = %u\n", __func__, fsrate); - rc = -EINVAL; - goto out; + return -EINVAL; } slot_width = params_width(params); @@ -1493,20 +1478,17 @@ static int tasdevice_hw_params(struct snd_pcm_substream *substream, default: dev_err(tas_priv->dev, "%s: incorrect slot width = %u\n", __func__, slot_width); - rc = -EINVAL; - goto out; + return -EINVAL; } bclk_rate = snd_soc_params_to_bclk(params); if (bclk_rate < 0) { dev_err(tas_priv->dev, "%s: incorrect bclk rate = %d\n", __func__, bclk_rate); - rc = bclk_rate; - goto out; + return bclk_rate; } -out: - return rc; + return 0; } static int tasdevice_set_dai_sysclk(struct snd_soc_dai *codec_dai, -- 2.33.0

3 2