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

[PATCH 1/4] ASoC: dt-bindings: qcom,wcd937x: Correct reset GPIO polarity in example
by Krzysztof Kozlowski 08 Aug '24

08 Aug '24

The reset GPIO of WCD9370/WCD9375 is active low and that's how it is routed on typical boards, so correct the example DTS to use expected polarity. Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski(a)linaro.org> --- Cc: Alexey Klimov <alexey.klimov(a)linaro.org> --- Documentation/devicetree/bindings/sound/qcom,wcd937x.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Documentation/devicetree/bindings/sound/qcom,wcd937x.yaml b/Documentation/devicetree/bindings/sound/qcom,wcd937x.yaml index de397d879acc..f94203798f24 100644 --- a/Documentation/devicetree/bindings/sound/qcom,wcd937x.yaml +++ b/Documentation/devicetree/bindings/sound/qcom,wcd937x.yaml @@ -42,7 +42,7 @@ examples: pinctrl-names = "default", "sleep"; pinctrl-0 = <&wcd_reset_n>; pinctrl-1 = <&wcd_reset_n_sleep>; - reset-gpios = <&tlmm 83 GPIO_ACTIVE_HIGH>; + reset-gpios = <&tlmm 83 GPIO_ACTIVE_LOW>; vdd-buck-supply = <&vreg_l17b_1p8>; vdd-rxtx-supply = <&vreg_l18b_1p8>; vdd-px-supply = <&vreg_l18b_1p8>; -- 2.43.0

2 4

[PATCH v2 0/3] ASoC: tas*: Fix up GPIO usage
by Linus Walleij 08 Aug '24

08 Aug '24

The TI TAS drivers use some legacy GPIO code and headers, this series fixes it up. The TAS2781 is a special case since it adds a handful of lines of deviating code to reconfigure a GPIO line for IRQ mode and then never actually use the IRQ obtained in the code. Is the line used by autonomous hardware? I'm puzzled by this. Anyways the patch suggest how to solve this properly by fixing the parent irqchip and I'm happy to help. Signed-off-by: Linus Walleij <linus.walleij(a)linaro.org> --- Changes in v2: - Rebased onto v6.11-rc1 - Link to v1: https://lore.kernel.org/r/20240701-asoc-tas-gpios-v1-0-d69ec5d79939@linaro.… --- Linus Walleij (3): ASoC: tas2781-i2c: Drop weird GPIO code ASoC: tas2781-i2c: Get the right GPIO line ASoC: tas*: Drop unused GPIO includes include/sound/tas2781.h | 7 +------ sound/pci/hda/tas2781_hda_i2c.c | 2 +- sound/soc/codecs/tas2552.c | 1 - sound/soc/codecs/tas2764.c | 1 - sound/soc/codecs/tas2770.c | 1 - sound/soc/codecs/tas2780.c | 1 - sound/soc/codecs/tas2781-comlib.c | 3 --- sound/soc/codecs/tas2781-fmwlib.c | 1 - sound/soc/codecs/tas2781-i2c.c | 26 ++++---------------------- 9 files changed, 6 insertions(+), 37 deletions(-) --- base-commit: 8400291e289ee6b2bf9779ff1c83a291501f017b change-id: 20240701-asoc-tas-gpios-5c051d80d768 Best regards, -- Linus Walleij <linus.walleij(a)linaro.org>

2 4

[PATCH] ASoC: cs35l56: Patch CS35L56_IRQ1_MASK_18 to the default value
by Simon Trimmer 08 Aug '24

08 Aug '24

Device tuning files made with early revision tooling may contain configuration that can unmask IRQ signals that are owned by the host. Adding a safe default to the regmap patch ensures that the hardware matches the driver expectations. Signed-off-by: Simon Trimmer <simont(a)opensource.cirrus.com> --- sound/soc/codecs/cs35l56-shared.c | 1 + 1 file changed, 1 insertion(+) diff --git a/sound/soc/codecs/cs35l56-shared.c b/sound/soc/codecs/cs35l56-shared.c index e7e8d617da94..bd74fef33d49 100644 --- a/sound/soc/codecs/cs35l56-shared.c +++ b/sound/soc/codecs/cs35l56-shared.c @@ -36,6 +36,7 @@ static const struct reg_sequence cs35l56_patch[] = { { CS35L56_SWIRE_DP3_CH2_INPUT, 0x00000019 }, { CS35L56_SWIRE_DP3_CH3_INPUT, 0x00000029 }, { CS35L56_SWIRE_DP3_CH4_INPUT, 0x00000028 }, + { CS35L56_IRQ1_MASK_18, 0x1f7df0ff }, /* These are not reset by a soft-reset, so patch to defaults. */ { CS35L56_MAIN_RENDER_USER_MUTE, 0x00000000 }, -- 2.43.0

2 1

[PATCH 0/2] ASoC: codecs: ES8326: button and input issue
by Zhang Yi 08 Aug '24

08 Aug '24

TO solve button and input issue, We have modified parts of the driver related to button and input. Zhang Yi (2): ASoC: codecs: ES8326: button detect issue ASoC: codecs: ES8326: input issue after init sound/soc/codecs/es8326.c | 4 ++++ 1 file changed, 4 insertions(+) -- 2.17.1

2 3

[PATCH] ASoC: amd: acp: add ZSC control register programming sequence
by Vijendar Mukunda 08 Aug '24

08 Aug '24

Add ZSC Control register programming sequence for ACP D0 and D3 state transitions for ACP7.0 onwards. This will allow ACP to enter low power state when ACP enters D3 state. When ACP enters D0 State, ZSC control should be disabled. Tested-by: Leo Li <sunpeng.li(a)amd.com> Signed-off-by: Vijendar Mukunda <Vijendar.Mukunda(a)amd.com> --- sound/soc/amd/acp/acp-legacy-common.c | 5 +++++ sound/soc/amd/acp/amd.h | 2 ++ 2 files changed, 7 insertions(+) diff --git a/sound/soc/amd/acp/acp-legacy-common.c b/sound/soc/amd/acp/acp-legacy-common.c index 4422cec81e3c..04bd605fdce3 100644 --- a/sound/soc/amd/acp/acp-legacy-common.c +++ b/sound/soc/amd/acp/acp-legacy-common.c @@ -321,6 +321,8 @@ int acp_init(struct acp_chip_info *chip) pr_err("ACP reset failed\n"); return ret; } + if (chip->acp_rev >= ACP70_DEV) + writel(0, chip->base + ACP_ZSC_DSP_CTRL); return 0; } EXPORT_SYMBOL_NS_GPL(acp_init, SND_SOC_ACP_COMMON); @@ -336,6 +338,9 @@ int acp_deinit(struct acp_chip_info *chip) if (chip->acp_rev != ACP70_DEV) writel(0, chip->base + ACP_CONTROL); + + if (chip->acp_rev >= ACP70_DEV) + writel(0x01, chip->base + ACP_ZSC_DSP_CTRL); return 0; } EXPORT_SYMBOL_NS_GPL(acp_deinit, SND_SOC_ACP_COMMON); diff --git a/sound/soc/amd/acp/amd.h b/sound/soc/amd/acp/amd.h index 87a4813783f9..c095a34a7229 100644 --- a/sound/soc/amd/acp/amd.h +++ b/sound/soc/amd/acp/amd.h @@ -103,6 +103,8 @@ #define ACP70_PGFSM_CONTROL ACP6X_PGFSM_CONTROL #define ACP70_PGFSM_STATUS ACP6X_PGFSM_STATUS +#define ACP_ZSC_DSP_CTRL 0x0001014 +#define ACP_ZSC_STS 0x0001018 #define ACP_SOFT_RST_DONE_MASK 0x00010001 #define ACP_PGFSM_CNTL_POWER_ON_MASK 0xffffffff -- 2.34.1

2 1

[PATCH] ASoC: amd: acp: remove MODULE_ALIAS for SoundWire machine driver
by Vijendar Mukunda 08 Aug '24

08 Aug '24

As module device table added for AMD SoundWire machine driver MODULE_ALIAS is not required. Remove MODULE_ALIAS for AMD SoundWire machine driver. Signed-off-by: Vijendar Mukunda <Vijendar.Mukunda(a)amd.com> --- sound/soc/amd/acp/acp-sdw-sof-mach.c | 1 - 1 file changed, 1 deletion(-) diff --git a/sound/soc/amd/acp/acp-sdw-sof-mach.c b/sound/soc/amd/acp/acp-sdw-sof-mach.c index 3419675e45a9..f7e4af850309 100644 --- a/sound/soc/amd/acp/acp-sdw-sof-mach.c +++ b/sound/soc/amd/acp/acp-sdw-sof-mach.c @@ -738,5 +738,4 @@ module_platform_driver(sof_sdw_driver); MODULE_DESCRIPTION("ASoC AMD SoundWire Generic Machine driver"); MODULE_AUTHOR("Vijendar Mukunda <Vijendar.Mukunda(a)amd.com"); MODULE_LICENSE("GPL"); -MODULE_ALIAS("platform:amd_sof_sdw"); MODULE_IMPORT_NS(SND_SOC_SDW_UTILS); -- 2.34.1

4 3

[PATCH] ASoC: cs35l56: Use regmap_read_bypassed() to wake the device
by Simon Trimmer 08 Aug '24

08 Aug '24

Now that regmap_read_bypassed() has been added to the kernel it is preferable to wake the device with a read rather than a write as the utility function can be called at a time before the device has been identified. Signed-off-by: Simon Trimmer <simont(a)opensource.cirrus.com> --- sound/soc/codecs/cs35l56-shared.c | 19 +++++-------------- 1 file changed, 5 insertions(+), 14 deletions(-) diff --git a/sound/soc/codecs/cs35l56-shared.c b/sound/soc/codecs/cs35l56-shared.c index e7e8d617da94..91b3c1c8575c 100644 --- a/sound/soc/codecs/cs35l56-shared.c +++ b/sound/soc/codecs/cs35l56-shared.c @@ -450,32 +450,23 @@ static const struct reg_sequence cs35l56_hibernate_seq[] = { REG_SEQ0(CS35L56_DSP_VIRTUAL1_MBOX_1, CS35L56_MBOX_CMD_ALLOW_AUTO_HIBERNATE), }; -static const struct reg_sequence cs35l56_hibernate_wake_seq[] = { - REG_SEQ0(CS35L56_DSP_VIRTUAL1_MBOX_1, CS35L56_MBOX_CMD_WAKEUP), -}; - static void cs35l56_issue_wake_event(struct cs35l56_base *cs35l56_base) { + unsigned int val; + /* * Dummy transactions to trigger I2C/SPI auto-wake. Issue two * transactions to meet the minimum required time from the rising edge * to the last falling edge of wake. * - * It uses bypassed write because we must wake the chip before + * It uses bypassed read because we must wake the chip before * disabling regmap cache-only. - * - * This can NAK on I2C which will terminate the write sequence so the - * single-write sequence is issued twice. */ - regmap_multi_reg_write_bypassed(cs35l56_base->regmap, - cs35l56_hibernate_wake_seq, - ARRAY_SIZE(cs35l56_hibernate_wake_seq)); + regmap_read_bypassed(cs35l56_base->regmap, CS35L56_IRQ1_STATUS, &val); usleep_range(CS35L56_WAKE_HOLD_TIME_US, 2 * CS35L56_WAKE_HOLD_TIME_US); - regmap_multi_reg_write_bypassed(cs35l56_base->regmap, - cs35l56_hibernate_wake_seq, - ARRAY_SIZE(cs35l56_hibernate_wake_seq)); + regmap_read_bypassed(cs35l56_base->regmap, CS35L56_IRQ1_STATUS, &val); cs35l56_wait_control_port_ready(); } -- 2.43.0

2 1

[tiwai-sound:for-next 66/82] sound/usb/usx2y/usb_stream.c:668:17: warning: variable 'iters' set but not used
by kernel test robot 08 Aug '24

08 Aug '24

tree: https://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git for-next head: e95b9f7f2ee05bbef3bf6a4cd7da6e887f17f652 commit: f8466d91f36d97e237ea1b3c6f19de980054a1b6 [66/82] ALSA: usx2y: Use standard print API config: x86_64-randconfig-161-20240808 (https://download.01.org/0day-ci/archive/20240809/202408090249.8LE9qrae-lkp@…) compiler: clang version 18.1.5 (https://github.com/llvm/llvm-project 617a15a9eac96088ae5e9134248d8236e34b91b1) reproduce (this is a W=1 build): (https://download.01.org/0day-ci/archive/20240809/202408090249.8LE9qrae-lkp@…) If you fix the issue in a separate patch/commit (i.e. not just a new version of the same patch/commit), kindly add following tags | Reported-by: kernel test robot <lkp(a)intel.com> | Closes: https://lore.kernel.org/oe-kbuild-all/202408090249.8LE9qrae-lkp@intel.com/ All warnings (new ones prefixed by >>): In file included from sound/usb/usx2y/us122l.c:15: >> sound/usb/usx2y/usb_stream.c:668:17: warning: variable 'iters' set but not used [-Wunused-but-set-variable] 668 | int frame = 0, iters = 0; | ^ 1 warning generated. vim +/iters +668 sound/usb/usx2y/usb_stream.c 030a07e441296c Karsten Wiese 2008-07-30 664 030a07e441296c Karsten Wiese 2008-07-30 665 int usb_stream_start(struct usb_stream_kernel *sk) 030a07e441296c Karsten Wiese 2008-07-30 666 { 030a07e441296c Karsten Wiese 2008-07-30 667 struct usb_stream *s = sk->s; 030a07e441296c Karsten Wiese 2008-07-30 @668 int frame = 0, iters = 0; 030a07e441296c Karsten Wiese 2008-07-30 669 int u, err; 030a07e441296c Karsten Wiese 2008-07-30 670 int try = 0; 030a07e441296c Karsten Wiese 2008-07-30 671 030a07e441296c Karsten Wiese 2008-07-30 672 if (s->state != usb_stream_stopped) 030a07e441296c Karsten Wiese 2008-07-30 673 return -EAGAIN; 030a07e441296c Karsten Wiese 2008-07-30 674 030a07e441296c Karsten Wiese 2008-07-30 675 subs_set_complete(sk->inurb, i_capture_start); 030a07e441296c Karsten Wiese 2008-07-30 676 subs_set_complete(sk->outurb, i_playback_start); 030a07e441296c Karsten Wiese 2008-07-30 677 memset(sk->write_page, 0, s->write_size); 030a07e441296c Karsten Wiese 2008-07-30 678 dotry: 030a07e441296c Karsten Wiese 2008-07-30 679 s->insize_done = 0; 030a07e441296c Karsten Wiese 2008-07-30 680 s->idle_insize = 0; 030a07e441296c Karsten Wiese 2008-07-30 681 s->idle_outsize = 0; 030a07e441296c Karsten Wiese 2008-07-30 682 s->sync_packet = -1; 030a07e441296c Karsten Wiese 2008-07-30 683 s->inpacket_head = -1; 030a07e441296c Karsten Wiese 2008-07-30 684 sk->iso_frame_balance = 0; 030a07e441296c Karsten Wiese 2008-07-30 685 ++try; 030a07e441296c Karsten Wiese 2008-07-30 686 for (u = 0; u < 2; u++) { 030a07e441296c Karsten Wiese 2008-07-30 687 struct urb *inurb = sk->inurb[u]; 030a07e441296c Karsten Wiese 2008-07-30 688 struct urb *outurb = sk->outurb[u]; 4c0a58ef36f3de Takashi Iwai 2021-05-17 689 030a07e441296c Karsten Wiese 2008-07-30 690 playback_prep_freqn(sk, outurb); 030a07e441296c Karsten Wiese 2008-07-30 691 inurb->number_of_packets = outurb->number_of_packets; 030a07e441296c Karsten Wiese 2008-07-30 692 inurb->transfer_buffer_length = 030a07e441296c Karsten Wiese 2008-07-30 693 inurb->number_of_packets * 030a07e441296c Karsten Wiese 2008-07-30 694 inurb->iso_frame_desc[0].length; d0f3a2eb906256 Karsten Wiese 2011-12-30 695 030a07e441296c Karsten Wiese 2008-07-30 696 if (u == 0) { 030a07e441296c Karsten Wiese 2008-07-30 697 int now; 030a07e441296c Karsten Wiese 2008-07-30 698 struct usb_device *dev = inurb->dev; 4c0a58ef36f3de Takashi Iwai 2021-05-17 699 030a07e441296c Karsten Wiese 2008-07-30 700 frame = usb_get_current_frame_number(dev); 030a07e441296c Karsten Wiese 2008-07-30 701 do { 030a07e441296c Karsten Wiese 2008-07-30 702 now = usb_get_current_frame_number(dev); 030a07e441296c Karsten Wiese 2008-07-30 703 ++iters; 030a07e441296c Karsten Wiese 2008-07-30 704 } while (now > -1 && now == frame); 030a07e441296c Karsten Wiese 2008-07-30 705 } 030a07e441296c Karsten Wiese 2008-07-30 706 err = usb_submit_urb(inurb, GFP_ATOMIC); 030a07e441296c Karsten Wiese 2008-07-30 707 if (err < 0) { f8466d91f36d97 Takashi Iwai 2024-08-07 708 dev_err(&sk->dev->dev, f8466d91f36d97 Takashi Iwai 2024-08-07 709 "%s: usb_submit_urb(sk->inurb[%i]) returned %i\n", f8466d91f36d97 Takashi Iwai 2024-08-07 710 __func__, u, err); 030a07e441296c Karsten Wiese 2008-07-30 711 return err; 030a07e441296c Karsten Wiese 2008-07-30 712 } 030a07e441296c Karsten Wiese 2008-07-30 713 err = usb_submit_urb(outurb, GFP_ATOMIC); 030a07e441296c Karsten Wiese 2008-07-30 714 if (err < 0) { f8466d91f36d97 Takashi Iwai 2024-08-07 715 dev_err(&sk->dev->dev, f8466d91f36d97 Takashi Iwai 2024-08-07 716 "%s: usb_submit_urb(sk->outurb[%i]) returned %i\n", f8466d91f36d97 Takashi Iwai 2024-08-07 717 __func__, u, err); 030a07e441296c Karsten Wiese 2008-07-30 718 return err; 030a07e441296c Karsten Wiese 2008-07-30 719 } d0f3a2eb906256 Karsten Wiese 2011-12-30 720 030a07e441296c Karsten Wiese 2008-07-30 721 if (inurb->start_frame != outurb->start_frame) { f8466d91f36d97 Takashi Iwai 2024-08-07 722 dev_dbg(&sk->dev->dev, f8466d91f36d97 Takashi Iwai 2024-08-07 723 "%s: u[%i] start_frames differ in:%u out:%u\n", f8466d91f36d97 Takashi Iwai 2024-08-07 724 __func__, u, inurb->start_frame, outurb->start_frame); 030a07e441296c Karsten Wiese 2008-07-30 725 goto check_retry; 030a07e441296c Karsten Wiese 2008-07-30 726 } 030a07e441296c Karsten Wiese 2008-07-30 727 } 030a07e441296c Karsten Wiese 2008-07-30 728 try = 0; 030a07e441296c Karsten Wiese 2008-07-30 729 check_retry: 030a07e441296c Karsten Wiese 2008-07-30 730 if (try) { 030a07e441296c Karsten Wiese 2008-07-30 731 usb_stream_stop(sk); 030a07e441296c Karsten Wiese 2008-07-30 732 if (try < 5) { 030a07e441296c Karsten Wiese 2008-07-30 733 msleep(1500); f8466d91f36d97 Takashi Iwai 2024-08-07 734 dev_dbg(&sk->dev->dev, "goto dotry;\n"); 030a07e441296c Karsten Wiese 2008-07-30 735 goto dotry; 030a07e441296c Karsten Wiese 2008-07-30 736 } f8466d91f36d97 Takashi Iwai 2024-08-07 737 dev_warn(&sk->dev->dev, f8466d91f36d97 Takashi Iwai 2024-08-07 738 "%s: couldn't start all urbs on the same start_frame.\n", f8466d91f36d97 Takashi Iwai 2024-08-07 739 __func__); 030a07e441296c Karsten Wiese 2008-07-30 740 return -EFAULT; 030a07e441296c Karsten Wiese 2008-07-30 741 } 030a07e441296c Karsten Wiese 2008-07-30 742 030a07e441296c Karsten Wiese 2008-07-30 743 sk->idle_inurb = sk->inurb[USB_STREAM_NURBS - 2]; 030a07e441296c Karsten Wiese 2008-07-30 744 sk->idle_outurb = sk->outurb[USB_STREAM_NURBS - 2]; 030a07e441296c Karsten Wiese 2008-07-30 745 sk->completed_inurb = sk->inurb[USB_STREAM_NURBS - 1]; 030a07e441296c Karsten Wiese 2008-07-30 746 sk->completed_outurb = sk->outurb[USB_STREAM_NURBS - 1]; 030a07e441296c Karsten Wiese 2008-07-30 747 :::::: The code at line 668 was first introduced by commit :::::: 030a07e441296c372f946cd4065b5d831d8dc40c ALSA: Add USB US122L driver :::::: TO: Karsten Wiese <fzu(a)wemgehoertderstaat.de> :::::: CC: Jaroslav Kysela <perex(a)perex.cz> -- 0-DAY CI Kernel Test Service https://github.com/intel/lkp-tests/wiki

1 0

[tiwai-sound:for-next 69/82] sound/pcmcia/vx/vxpocket.c:273:26: error: 'pdev' undeclared; did you mean 'p_dev'?
by kernel test robot 08 Aug '24

08 Aug '24

tree: https://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git for-next head: e95b9f7f2ee05bbef3bf6a4cd7da6e887f17f652 commit: 2acbb5e57230830016e0fb2d61886e7a8c7f59ce [69/82] ALSA: vxpocket: Use standard print API config: i386-randconfig-141-20240808 (https://download.01.org/0day-ci/archive/20240809/202408090110.t0mWbTyh-lkp@…) compiler: gcc-12 (Debian 12.2.0-14) 12.2.0 reproduce (this is a W=1 build): (https://download.01.org/0day-ci/archive/20240809/202408090110.t0mWbTyh-lkp@…) If you fix the issue in a separate patch/commit (i.e. not just a new version of the same patch/commit), kindly add following tags | Reported-by: kernel test robot <lkp(a)intel.com> | Closes: https://lore.kernel.org/oe-kbuild-all/202408090110.t0mWbTyh-lkp@intel.com/ All errors (new ones prefixed by >>): sound/pcmcia/vx/vxpocket.c: In function 'vxpocket_config': sound/pcmcia/vx/vxpocket.c:207:13: error: 'struct vx_core' has no member named 'dev' 207 | chip->dev = &link->dev; | ^~ In file included from include/linux/device.h:15, from include/sound/core.h:10, from sound/pcmcia/vx/vxpocket.c:13: sound/pcmcia/vx/vxpocket.c: In function 'vxpocket_probe': >> sound/pcmcia/vx/vxpocket.c:273:26: error: 'pdev' undeclared (first use in this function); did you mean 'p_dev'? 273 | dev_err(&pdev->dev, "vxpocket: cannot create a card instance\n"); | ^~~~ include/linux/dev_printk.h:110:25: note: in definition of macro 'dev_printk_index_wrap' 110 | _p_func(dev, fmt, ##__VA_ARGS__); \ | ^~~ sound/pcmcia/vx/vxpocket.c:273:17: note: in expansion of macro 'dev_err' 273 | dev_err(&pdev->dev, "vxpocket: cannot create a card instance\n"); | ^~~~~~~ sound/pcmcia/vx/vxpocket.c:273:26: note: each undeclared identifier is reported only once for each function it appears in 273 | dev_err(&pdev->dev, "vxpocket: cannot create a card instance\n"); | ^~~~ include/linux/dev_printk.h:110:25: note: in definition of macro 'dev_printk_index_wrap' 110 | _p_func(dev, fmt, ##__VA_ARGS__); \ | ^~~ sound/pcmcia/vx/vxpocket.c:273:17: note: in expansion of macro 'dev_err' 273 | dev_err(&pdev->dev, "vxpocket: cannot create a card instance\n"); | ^~~~~~~ vim +273 sound/pcmcia/vx/vxpocket.c 247 248 249 /* 250 */ 251 static int vxpocket_probe(struct pcmcia_device *p_dev) 252 { 253 struct snd_card *card; 254 struct snd_vxpocket *vxp; 255 int i, err; 256 257 /* find an empty slot from the card list */ 258 for (i = 0; i < SNDRV_CARDS; i++) { 259 if (!(card_alloc & (1 << i))) 260 break; 261 } 262 if (i >= SNDRV_CARDS) { 263 dev_err(&p_dev->dev, "vxpocket: too many cards found\n"); 264 return -EINVAL; 265 } 266 if (! enable[i]) 267 return -ENODEV; /* disabled explicitly */ 268 269 /* ok, create a card instance */ 270 err = snd_card_new(&p_dev->dev, index[i], id[i], THIS_MODULE, 271 0, &card); 272 if (err < 0) { > 273 dev_err(&pdev->dev, "vxpocket: cannot create a card instance\n"); 274 return err; 275 } 276 277 err = snd_vxpocket_new(card, ibl[i], p_dev, &vxp); 278 if (err < 0) { 279 snd_card_free(card); 280 return err; 281 } 282 card->private_data = vxp; 283 284 vxp->index = i; 285 card_alloc |= 1 << i; 286 287 vxp->p_dev = p_dev; 288 289 return vxpocket_config(p_dev); 290 } 291 -- 0-DAY CI Kernel Test Service https://github.com/intel/lkp-tests/wiki

1 0

[PATCH] ALSA: snd-usb-caiaq: use snd_pcm_rate_to_rate_bit
by Jerome Brunet 08 Aug '24

08 Aug '24

Use snd_pcm_rate_to_rate_bit() helper provided by Alsa instead re-implementing it. This reduce code duplication and helps when changing some Alsa definition is necessary. Signed-off-by: Jerome Brunet <jbrunet(a)baylibre.com> --- sound/usb/caiaq/audio.c | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/sound/usb/caiaq/audio.c b/sound/usb/caiaq/audio.c index 4981753652a7..e62a4ea1d19c 100644 --- a/sound/usb/caiaq/audio.c +++ b/sound/usb/caiaq/audio.c @@ -174,14 +174,6 @@ static int snd_usb_caiaq_pcm_hw_free(struct snd_pcm_substream *sub) return 0; } -/* this should probably go upstream */ -#if SNDRV_PCM_RATE_5512 != 1 << 0 || SNDRV_PCM_RATE_192000 != 1 << 12 -#error "Change this table" -#endif - -static const unsigned int rates[] = { 5512, 8000, 11025, 16000, 22050, 32000, 44100, - 48000, 64000, 88200, 96000, 176400, 192000 }; - static int snd_usb_caiaq_pcm_prepare(struct snd_pcm_substream *substream) { int bytes_per_sample, bpp, ret, i; @@ -233,10 +225,7 @@ static int snd_usb_caiaq_pcm_prepare(struct snd_pcm_substream *substream) /* the first client that opens a stream defines the sample rate * setting for all subsequent calls, until the last client closed. */ - for (i=0; i < ARRAY_SIZE(rates); i++) - if (runtime->rate == rates[i]) - cdev->pcm_info.rates = 1 << i; - + cdev->pcm_info.rates = snd_pcm_rate_to_rate_bit(runtime->rate); snd_pcm_limit_hw_rates(runtime); bytes_per_sample = BYTES_PER_SAMPLE; -- 2.43.0

2 1