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

[PATCH v3 0/4] ASoC: codecs: wcd934x: add Headset and button detection support
by Srinivas Kandagatla 03 Aug '21

03 Aug '21

This patchset adds support to MBHC(Multi Button Headset Control) block found in Qualcomm WCD codecs. MBHC support headset type detection, both Mechanical and electrical insert/removal detection along with 8 buttons detection, Over current interrupts on HPHL/R, Impedance Measurements on HPHL/R. Eventhough MBHC block supports things like OverCurrent detection, Currently its reported as a kernel debug message. Should this be reported as an uevent to userspace? like the way USB reports? Any suggestions? First patch adds a common mbhc driver and the second one wcd934x specific driver changes along with sdm845 soundcard related changes. Common wcd-mbhc-v2 driver should be reusable across multiple codecs like WCD9335, WCD934x, WCD937x and WCD938x. Most of the work is derived from downstream Qualcomm kernels. Credits to various Qualcomm authors from Patrick Lai's team who have contributed to this code. Changes since v2: - switched to EXPORT_SYMBOL_GPL from EXPORT_SYMBOL - converted one of the if else to switch case. Srinivas Kandagatla (4): ASoC: dt-bindings: wcd934x: add bindings for Headset Button detection ASoC: codecs: wcd: add multi button Headset detection support ASoC: codecs: wcd934x: add mbhc support ASoC: qcom: sdm845: add jack support for WCD934x .../bindings/sound/qcom,wcd934x.yaml | 30 + include/linux/mfd/wcd934x/registers.h | 57 + sound/soc/codecs/Kconfig | 4 + sound/soc/codecs/Makefile | 2 + sound/soc/codecs/wcd-mbhc-v2.c | 1475 +++++++++++++++++ sound/soc/codecs/wcd-mbhc-v2.h | 340 ++++ sound/soc/codecs/wcd934x.c | 884 +++++++++- sound/soc/qcom/sdm845.c | 8 + 8 files changed, 2785 insertions(+), 15 deletions(-) create mode 100644 sound/soc/codecs/wcd-mbhc-v2.c create mode 100644 sound/soc/codecs/wcd-mbhc-v2.h -- 2.21.0

3 6

[PATCH 0/7] ALSA/ASoC/SOF/SoundWire: fix Kconfig issues
by Pierre-Louis Bossart 28 Jul '21

28 Jul '21

In January, Intel kbuild bot and Arnd Bergmann reported multiple issues with randconfig. This patchset builds on Arnd's suggestions to a) expose ACPI and PCI devices in separate modules, while sof-acpi-dev and sof-pci-dev become helpers. This will result in minor changes required for developers/testers, i.e. modprobe snd-sof-pci will no longer result in a probe. The SOF CI was already updated to deal with this module dependency change and introduction of new modules. b) Fix SOF/SoundWire/DSP_config dependencies by moving the code required to detect SoundWire presence in ACPI tables to sound/hda. Integration note: This patchset touches directories maintained by Vinod, Takashi and Mark in separate trees, and will impact additional changes to use the auxiliary bus in drivers/soundwire/. I can think of two options, both of which are fine: 1. Mark merges the patches with Vinod and Takashi Acked-by tags, then Mark provides an immutable tag to Vinod. 2. Vinod merges the patches with Mark and Takashi Acked-by tags, then Vinod provides an immutable tag to Mark Acknowledgements: Thanks to Arnd for suggesting fixes and testing these patches with more randconfigs. Thanks to Vinod Koul for his feedback on the move of this common helper to sound/hda/ Arnd Bergmann (1): ASoC: SOF: ACPI: avoid reverse module dependency Pierre-Louis Bossart (6): ASoC: soc-acpi: allow for partial match in parent name ASoC: SOF: pci: split PCI into different drivers ASoC: SOF: pci: move DSP_CONFIG use to platform-specific drivers ASoC: SOF: Intel: SoundWire: simplify Kconfig ALSA: hda: move Intel SoundWire ACPI scan to dedicated module ALSA: hda: intel-sdw-acpi: add missing include files drivers/soundwire/intel.h | 2 - drivers/soundwire/intel_init.c | 158 ------------- include/linux/soundwire/sdw_intel.h | 2 + include/sound/soc-acpi.h | 2 +- sound/hda/Kconfig | 4 + sound/hda/Makefile | 3 + sound/hda/intel-dsp-config.c | 2 +- sound/hda/intel-sdw-acpi.c | 179 +++++++++++++++ sound/soc/sof/Kconfig | 15 +- sound/soc/sof/Makefile | 4 +- sound/soc/sof/intel/Kconfig | 254 +++++++-------------- sound/soc/sof/intel/Makefile | 20 +- sound/soc/sof/intel/bdw.c | 67 +++++- sound/soc/sof/intel/byt.c | 106 ++++++++- sound/soc/sof/intel/hda.c | 18 ++ sound/soc/sof/intel/hda.h | 3 + sound/soc/sof/intel/pci-apl.c | 81 +++++++ sound/soc/sof/intel/pci-cnl.c | 104 +++++++++ sound/soc/sof/intel/pci-icl.c | 84 +++++++ sound/soc/sof/intel/pci-tgl.c | 121 ++++++++++ sound/soc/sof/intel/pci-tng.c | 70 ++++++ sound/soc/sof/intel/shim.h | 6 - sound/soc/sof/sof-acpi-dev.c | 130 +---------- sound/soc/sof/sof-acpi-dev.h | 16 ++ sound/soc/sof/sof-pci-dev.c | 340 +--------------------------- sound/soc/sof/sof-pci-dev.h | 17 ++ 26 files changed, 998 insertions(+), 810 deletions(-) create mode 100644 sound/hda/intel-sdw-acpi.c create mode 100644 sound/soc/sof/intel/pci-apl.c create mode 100644 sound/soc/sof/intel/pci-cnl.c create mode 100644 sound/soc/sof/intel/pci-icl.c create mode 100644 sound/soc/sof/intel/pci-tgl.c create mode 100644 sound/soc/sof/intel/pci-tng.c create mode 100644 sound/soc/sof/sof-acpi-dev.h create mode 100644 sound/soc/sof/sof-pci-dev.h -- 2.25.1

5 20

[PATCH] ASoC: amd: Don't show messages about deferred probing by default
by Mario Limonciello 21 Jul '21

21 Jul '21

Nearly every boot with a Lenovo P14s is showing acp_pdm_mach acp_pdm_mach.0: snd_soc_register_card(acp) failed: -517 This isn't useful to a user, especially as probing will run again. Downgrade the message to debug, and only show errors. CC: markpearson(a)lenovo.com Signed-off-by: Mario Limonciello <mario.limonciello(a)amd.com> --- sound/soc/amd/renoir/acp3x-rn.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/sound/soc/amd/renoir/acp3x-rn.c b/sound/soc/amd/renoir/acp3x-rn.c index 306134b89a82..e785994de614 100644 --- a/sound/soc/amd/renoir/acp3x-rn.c +++ b/sound/soc/amd/renoir/acp3x-rn.c @@ -54,9 +54,14 @@ static int acp_probe(struct platform_device *pdev) snd_soc_card_set_drvdata(card, machine); ret = devm_snd_soc_register_card(&pdev->dev, card); if (ret) { - dev_err(&pdev->dev, - "snd_soc_register_card(%s) failed: %d\n", - acp_card.name, ret); + if (ret != -EPROBE_DEFER) + dev_err(&pdev->dev, + "snd_soc_register_card(%s) failed: %d\n", + card->name, ret); + else + dev_dbg(&pdev->dev, + "snd_soc_register_card(%s) probe deferred: %d\n", + card->name, ret); return ret; } return 0; -- 2.25.1

2 1

[PATCH] ASoC: Intel: Handle device properties with software node API
by Heikki Krogerus 16 Jul '21

16 Jul '21

The function device_add_properties() is going to be removed. Replacing it with software node API equivalents. Signed-off-by: Heikki Krogerus <heikki.krogerus(a)linux.intel.com> --- Hi, This patch depends on a fix from mainline, available in v5.12-rc4: 2a92c90f2ecc ("software node: Fix device_add_software_node()") Cheers, --- sound/soc/intel/boards/bytcht_es8316.c | 2 +- sound/soc/intel/boards/bytcr_rt5640.c | 2 +- sound/soc/intel/boards/bytcr_rt5651.c | 2 +- sound/soc/intel/boards/sof_sdw_rt711.c | 20 +++++++++++++++----- sound/soc/intel/boards/sof_sdw_rt711_sdca.c | 20 +++++++++++++++----- 5 files changed, 33 insertions(+), 13 deletions(-) diff --git a/sound/soc/intel/boards/bytcht_es8316.c b/sound/soc/intel/boards/bytcht_es8316.c index 06df2d46d910b..4a9817a95928c 100644 --- a/sound/soc/intel/boards/bytcht_es8316.c +++ b/sound/soc/intel/boards/bytcht_es8316.c @@ -544,7 +544,7 @@ static int snd_byt_cht_es8316_mc_probe(struct platform_device *pdev) props[cnt++] = PROPERTY_ENTRY_BOOL("everest,jack-detect-inverted"); if (cnt) { - ret = device_add_properties(codec_dev, props); + ret = device_create_managed_software_node(codec_dev, props, NULL); if (ret) { put_device(codec_dev); return ret; diff --git a/sound/soc/intel/boards/bytcr_rt5640.c b/sound/soc/intel/boards/bytcr_rt5640.c index 59d6d47c8d829..661dad81e5bce 100644 --- a/sound/soc/intel/boards/bytcr_rt5640.c +++ b/sound/soc/intel/boards/bytcr_rt5640.c @@ -918,7 +918,7 @@ static int byt_rt5640_add_codec_device_props(const char *i2c_dev_name) if (byt_rt5640_quirk & BYT_RT5640_JD_NOT_INV) props[cnt++] = PROPERTY_ENTRY_BOOL("realtek,jack-detect-not-inverted"); - ret = device_add_properties(i2c_dev, props); + ret = device_create_managed_software_node(i2c_dev, props, NULL); put_device(i2c_dev); return ret; diff --git a/sound/soc/intel/boards/bytcr_rt5651.c b/sound/soc/intel/boards/bytcr_rt5651.c index 148b7b1bd3e8c..4cb6ef4c3a3d9 100644 --- a/sound/soc/intel/boards/bytcr_rt5651.c +++ b/sound/soc/intel/boards/bytcr_rt5651.c @@ -547,7 +547,7 @@ static int byt_rt5651_add_codec_device_props(struct device *i2c_dev) if (byt_rt5651_quirk & BYT_RT5651_JD_NOT_INV) props[cnt++] = PROPERTY_ENTRY_BOOL("realtek,jack-detect-not-inverted"); - return device_add_properties(i2c_dev, props); + return device_create_managed_software_node(i2c_dev, props, NULL); } static int byt_rt5651_init(struct snd_soc_pcm_runtime *runtime) diff --git a/sound/soc/intel/boards/sof_sdw_rt711.c b/sound/soc/intel/boards/sof_sdw_rt711.c index 04074c09dded9..b7c635c0fadd5 100644 --- a/sound/soc/intel/boards/sof_sdw_rt711.c +++ b/sound/soc/intel/boards/sof_sdw_rt711.c @@ -24,19 +24,29 @@ static int rt711_add_codec_device_props(const char *sdw_dev_name) { struct property_entry props[MAX_NO_PROPS] = {}; + struct fwnode_handle *fwnode; struct device *sdw_dev; int ret; + if (!SOF_RT711_JDSRC(sof_sdw_quirk)) + return 0; + sdw_dev = bus_find_device_by_name(&sdw_bus_type, NULL, sdw_dev_name); if (!sdw_dev) return -EPROBE_DEFER; - if (SOF_RT711_JDSRC(sof_sdw_quirk)) { - props[0] = PROPERTY_ENTRY_U32("realtek,jd-src", - SOF_RT711_JDSRC(sof_sdw_quirk)); + props[0] = PROPERTY_ENTRY_U32("realtek,jd-src", + SOF_RT711_JDSRC(sof_sdw_quirk)); + + fwnode = fwnode_create_software_node(props, NULL); + if (IS_ERR(fwnode)) { + put_device(sdw_dev); + return PTR_ERR(fwnode); } - ret = device_add_properties(sdw_dev, props); + ret = device_add_software_node(sdw_dev, to_software_node(fwnode)); + + fwnode_handle_put(fwnode); put_device(sdw_dev); return ret; @@ -144,7 +154,7 @@ int sof_sdw_rt711_exit(struct device *dev, struct snd_soc_dai_link *dai_link) if (!sdw_dev) return -EINVAL; - device_remove_properties(sdw_dev); + device_remove_software_node(sdw_dev); put_device(sdw_dev); return 0; diff --git a/sound/soc/intel/boards/sof_sdw_rt711_sdca.c b/sound/soc/intel/boards/sof_sdw_rt711_sdca.c index 19496f0f9110c..300a52d155069 100644 --- a/sound/soc/intel/boards/sof_sdw_rt711_sdca.c +++ b/sound/soc/intel/boards/sof_sdw_rt711_sdca.c @@ -24,19 +24,29 @@ static int rt711_sdca_add_codec_device_props(const char *sdw_dev_name) { struct property_entry props[MAX_NO_PROPS] = {}; + struct fwnode_handle *fwnode; struct device *sdw_dev; int ret; + if (!SOF_RT711_JDSRC(sof_sdw_quirk)) + return 0; + sdw_dev = bus_find_device_by_name(&sdw_bus_type, NULL, sdw_dev_name); if (!sdw_dev) return -EPROBE_DEFER; - if (SOF_RT711_JDSRC(sof_sdw_quirk)) { - props[0] = PROPERTY_ENTRY_U32("realtek,jd-src", - SOF_RT711_JDSRC(sof_sdw_quirk)); + props[0] = PROPERTY_ENTRY_U32("realtek,jd-src", + SOF_RT711_JDSRC(sof_sdw_quirk)); + + fwnode = fwnode_create_software_node(props, NULL); + if (IS_ERR(fwnode)) { + put_device(sdw_dev); + return PTR_ERR(fwnode); } - ret = device_add_properties(sdw_dev, props); + ret = device_add_software_node(sdw_dev, to_software_node(fwnode)); + + fwnode_handle_put(fwnode); put_device(sdw_dev); return ret; @@ -144,7 +154,7 @@ int sof_sdw_rt711_sdca_exit(struct device *dev, struct snd_soc_dai_link *dai_lin if (!sdw_dev) return -EINVAL; - device_remove_properties(sdw_dev); + device_remove_software_node(sdw_dev); put_device(sdw_dev); return 0; -- 2.30.2

2 8

[PATCH 0/8] ASoC: SOF: power optimizations for HDaudio platforms
by Pierre-Louis Bossart 13 Jul '21

13 Jul '21

This patchset provides two optimizations that result in significant power savings on Intel HDAudio platforms using SOF (Sound Open Firmware). a) We previously prevented the Intel DSP from enabling the DMI_L1 capability to work-around issues with pause on capture streams. It turns out that this also prevented the platform from entering high C states in full-duplex usages such as videoconferencing - a rather basic use case since the start of the pandemic. The support for pause_push/release was already a bit controversial for Intel platforms, in theory platforms should only enable PAUSE if they can resume on the same sample, which is not the case on any Intel platform. Since we didn't want to disable a capability that could impact existing users, the suggestion is to optionally disable pause_push/release at build time or via a kernel parameter, in which case DMI_L1 is enabled. In practice very few applications make use of pause_push/release so there should be a limited impact when disabling this ALSA capability. b) The use of the SPIB register also helps reduce power consumption, though to a smaller degree than DMI_L1. This hardware capability is however incompatible with userspace-initiated rewinds typically used by PulseAudio. In the past (2015..2017) Intel suggested an API extension to let applications disable rewinds. At the time the feedback was that such a capability was too Intel-specific and SPIB remained unused except for loading DSP code. We now see devices with smaller batteries being released, and it's time to revisit Linux support for SPIB to extend battery life. In this update the rewinds are disabled either at build-time or via a kernel parameter. As suggested by Takashi, a new SDNDRV_PCM_INFO flag is needed though to make sure the appl_ptr value is provided to the driver through the .ack callback. Distributions using PipeWire (Fedora34) and CRAS (ChromeOS/Chromium) can safely enable this option. Distributions using PulseAudio should probably avoid enabling it, although nothing is really fundamentally broken if they do. While in theory volume updates and mixing of notifications could be delayed, in practice distributions use small ring buffers that make such delays difficult to notice. Again both of these updates are opt-in to avoid any impact on existing solutions or users: someone updating their kernel source but using 'make olddefconfig' will see the same results. Distributions that care neither about pause_push/release or rewinds should enable both options, in case of issues users will still be able to override these build-time choices with a simple module parameter. Pierre-Louis Bossart (6): ASoC: SOF: Intel: Kconfig: clarify DMI L1 option description ASoC: SOF: Intel: simplify logic for DMI_L1 handling ASoC: SOF: pcm: add mechanisms to disable ALSA pause_push/release ASoC: SOF: Intel: add kernel parameter to set DMI L1 configuration ASoC: SOF: Intel: enable DMI L1 when pause is not supported ALSA: pcm: conditionally avoid mmap of control data Ranjani Sridharan (2): ASOC: SOF: pcm: add .ack callback support ASoC: SOF: Intel: add .ack support for HDaudio platforms include/sound/hdaudio_ext.h | 5 ++- include/uapi/sound/asound.h | 1 + sound/core/pcm_native.c | 17 ++++++++ sound/soc/sof/Kconfig | 9 ++++ sound/soc/sof/intel/Kconfig | 14 +++--- sound/soc/sof/intel/apl.c | 1 + sound/soc/sof/intel/cnl.c | 1 + sound/soc/sof/intel/hda-pcm.c | 74 ++++++++++++++++++++++++++++++-- sound/soc/sof/intel/hda-stream.c | 13 +++--- sound/soc/sof/intel/hda.h | 1 + sound/soc/sof/intel/tgl.c | 1 + sound/soc/sof/ops.h | 10 +++++ sound/soc/sof/pcm.c | 16 +++++++ sound/soc/sof/sof-priv.h | 3 ++ 14 files changed, 148 insertions(+), 18 deletions(-) -- 2.25.1

3 20

[PATCH 1/3] ASoC: wm_adsp: Correct wm_coeff_tlv_get handling
by Charles Keepax 13 Jul '21

13 Jul '21

When wm_coeff_tlv_get was updated it was accidentally switch to the _raw version of the helper causing it to ignore the current DSP state it should be checking. Switch the code back to the correct helper so that users can't read the controls when they arn't available. Fixes: 73ecf1a673d3 ("ASoC: wm_adsp: Correct cache handling of new kernel control API") Signed-off-by: Charles Keepax <ckeepax(a)opensource.cirrus.com> --- sound/soc/codecs/wm_adsp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/soc/codecs/wm_adsp.c b/sound/soc/codecs/wm_adsp.c index 37aa020f23f63..59d876d36cfd8 100644 --- a/sound/soc/codecs/wm_adsp.c +++ b/sound/soc/codecs/wm_adsp.c @@ -1213,7 +1213,7 @@ static int wm_coeff_tlv_get(struct snd_kcontrol *kctl, mutex_lock(&ctl->dsp->pwr_lock); - ret = wm_coeff_read_ctrl_raw(ctl, ctl->cache, size); + ret = wm_coeff_read_ctrl(ctl, ctl->cache, size); if (!ret && copy_to_user(bytes, ctl->cache, size)) ret = -EFAULT; -- 2.11.0

2 6

[PATCH -next 0/2] Fix unbalanced pm_runtime_enable in error handle
by Zhang Qilong 12 Jul '21

12 Jul '21

This two patches fixed the unbalanced PM disable depth. It could avoid pm_runtime implementation complains when removing and probing again the driver. Zhang Qilong (2): ASoC: mediatek: mt8192:Fix Unbalanced pm_runtime_enable in mt8192_afe_pcm_dev_probe ASoC: mediatek: mt8183: Fix Unbalanced pm_runtime_enable in mt8183_afe_pcm_dev_probe sound/soc/mediatek/mt8183/mt8183-afe-pcm.c | 43 ++++++++++++++-------- sound/soc/mediatek/mt8192/mt8192-afe-pcm.c | 27 +++++++++----- 2 files changed, 44 insertions(+), 26 deletions(-) -- 2.31.1

2 3

[PATCH] ASoC: codecs: wcd938x: fix returnvar.cocci warnings
by kernel test robot 12 Jul '21

12 Jul '21

From: kernel test robot <lkp(a)intel.com> sound/soc/codecs/wcd938x.c:1628:5-8: Unneeded variable: "ret". Return "0" on line 1656 sound/soc/codecs/wcd938x.c:1871:5-8: Unneeded variable: "ret". Return "0" on line 1907 Remove unneeded variable used to store return value. Generated by: scripts/coccinelle/misc/returnvar.cocci Fixes: 045442228868 ("ASoC: codecs: wcd938x: add audio routing and Kconfig") CC: Srinivas Kandagatla <srinivas.kandagatla(a)linaro.org> Reported-by: kernel test robot <lkp(a)intel.com> Signed-off-by: kernel test robot <lkp(a)intel.com> --- tree: https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git master head: 73748627df83aab934c81332ca83a44ab8c7b3e3 commit: 04544222886881cb0865040dcdf747fe7e025947 [8525/14055] ASoC: codecs: wcd938x: add audio routing and Kconfig :::::: branch date: 4 hours ago :::::: commit date: 2 weeks ago wcd938x.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) --- a/sound/soc/codecs/wcd938x.c +++ b/sound/soc/codecs/wcd938x.c @@ -1625,7 +1625,6 @@ static int wcd938x_codec_aux_dac_event(s { struct snd_soc_component *component = snd_soc_dapm_to_component(w->dapm); struct wcd938x_priv *wcd938x = snd_soc_component_get_drvdata(component); - int ret = 0; switch (event) { case SND_SOC_DAPM_PRE_PMU: @@ -1653,7 +1652,7 @@ static int wcd938x_codec_aux_dac_event(s WCD938X_ANA_RX_DIV4_CLK_EN_MASK, 0); break; } - return ret; + return 0; } @@ -1868,7 +1867,6 @@ static int wcd938x_codec_enable_aux_pa(s struct snd_soc_component *component = snd_soc_dapm_to_component(w->dapm); struct wcd938x_priv *wcd938x = snd_soc_component_get_drvdata(component); int hph_mode = wcd938x->hph_mode; - int ret = 0; switch (event) { case SND_SOC_DAPM_PRE_PMU: @@ -1904,7 +1902,7 @@ static int wcd938x_codec_enable_aux_pa(s WCD938X_EN_CUR_DET_MASK, 1); break; } - return ret; + return 0; } static int wcd938x_codec_enable_ear_pa(struct snd_soc_dapm_widget *w,

3 2

[PATCH 0/4] ASoC: Intel: machine driver corrections
by Pierre-Louis Bossart 12 Jul '21

12 Jul '21

The first fix solves an underflow in SoundWire platforms using the max98373 amplifier, the rest of the patches are minor corrections in machine drivers. The fix should be queued for the 5.14 cycle, the rest should be harmless but can be deferred for 5.15 if it's too late already. Brent Lu (2): ASoC: SOF: add a helper to get topology configured bclk ASoC: Intel: sof_cs42l42: use helper function to get bclk frequency Gongjun Song (1): ASoC: Intel: soc-acpi: add support for SoundWire of TGL-H-RVP Rander Wang (1): ASoC: Intel: boards: fix xrun issue on platform with max98373 include/sound/sof.h | 1 + sound/soc/intel/boards/sof_cs42l42.c | 8 +- sound/soc/intel/boards/sof_sdw_max98373.c | 81 ++++++++++++------- .../intel/common/soc-acpi-intel-tgl-match.c | 15 ++++ sound/soc/sof/sof-audio.c | 42 ++++++++-- 5 files changed, 111 insertions(+), 36 deletions(-) -- 2.25.1

2 6

[PATCH] ASoC: fsl_xcvr: Omit superfluous error message in fsl_xcvr_probe()
by Tang Bin 12 Jul '21

12 Jul '21

In the function fsl_xcvr__probe(), when get irq failed, the function platform_get_irq() logs an error message, so remove redundant message here. Signed-off-by: Tang Bin <tangbin(a)cmss.chinamobile.com> --- sound/soc/fsl/fsl_xcvr.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/sound/soc/fsl/fsl_xcvr.c b/sound/soc/fsl/fsl_xcvr.c index 5e8284db857b..711d738f8de1 100644 --- a/sound/soc/fsl/fsl_xcvr.c +++ b/sound/soc/fsl/fsl_xcvr.c @@ -1190,10 +1190,8 @@ static int fsl_xcvr_probe(struct platform_device *pdev) /* get IRQs */ irq = platform_get_irq(pdev, 0); - if (irq < 0) { - dev_err(dev, "no irq[0]: %d\n", irq); + if (irq < 0) return irq; - } ret = devm_request_irq(dev, irq, irq0_isr, 0, pdev->name, xcvr); if (ret) { -- 2.18.2

2 1