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

[PATCH v5 0/2] ASoC: nau8325: Modify driver code and dtschema.
by Seven Lee 29 Mar '24

29 Mar '24

Revise properties description and use standard units in dtschema. The unit conversion driver based on the attribute must also be changed accordingly. Change: V1 -> V2: - Revise the driver description part for the C++ comment. - In the nau8325_clkdet_put function, modify the max variable to hard code. - Removed "Clock Detection" switch control. - modify the "ALC Enable" switch name. - Revise the dtschema for "nuvoton,dac-vref". V2 -> V3: - Properties use standard unit suffixes. - Modify the enum definition. - Driver code should be used dev_dbg(). V3 -> V4: - Properties use standard unit suffixes. - Modify the enum definition. V4->V5: - Properties use standard unit suffixes for vref-impedance and dac-vref. - Revise the enum definition. - Modify the code related to properties usage in the NAU8325 codec driver. - Re-arrange header files in alphabetical order. Seven Lee (2): ASoC: dt-bindings: Added schema for "nuvoton,nau8325" ASoC: nau8325: new driver .../bindings/sound/nuvoton,nau8325.yaml | 80 ++ sound/soc/codecs/nau8325.c | 893 ++++++++++++++++++ sound/soc/codecs/nau8325.h | 391 ++++++++ 3 files changed, 1364 insertions(+) create mode 100644 Documentation/devicetree/bindings/sound/nuvoton,nau8325.yaml create mode 100644 sound/soc/codecs/nau8325.c create mode 100644 sound/soc/codecs/nau8325.h -- 2.25.1

4 6

[PATCH 00/18] ASoC: drop driver owner assignment
by Krzysztof Kozlowski 29 Mar '24

29 Mar '24

Core for several drivers already sets the driver.owner, so driver does not need to. Simplify the drivers. Patches are independent, no dependencies. Best regards, Krzysztof --- Krzysztof Kozlowski (18): ASoC: loongson: i2s/pci: drop driver owner assignment ASoC: tlv320aic32x4-spi: drop driver owner assignment ASoC: tlv320aic3x-spi: drop driver owner assignment ASoC: max98373-sdw: drop driver owner assignment ASoC: rt1017-sdca-sdw: drop driver owner assignment ASoC: rt1308-sdw: drop driver owner assignment ASoC: rt1316-sdw: drop driver owner assignment ASoC: rt1318-sdw: drop driver owner assignment ASoC: rt5682-sdw: drop driver owner assignment ASoC: rt700-sdw: drop driver owner assignment ASoC: rt711-sdca-sdw: drop driver owner assignment ASoC: rt711-sdw: drop driver owner assignment ASoC: rt712-sdca-dmic: drop driver owner assignment ASoC: rt712-sdca-sdw: drop driver owner assignment ASoC: rt715-sdca-sdw: drop driver owner assignment ASoC: rt715-sdw: drop driver owner assignment ASoC: rt722-sdca-sdw: drop driver owner assignment ASoC: sdw-mockup: drop driver owner assignment sound/soc/codecs/max98373-sdw.c | 1 - sound/soc/codecs/rt1017-sdca-sdw.c | 1 - sound/soc/codecs/rt1308-sdw.c | 1 - sound/soc/codecs/rt1316-sdw.c | 1 - sound/soc/codecs/rt1318-sdw.c | 1 - sound/soc/codecs/rt5682-sdw.c | 1 - sound/soc/codecs/rt700-sdw.c | 1 - sound/soc/codecs/rt711-sdca-sdw.c | 1 - sound/soc/codecs/rt711-sdw.c | 1 - sound/soc/codecs/rt712-sdca-dmic.c | 1 - sound/soc/codecs/rt712-sdca-sdw.c | 1 - sound/soc/codecs/rt715-sdca-sdw.c | 1 - sound/soc/codecs/rt715-sdw.c | 1 - sound/soc/codecs/rt722-sdca-sdw.c | 1 - sound/soc/codecs/sdw-mockup.c | 1 - sound/soc/codecs/tlv320aic32x4-spi.c | 1 - sound/soc/codecs/tlv320aic3x-spi.c | 1 - sound/soc/loongson/loongson_i2s_pci.c | 1 - 18 files changed, 18 deletions(-) --- base-commit: 1cadb9c1269d4e90ec23f3dc3e5373ee405462d1 change-id: 20240327-module-owner-var-2744d140fcdf Best regards, -- Krzysztof Kozlowski <krzysztof.kozlowski(a)linaro.org>

3 20

[PATCH 00/18] ASoC: Intel: boards: updates for 6.10 - part3
by Pierre-Louis Bossart 29 Mar '24

29 Mar '24

This last part is the continuation of Brent Lu's cleanups. Multiple quirks have been removed to use "default" configurations and ACPI-based detection of codecs and selection of topology files. This cleanup has been done in multiple steps/phases since Fall 2023, thanks Brent for this contribution! Brent Lu (18): ASoC: Intel: ssp-common: relocate source file ASoC: Intel: ssp-common: relocate header file ASoC: Intel: ssp-common: naming convention change ASoC: Intel: ssp-common: module name change ASoC: Intel: ssp-common: delete module ASoC: Intel: ssp-common: get codec tplg suffix function ASoC: SOF: Intel: support tplg suffix detection ASoC: Intel: sof_nau8825: mach cleanup for adl boards ASoC: Intel: sof_nau8825: mach cleanup for rpl boards ASoC: Intel: sof_nau8825: add mtl_nau8825_def for mtl boards ASoC: Intel: sof_rt5682: mach cleanup for tgl boards ASoC: Intel: sof_rt5682: mach cleanup for adl boards ASoC: Intel: sof_rt5682: mach cleanup for rpl boards ASoC: Intel: sof_rt5682: mach cleanup for mtl boards ASoC: Intel: sof_cs42l42: board id cleanup for adl boards ASoC: Intel: sof_cs42l42: mach cleanup for adl boards ASoC: Intel: sof_cs42l42: add rpl_cs42l42_def for rpl boards ASoC: Intel: sof_cs42l42: add mtl_cs42l42_def for mtl boards .../sound/soc-acpi-intel-ssp-common.h | 22 ++- include/sound/soc-acpi.h | 12 ++ sound/soc/intel/boards/Kconfig | 13 +- sound/soc/intel/boards/Makefile | 3 - sound/soc/intel/boards/sof_board_helpers.c | 15 +- sound/soc/intel/boards/sof_board_helpers.h | 6 +- sound/soc/intel/boards/sof_cirrus_common.h | 2 +- sound/soc/intel/boards/sof_cs42l42.c | 17 +- sound/soc/intel/boards/sof_maxim_common.h | 2 +- sound/soc/intel/boards/sof_nau8825.c | 7 + sound/soc/intel/boards/sof_nuvoton_common.h | 2 +- sound/soc/intel/boards/sof_realtek_common.h | 2 +- sound/soc/intel/boards/sof_ssp_common.c | 122 -------------- sound/soc/intel/common/Makefile | 2 + .../intel/common/soc-acpi-intel-adl-match.c | 139 ++++----------- .../intel/common/soc-acpi-intel-mtl-match.c | 52 +++--- .../intel/common/soc-acpi-intel-rpl-match.c | 90 ++++------ .../intel/common/soc-acpi-intel-ssp-common.c | 159 ++++++++++++++++++ .../intel/common/soc-acpi-intel-tgl-match.c | 50 ++---- sound/soc/sof/intel/hda.c | 82 +++++++++ 20 files changed, 423 insertions(+), 376 deletions(-) rename sound/soc/intel/boards/sof_ssp_common.h => include/sound/soc-acpi-intel-ssp-common.h (66%) delete mode 100644 sound/soc/intel/boards/sof_ssp_common.c create mode 100644 sound/soc/intel/common/soc-acpi-intel-ssp-common.c -- 2.40.1

2 19

[PATCH] ASoC: tas2781: mark dvc_tlv with __maybe_unused
by Gergo Koteles 29 Mar '24

29 Mar '24

Since we put dvc_tlv static variable to a header file it's copied to each module that includes the header. But not all of them are actually used it. Fix this W=1 build warning: include/sound/tas2781-tlv.h:18:35: warning: 'dvc_tlv' defined but not used [-Wunused-const-variable=] Reported-by: kernel test robot <lkp(a)intel.com> Closes: https://lore.kernel.org/oe-kbuild-all/202403290354.v0StnRpc-lkp@intel.com/ Fixes: ae065d0ce9e3 ("ALSA: hda/tas2781: remove digital gain kcontrol") Signed-off-by: Gergo Koteles <soyer(a)irl.hu> --- include/sound/tas2781-tlv.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/sound/tas2781-tlv.h b/include/sound/tas2781-tlv.h index 4038dd421150..1dc59005d241 100644 --- a/include/sound/tas2781-tlv.h +++ b/include/sound/tas2781-tlv.h @@ -15,7 +15,7 @@ #ifndef __TAS2781_TLV_H__ #define __TAS2781_TLV_H__ -static const DECLARE_TLV_DB_SCALE(dvc_tlv, -10000, 100, 0); +static const __maybe_unused DECLARE_TLV_DB_SCALE(dvc_tlv, -10000, 100, 0); static const DECLARE_TLV_DB_SCALE(amp_vol_tlv, 1100, 50, 0); #endif base-commit: 2d0401ee38d43ab0e4cdd02dfc9d402befb2b5c8 -- 2.44.0

2 1

[PATCH] dt-bindings: ti,pcm1681: Convert to dtschema
by Animesh Agarwal 29 Mar '24

29 Mar '24

Convert the Texas Instruments PCM1681 bindings to DT schema. Signed-off-by: Animesh Agarwal <animeshagarwal28(a)gmail.com> --- .../devicetree/bindings/sound/ti,pcm1681.txt | 15 -------- .../devicetree/bindings/sound/ti,pcm1681.yaml | 35 +++++++++++++++++++ 2 files changed, 35 insertions(+), 15 deletions(-) delete mode 100644 Documentation/devicetree/bindings/sound/ti,pcm1681.txt create mode 100644 Documentation/devicetree/bindings/sound/ti,pcm1681.yaml diff --git a/Documentation/devicetree/bindings/sound/ti,pcm1681.txt b/Documentation/devicetree/bindings/sound/ti,pcm1681.txt deleted file mode 100644 index 4df17185ab80..000000000000 --- a/Documentation/devicetree/bindings/sound/ti,pcm1681.txt +++ /dev/null @@ -1,15 +0,0 @@ -Texas Instruments PCM1681 8-channel PWM Processor - -Required properties: - - - compatible: Should contain "ti,pcm1681". - - reg: The i2c address. Should contain <0x4c>. - -Examples: - - i2c_bus { - pcm1681@4c { - compatible = "ti,pcm1681"; - reg = <0x4c>; - }; - }; diff --git a/Documentation/devicetree/bindings/sound/ti,pcm1681.yaml b/Documentation/devicetree/bindings/sound/ti,pcm1681.yaml new file mode 100644 index 000000000000..4093d0ff654d --- /dev/null +++ b/Documentation/devicetree/bindings/sound/ti,pcm1681.yaml @@ -0,0 +1,35 @@ +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/sound/ti,pcm1681.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Texas Instruments PCM1681 8-channel PWM Processor + +maintainers: + - Animesh Agarwal <animeshagarwal28(a)gmail.com> + +properties: + compatible: + const: ti,pcm1681 + + reg: + maxItems: 1 + +required: + - compatible + - reg + +additionalProperties: false + +examples: + - | + i2c { + #address-cells = <1>; + #size-cells = <0>; + + pcm1681@4c { + compatible = "ti,pcm1681"; + reg = <0x4c>; + }; + }; -- 2.44.0

2 2

[PATCH] ASoC: ops: Fix wraparound for mask in snd_soc_get_volsw
by Stephen Lee 29 Mar '24

29 Mar '24

In snd_soc_info_volsw(), mask is generated by figuring out the index of the most significant bit set in max and converting the index to a bitmask through bit shift 1. Unintended wraparound occurs when max is an integer value with msb bit set. Since the bit shift value 1 is treated as an integer type, the left shift operation will wraparound and set mask to 0 instead of all 1's. In order to fix this, we type cast 1 as `1ULL` to prevent the wraparound. Fixes: 7077148fb50a ("ASoC: core: Split ops out of soc-core.c") Signed-off-by: Stephen Lee <slee08177(a)gmail.com> --- This seems to show up in quite a few places in the alsa subsystem, should they be addressed altogether? --- sound/soc/soc-ops.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/soc/soc-ops.c b/sound/soc/soc-ops.c index 2d25748ca706..b27e89ff6a16 100644 --- a/sound/soc/soc-ops.c +++ b/sound/soc/soc-ops.c @@ -263,7 +263,7 @@ int snd_soc_get_volsw(struct snd_kcontrol *kcontrol, int max = mc->max; int min = mc->min; int sign_bit = mc->sign_bit; - unsigned int mask = (1 << fls(max)) - 1; + unsigned int mask = (1ULL << fls(max)) - 1; unsigned int invert = mc->invert; int val; int ret; -- 2.43.2

2 2

[PATCH 1/2] ASoC: amd: acp: fix for acp_init function error handling
by Vijendar Mukunda 28 Mar '24

28 Mar '24

If acp_init() fails, acp pci driver probe should return error. Add acp_init() function return value check logic. Fixes: e61b415515d3 ("ASoC: amd: acp: refactor the acp init and de-init sequence") Signed-off-by: Vijendar Mukunda <Vijendar.Mukunda(a)amd.com> --- sound/soc/amd/acp/acp-pci.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sound/soc/amd/acp/acp-pci.c b/sound/soc/amd/acp/acp-pci.c index 8c8b1dcac628..c1d4140f0746 100644 --- a/sound/soc/amd/acp/acp-pci.c +++ b/sound/soc/amd/acp/acp-pci.c @@ -115,7 +115,10 @@ static int acp_pci_probe(struct pci_dev *pci, const struct pci_device_id *pci_id goto unregister_dmic_dev; } - acp_init(chip); + ret = acp_init(chip); + if (ret) + return ret; + res = devm_kcalloc(&pci->dev, num_res, sizeof(struct resource), GFP_KERNEL); if (!res) { ret = -ENOMEM; -- 2.34.1

3 4

[PATCH] ASoC: hdac_hda: improve error logs
by Pierre-Louis Bossart 28 Mar '24

28 Mar '24

We have a couple of duplicate logs and missing information, add __func__ consistently and make sure useful error codes are logged. Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart(a)linux.intel.com> Reviewed-by: Bard Liao <yung-chuan.liao(a)linux.intel.com> Reviewed-by: Péter Ujfalusi <peter.ujfalusi(a)linux.intel.com> --- sound/soc/codecs/hdac_hda.c | 44 ++++++++++++++++++++----------------- 1 file changed, 24 insertions(+), 20 deletions(-) diff --git a/sound/soc/codecs/hdac_hda.c b/sound/soc/codecs/hdac_hda.c index 6aa3223985be..29c88de5508b 100644 --- a/sound/soc/codecs/hdac_hda.c +++ b/sound/soc/codecs/hdac_hda.c @@ -230,7 +230,8 @@ static int hdac_hda_dai_hw_params(struct snd_pcm_substream *substream, format_val = snd_hdac_stream_format(params_channels(params), bits, params_rate(params)); if (!format_val) { dev_err(dai->dev, - "invalid format_val, rate=%d, ch=%d, format=%d, maxbps=%d\n", + "%s: invalid format_val, rate=%d, ch=%d, format=%d, maxbps=%d\n", + __func__, params_rate(params), params_channels(params), params_format(params), maxbps); @@ -266,14 +267,12 @@ static int hdac_hda_dai_prepare(struct snd_pcm_substream *substream, struct snd_soc_component *component = dai->component; struct hda_pcm_stream *hda_stream; struct hdac_hda_priv *hda_pvt; - struct hdac_device *hdev; unsigned int format_val; struct hda_pcm *pcm; unsigned int stream; int ret = 0; hda_pvt = snd_soc_component_get_drvdata(component); - hdev = &hda_pvt->codec->core; pcm = snd_soc_find_pcm_from_dai(hda_pvt, dai); if (!pcm) return -EINVAL; @@ -286,7 +285,7 @@ static int hdac_hda_dai_prepare(struct snd_pcm_substream *substream, ret = snd_hda_codec_prepare(hda_pvt->codec, hda_stream, stream, format_val, substream); if (ret < 0) - dev_err(&hdev->dev, "codec prepare failed %d\n", ret); + dev_err(dai->dev, "%s: failed %d\n", __func__, ret); return ret; } @@ -298,6 +297,7 @@ static int hdac_hda_dai_open(struct snd_pcm_substream *substream, struct hdac_hda_priv *hda_pvt; struct hda_pcm_stream *hda_stream; struct hda_pcm *pcm; + int ret; hda_pvt = snd_soc_component_get_drvdata(component); pcm = snd_soc_find_pcm_from_dai(hda_pvt, dai); @@ -308,7 +308,11 @@ static int hdac_hda_dai_open(struct snd_pcm_substream *substream, hda_stream = &pcm->stream[substream->stream]; - return hda_stream->ops.open(hda_stream, hda_pvt->codec, substream); + ret = hda_stream->ops.open(hda_stream, hda_pvt->codec, substream); + if (ret < 0) + dev_err(dai->dev, "%s: failed %d\n", __func__, ret); + + return ret; } static void hdac_hda_dai_close(struct snd_pcm_substream *substream, @@ -367,7 +371,7 @@ static struct hda_pcm *snd_soc_find_pcm_from_dai(struct hdac_hda_priv *hda_pvt, pcm_name = "HDMI 3"; break; default: - dev_err(&hcodec->core.dev, "invalid dai id %d\n", dai->id); + dev_err(dai->dev, "%s: invalid dai id %d\n", __func__, dai->id); return NULL; } @@ -381,7 +385,7 @@ static struct hda_pcm *snd_soc_find_pcm_from_dai(struct hdac_hda_priv *hda_pvt, } } - dev_err(&hcodec->core.dev, "didn't find PCM for DAI %s\n", dai->name); + dev_err(dai->dev, "%s: didn't find PCM for DAI %s\n", __func__, dai->name); return NULL; } @@ -411,7 +415,7 @@ static int hdac_hda_codec_probe(struct snd_soc_component *component) hlink = snd_hdac_ext_bus_get_hlink_by_name(hdev->bus, dev_name(&hdev->dev)); if (!hlink) { - dev_err(&hdev->dev, "hdac link not found\n"); + dev_err(&hdev->dev, "%s: hdac link not found\n", __func__); return -EIO; } @@ -429,7 +433,7 @@ static int hdac_hda_codec_probe(struct snd_soc_component *component) ret = snd_hda_codec_device_new(hcodec->bus, component->card->snd_card, hdev->addr, hcodec, true); if (ret < 0) { - dev_err(&hdev->dev, "failed to create hda codec %d\n", ret); + dev_err(&hdev->dev, "%s: failed to create hda codec %d\n", __func__, ret); goto error_no_pm; } @@ -446,7 +450,7 @@ static int hdac_hda_codec_probe(struct snd_soc_component *component) if (fw) { ret = snd_hda_load_patch(hcodec->bus, fw->size, fw->data); if (ret < 0) { - dev_err(&hdev->dev, "failed to load hda patch %d\n", ret); + dev_err(&hdev->dev, "%s: failed to load hda patch %d\n", __func__, ret); goto error_no_pm; } release_firmware(fw); @@ -470,13 +474,13 @@ static int hdac_hda_codec_probe(struct snd_soc_component *component) ret = snd_hda_codec_set_name(hcodec, hcodec->preset->name); if (ret < 0) { - dev_err(&hdev->dev, "name failed %s\n", hcodec->preset->name); + dev_err(&hdev->dev, "%s: name failed %s\n", __func__, hcodec->preset->name); goto error_pm; } ret = snd_hdac_regmap_init(&hcodec->core); if (ret < 0) { - dev_err(&hdev->dev, "regmap init failed\n"); + dev_err(&hdev->dev, "%s: regmap init failed\n", __func__); goto error_pm; } @@ -484,16 +488,16 @@ static int hdac_hda_codec_probe(struct snd_soc_component *component) if (patch) { ret = patch(hcodec); if (ret < 0) { - dev_err(&hdev->dev, "patch failed %d\n", ret); + dev_err(&hdev->dev, "%s: patch failed %d\n", __func__, ret); goto error_regmap; } } else { - dev_dbg(&hdev->dev, "no patch file found\n"); + dev_dbg(&hdev->dev, "%s: no patch file found\n", __func__); } ret = snd_hda_codec_parse_pcms(hcodec); if (ret < 0) { - dev_err(&hdev->dev, "unable to map pcms to dai %d\n", ret); + dev_err(&hdev->dev, "%s: unable to map pcms to dai %d\n", __func__, ret); goto error_patch; } @@ -501,8 +505,8 @@ static int hdac_hda_codec_probe(struct snd_soc_component *component) if (!is_hdmi_codec(hcodec)) { ret = snd_hda_codec_build_controls(hcodec); if (ret < 0) { - dev_err(&hdev->dev, "unable to create controls %d\n", - ret); + dev_err(&hdev->dev, "%s: unable to create controls %d\n", + __func__, ret); goto error_patch; } } @@ -548,7 +552,7 @@ static void hdac_hda_codec_remove(struct snd_soc_component *component) hlink = snd_hdac_ext_bus_get_hlink_by_name(hdev->bus, dev_name(&hdev->dev)); if (!hlink) { - dev_err(&hdev->dev, "hdac link not found\n"); + dev_err(&hdev->dev, "%s: hdac link not found\n", __func__); return; } @@ -624,7 +628,7 @@ static int hdac_hda_dev_probe(struct hdac_device *hdev) /* hold the ref while we probe */ hlink = snd_hdac_ext_bus_get_hlink_by_name(hdev->bus, dev_name(&hdev->dev)); if (!hlink) { - dev_err(&hdev->dev, "hdac link not found\n"); + dev_err(&hdev->dev, "%s: hdac link not found\n", __func__); return -EIO; } snd_hdac_ext_bus_link_get(hdev->bus, hlink); @@ -640,7 +644,7 @@ static int hdac_hda_dev_probe(struct hdac_device *hdev) ARRAY_SIZE(hdac_hda_dais)); if (ret < 0) { - dev_err(&hdev->dev, "failed to register HDA codec %d\n", ret); + dev_err(&hdev->dev, "%s: failed to register HDA codec %d\n", __func__, ret); return ret; } -- 2.40.1

2 2

[tiwai-sound:for-linus 12/17] include/sound/tas2781-tlv.h:18:35: warning: 'dvc_tlv' defined but not used
by kernel test robot 28 Mar '24

28 Mar '24

tree: https://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git for-linus head: 2d0401ee38d43ab0e4cdd02dfc9d402befb2b5c8 commit: ae065d0ce9e36ca4efdfb9b96ce3395bd1c19372 [12/17] ALSA: hda/tas2781: remove digital gain kcontrol config: i386-allmodconfig (https://download.01.org/0day-ci/archive/20240329/202403290354.v0StnRpc-lkp@…) compiler: gcc-12 (Ubuntu 12.3.0-9ubuntu2) 12.3.0 reproduce (this is a W=1 build): (https://download.01.org/0day-ci/archive/20240329/202403290354.v0StnRpc-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/202403290354.v0StnRpc-lkp@intel.com/ All warnings (new ones prefixed by >>): In file included from include/sound/tlv.h:10, from sound/pci/hda/tas2781_hda_i2c.c:22: >> include/sound/tas2781-tlv.h:18:35: warning: 'dvc_tlv' defined but not used [-Wunused-const-variable=] 18 | static const DECLARE_TLV_DB_SCALE(dvc_tlv, -10000, 100, 0); | ^~~~~~~ include/uapi/sound/tlv.h:53:22: note: in definition of macro 'SNDRV_CTL_TLVD_DECLARE_DB_SCALE' 53 | unsigned int name[] = { \ | ^~~~ include/sound/tas2781-tlv.h:18:14: note: in expansion of macro 'DECLARE_TLV_DB_SCALE' 18 | static const DECLARE_TLV_DB_SCALE(dvc_tlv, -10000, 100, 0); | ^~~~~~~~~~~~~~~~~~~~ vim +/dvc_tlv +18 include/sound/tas2781-tlv.h 678f38eba1f2fe Shenghao Ding 2023-06-18 17 678f38eba1f2fe Shenghao Ding 2023-06-18 @18 static const DECLARE_TLV_DB_SCALE(dvc_tlv, -10000, 100, 0); 678f38eba1f2fe Shenghao Ding 2023-06-18 19 static const DECLARE_TLV_DB_SCALE(amp_vol_tlv, 1100, 50, 0); 678f38eba1f2fe Shenghao Ding 2023-06-18 20 :::::: The code at line 18 was first introduced by commit :::::: 678f38eba1f2fe33ff700e85390ac98393e609ef ASoC: tas2781: Add Header file for tas2781 driver :::::: TO: Shenghao Ding <13916275206(a)139.com> :::::: CC: Mark Brown <broonie(a)kernel.org> -- 0-DAY CI Kernel Test Service https://github.com/intel/lkp-tests/wiki

1 0

[PATCH] soundwire: qcom: Convert to platform remove callback returning void
by Uwe Kleine-König 28 Mar '24

28 Mar '24

The .remove() callback for a platform driver returns an int which makes many driver authors wrongly assume it's possible to do error handling by returning an error code. However the value returned is ignored (apart from emitting a warning) and this typically results in resource leaks. To improve here there is a quest to make the remove callback return void. In the first step of this quest all drivers are converted to .remove_new(), which already returns void. Eventually after all drivers are converted, .remove_new() will be renamed to .remove(). Trivially convert this driver from always returning zero in the remove callback to the void returning variant. Signed-off-by: Uwe Kleine-König <u.kleine-koenig(a)pengutronix.de> --- drivers/soundwire/qcom.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/drivers/soundwire/qcom.c b/drivers/soundwire/qcom.c index 3c4d6debab1f..fb70afe64fcc 100644 --- a/drivers/soundwire/qcom.c +++ b/drivers/soundwire/qcom.c @@ -1636,14 +1636,12 @@ static int qcom_swrm_probe(struct platform_device *pdev) return ret; } -static int qcom_swrm_remove(struct platform_device *pdev) +static void qcom_swrm_remove(struct platform_device *pdev) { struct qcom_swrm_ctrl *ctrl = dev_get_drvdata(&pdev->dev); sdw_bus_master_delete(&ctrl->bus); clk_disable_unprepare(ctrl->hclk); - - return 0; } static int __maybe_unused swrm_runtime_resume(struct device *dev) @@ -1769,7 +1767,7 @@ MODULE_DEVICE_TABLE(of, qcom_swrm_of_match); static struct platform_driver qcom_swrm_driver = { .probe = &qcom_swrm_probe, - .remove = &qcom_swrm_remove, + .remove_new = qcom_swrm_remove, .driver = { .name = "qcom-soundwire", .of_match_table = qcom_swrm_of_match, base-commit: 11afac187274a6177a7ac82997f8691c0f469e41 -- 2.43.0

2 1