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

[PATCH] ASoC: SOF: Replace zero-length array with flexible-array member
by Stephen Kitt 17 Feb '22

17 Feb '22

There is a regular need in the kernel to provide a way to declare having a dynamically sized set of trailing elements in a structure. Kernel code should always use "flexible array members"[1] for these cases. The older style of one-element or zero-length arrays should no longer be used[2]. This helps with the ongoing efforts to globally enable -Warray-bounds and get us closer to being able to tighten the FORTIFY_SOURCE routines on memcpy(). [1] https://en.wikipedia.org/wiki/Flexible_array_member [2] https://www.kernel.org/doc/html/latest/process/deprecated.html#zero-length-… Link: https://github.com/KSPP/linux/issues/78 Link: https://github.com/KSPP/linux/issues/180 Suggested-by: Gustavo A. R. Silva <gustavoars(a)kernel.org> Signed-off-by: Stephen Kitt <steve(a)sk2.org> --- include/sound/sof/topology.h | 2 +- sound/soc/sof/topology.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/include/sound/sof/topology.h b/include/sound/sof/topology.h index d12736e14b69..adee6afd1490 100644 --- a/include/sound/sof/topology.h +++ b/include/sound/sof/topology.h @@ -237,7 +237,7 @@ struct sof_ipc_comp_process { /* reserved for future use */ uint32_t reserved[7]; - uint8_t data[0]; + uint8_t data[]; } __packed; /* frees components, buffers and pipelines diff --git a/sound/soc/sof/topology.c b/sound/soc/sof/topology.c index e72dcae5e7ee..1d119d1dd69d 100644 --- a/sound/soc/sof/topology.c +++ b/sound/soc/sof/topology.c @@ -2164,7 +2164,7 @@ static int sof_process_load(struct snd_soc_component *scomp, int index, */ if (ipc_data_size) { for (i = 0; i < widget->num_kcontrols; i++) { - memcpy(&process->data + offset, + memcpy(&process->data[offset], wdata[i].pdata->data, wdata[i].pdata->size); offset += wdata[i].pdata->size; base-commit: f71077a4d84bbe8c7b91b7db7c4ef815755ac5e3 -- 2.27.0

4 3

ucm2: sof-essx8336: initial support
by GitHub pull_request - opened 17 Feb '22

17 Feb '22

alsa-project/alsa-ucm-conf pull request #139 was opened from plbossart: Loosely based on the sof-hda-dsp model for DMIC conditional handling. Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart(a)linux.intel.com> Request URL : https://github.com/alsa-project/alsa-ucm-conf/pull/139 Patch URL : https://github.com/alsa-project/alsa-ucm-conf/pull/139.patch Repository URL: https://github.com/alsa-project/alsa-ucm-conf

1 0

[PATCH v2] ASoC: SOF: core: unregister clients and machine drivers in .shutdown
by Kai Vehmanen 17 Feb '22

17 Feb '22

From: Pierre-Louis Bossart <pierre-louis.bossart(a)linux.intel.com> On a platform shutdown, the expectation for most drivers is that userspace tasks will release all resources. When those sequences do not complete, it can be the case that PCM devices exposed by ALSA cards are used *after* the DSP shutdown completes, leading to a platform hang. When the clients and machine drivers provide an _unregister callback, let's invoke it in the shutdown sequence. Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart(a)linux.intel.com> Reviewed-by: Kai Vehmanen <kai.vehmanen(a)linux.intel.com> Reviewed-by: Ranjani Sridharan <ranjani.sridharan(a)linux.intel.com> Signed-off-by: Kai Vehmanen <kai.vehmanen(a)linux.intel.com> --- sound/soc/sof/core.c | 9 +++++++++ 1 file changed, 9 insertions(+) V1->V2: - correct patch title to have "ASoC: SOF: " prefix (reported by Amadeusz) diff --git a/sound/soc/sof/core.c b/sound/soc/sof/core.c index d99ecbb4282d..2a35d8ddf43e 100644 --- a/sound/soc/sof/core.c +++ b/sound/soc/sof/core.c @@ -463,10 +463,19 @@ EXPORT_SYMBOL(snd_sof_device_remove); int snd_sof_device_shutdown(struct device *dev) { struct snd_sof_dev *sdev = dev_get_drvdata(dev); + struct snd_sof_pdata *pdata = sdev->pdata; if (IS_ENABLED(CONFIG_SND_SOC_SOF_PROBE_WORK_QUEUE)) cancel_work_sync(&sdev->probe_work); + /* + * make sure clients and machine driver(s) are unregistered to force + * all userspace devices to be closed prior to the DSP shutdown sequence + */ + sof_unregister_clients(sdev); + + snd_sof_machine_unregister(sdev, pdata); + if (sdev->fw_state == SOF_FW_BOOT_COMPLETE) return snd_sof_shutdown(sdev); base-commit: f7d344a2bd5ec81fbd1ce76928fd059e57ec9bea -- 2.35.1

3 2

[PATCH] ASoC: codec: wcd938x: Update CTIA/OMTP switch control
by Srinivasa Rao Mandadapu 17 Feb '22

17 Feb '22

Convert gpio api's to gpio descriptor api's in CTIA/OMTP switch control. Remove redundant NULL checks in swap_gnd_mic function. Fixes: 013cc2aea0f6 ("ASoC: codec: wcd938x: Add switch control for selecting CTIA/OMTP Headset") Signed-off-by: Srinivasa Rao Mandadapu <quic_srivasam(a)quicinc.com> Co-developed-by: Venkata Prasad Potturu <quic_potturu(a)quicinc.com> Signed-off-by: Venkata Prasad Potturu <quic_potturu(a)quicinc.com> --- sound/soc/codecs/wcd938x.c | 33 +++++++++++---------------------- 1 file changed, 11 insertions(+), 22 deletions(-) diff --git a/sound/soc/codecs/wcd938x.c b/sound/soc/codecs/wcd938x.c index 08d16a9..88a39e1 100644 --- a/sound/soc/codecs/wcd938x.c +++ b/sound/soc/codecs/wcd938x.c @@ -6,6 +6,7 @@ #include <linux/platform_device.h> #include <linux/device.h> #include <linux/delay.h> +#include <linux/gpio/consumer.h> #include <linux/kernel.h> #include <linux/pm_runtime.h> #include <linux/component.h> @@ -194,7 +195,7 @@ struct wcd938x_priv { int ear_rx_path; int variant; int reset_gpio; - int us_euro_gpio; + struct gpio_desc *us_euro_gpio; u32 micb1_mv; u32 micb2_mv; u32 micb3_mv; @@ -4203,22 +4204,11 @@ static bool wcd938x_swap_gnd_mic(struct snd_soc_component *component, bool activ struct wcd938x_priv *wcd938x; - if (!component) { - dev_err(component->dev, "%s component is NULL\n", __func__); - return false; - } - wcd938x = snd_soc_component_get_drvdata(component); - if (!wcd938x) { - dev_err(component->dev, "%s private data is NULL\n", __func__); - return false; - } - value = gpio_get_value(wcd938x->us_euro_gpio); + value = gpiod_get_value(wcd938x->us_euro_gpio); - gpio_set_value(wcd938x->us_euro_gpio, !value); - /* 20us sleep required after changing the gpio state*/ - usleep_range(20, 30); + gpiod_set_value(wcd938x->us_euro_gpio, !value); return true; } @@ -4236,16 +4226,15 @@ static int wcd938x_populate_dt_data(struct wcd938x_priv *wcd938x, struct device return wcd938x->reset_gpio; } - wcd938x->us_euro_gpio = of_get_named_gpio(dev->of_node, "us-euro-gpios", 0); - if (wcd938x->us_euro_gpio < 0) { - dev_err(dev, "Failed to get us-euro-gpios gpio: err = %d\n", wcd938x->us_euro_gpio); - } else { - cfg->swap_gnd_mic = wcd938x_swap_gnd_mic; - gpio_direction_output(wcd938x->us_euro_gpio, 0); - /* 20us sleep required after pulling the reset gpio to LOW */ - usleep_range(20, 30); + wcd938x->us_euro_gpio = devm_gpiod_get_optional(dev, "us-euro", + GPIOD_OUT_LOW); + if (IS_ERR(wcd938x->us_euro_gpio)) { + dev_err(dev, "us-euro swap Control GPIO not found\n"); + return PTR_ERR(wcd938x->us_euro_gpio); } + cfg->swap_gnd_mic = wcd938x_swap_gnd_mic; + wcd938x->supplies[0].supply = "vdd-rxtx"; wcd938x->supplies[1].supply = "vdd-io"; wcd938x->supplies[2].supply = "vdd-buck"; -- 2.7.4

2 1

[PATCH 00/15] ASoC: mediatek: Add support for MT8186 SoC
by Jiaxin Yu 17 Feb '22

17 Feb '22

This series of patches adds support for Mediatek AFE of MT8186 Soc. Patches are based on broonie tree "for-next" branch. Jiaxin Yu (15): ASoC: mediatek: mt6366: add codec driver ASoC: mediatek: mt8186: support audsys clock control ASoC: mediatek: mt8186: support adda in platform driver ASoC: mediatek: mt8186: support hostless in platform driver ASoC: mediatek: mt8186: support hw gain in platform driver ASoC: mediatek: mt8186: support i2s in platform driver ASoC: mediatek: mt8186: support pcm in platform driver ASoC: mediatek: mt8186: support src in platform driver ASoC: mediatek: mt8186: support tdm in platform driver ASoC: mediatek: mt8186: add platform driver dt-bindings: mediatek: mt8186: add audio afe document ASoC: mediatek: mt8186: add machine driver with mt6366, da7219 and max98357 dt-bindings: mediatek: mt8186: add mt8186-mt6366-da7219-max98357 document ASoC: mediatek: mt8186: add machine driver with mt6366, rt1019 and rt5682 dt-bindings: mediatek: mt8186: add mt8186-mt6366-rt1019-rt5682 document .../bindings/sound/mt8186-afe-pcm.yaml | 175 + .../sound/mt8186-mt6366-da7219-max98357.yaml | 47 + .../sound/mt8186-mt6366-rt1019-rt5682.yaml | 47 + sound/soc/codecs/Kconfig | 8 + sound/soc/codecs/Makefile | 2 + sound/soc/mediatek/Kconfig | 44 + sound/soc/mediatek/Makefile | 1 + sound/soc/mediatek/mt8186/Makefile | 21 + sound/soc/mediatek/mt8186/mt8186-afe-clk.c | 719 ++++ sound/soc/mediatek/mt8186/mt8186-afe-clk.h | 210 + sound/soc/mediatek/mt8186/mt8186-afe-common.h | 245 ++ .../soc/mediatek/mt8186/mt8186-afe-control.c | 262 ++ sound/soc/mediatek/mt8186/mt8186-afe-gpio.c | 211 + sound/soc/mediatek/mt8186/mt8186-afe-gpio.h | 19 + sound/soc/mediatek/mt8186/mt8186-afe-pcm.c | 3030 +++++++++++++++ sound/soc/mediatek/mt8186/mt8186-audsys-clk.c | 151 + sound/soc/mediatek/mt8186/mt8186-audsys-clk.h | 15 + .../soc/mediatek/mt8186/mt8186-audsys-clkid.h | 45 + sound/soc/mediatek/mt8186/mt8186-dai-adda.c | 897 +++++ .../soc/mediatek/mt8186/mt8186-dai-hostless.c | 296 ++ .../soc/mediatek/mt8186/mt8186-dai-hw-gain.c | 246 ++ sound/soc/mediatek/mt8186/mt8186-dai-i2s.c | 1352 +++++++ sound/soc/mediatek/mt8186/mt8186-dai-pcm.c | 433 +++ sound/soc/mediatek/mt8186/mt8186-dai-src.c | 758 ++++ sound/soc/mediatek/mt8186/mt8186-dai-tdm.c | 723 ++++ .../mediatek/mt8186/mt8186-interconnection.h | 69 + .../soc/mediatek/mt8186/mt8186-misc-control.c | 1729 +++++++++ .../mt8186/mt8186-mt6366-da7219-max98357.c | 903 +++++ .../mt8186/mt8186-mt6366-rt1019-rt5682.c | 887 +++++ sound/soc/mediatek/mt8186/mt8186-reg.h | 3433 +++++++++++++++++ 30 files changed, 16978 insertions(+) create mode 100644 Documentation/devicetree/bindings/sound/mt8186-afe-pcm.yaml create mode 100644 Documentation/devicetree/bindings/sound/mt8186-mt6366-da7219-max98357.yaml create mode 100644 Documentation/devicetree/bindings/sound/mt8186-mt6366-rt1019-rt5682.yaml create mode 100644 sound/soc/mediatek/mt8186/Makefile create mode 100644 sound/soc/mediatek/mt8186/mt8186-afe-clk.c create mode 100644 sound/soc/mediatek/mt8186/mt8186-afe-clk.h create mode 100644 sound/soc/mediatek/mt8186/mt8186-afe-common.h create mode 100644 sound/soc/mediatek/mt8186/mt8186-afe-control.c create mode 100644 sound/soc/mediatek/mt8186/mt8186-afe-gpio.c create mode 100644 sound/soc/mediatek/mt8186/mt8186-afe-gpio.h create mode 100644 sound/soc/mediatek/mt8186/mt8186-afe-pcm.c create mode 100644 sound/soc/mediatek/mt8186/mt8186-audsys-clk.c create mode 100644 sound/soc/mediatek/mt8186/mt8186-audsys-clk.h create mode 100644 sound/soc/mediatek/mt8186/mt8186-audsys-clkid.h create mode 100644 sound/soc/mediatek/mt8186/mt8186-dai-adda.c create mode 100644 sound/soc/mediatek/mt8186/mt8186-dai-hostless.c create mode 100644 sound/soc/mediatek/mt8186/mt8186-dai-hw-gain.c create mode 100644 sound/soc/mediatek/mt8186/mt8186-dai-i2s.c create mode 100644 sound/soc/mediatek/mt8186/mt8186-dai-pcm.c create mode 100644 sound/soc/mediatek/mt8186/mt8186-dai-src.c create mode 100644 sound/soc/mediatek/mt8186/mt8186-dai-tdm.c create mode 100644 sound/soc/mediatek/mt8186/mt8186-interconnection.h create mode 100644 sound/soc/mediatek/mt8186/mt8186-misc-control.c create mode 100644 sound/soc/mediatek/mt8186/mt8186-mt6366-da7219-max98357.c create mode 100644 sound/soc/mediatek/mt8186/mt8186-mt6366-rt1019-rt5682.c create mode 100644 sound/soc/mediatek/mt8186/mt8186-reg.h -- 2.18.0

3 23

Re: [PATCH 10/15] ASoC: mediatek: mt8186: add platform driver
by Mark Brown 17 Feb '22

17 Feb '22

On Fri, Feb 11, 2022 at 06:38:13PM +0800, Jiaxin Yu wrote: > sound/soc/mediatek/Kconfig | 44 + > sound/soc/mediatek/Makefile | 1 + > sound/soc/mediatek/mt8186/Makefile | 21 + > sound/soc/mediatek/mt8186/mt8186-afe-clk.c | 719 ++++ > sound/soc/mediatek/mt8186/mt8186-afe-clk.h | 210 + > sound/soc/mediatek/mt8186/mt8186-afe-common.h | 245 ++ > .../soc/mediatek/mt8186/mt8186-afe-control.c | 262 ++ > sound/soc/mediatek/mt8186/mt8186-afe-gpio.c | 211 + > sound/soc/mediatek/mt8186/mt8186-afe-gpio.h | 19 + > sound/soc/mediatek/mt8186/mt8186-afe-pcm.c | 3030 +++++++++++++++ > .../mediatek/mt8186/mt8186-interconnection.h | 69 + > .../soc/mediatek/mt8186/mt8186-misc-control.c | 1729 +++++++++ > sound/soc/mediatek/mt8186/mt8186-reg.h | 3433 +++++++++++++++++ I know it's already a long series but perhaps the clock and GPIO bits could be split out into separate patches? This one patch is over 300K which is a bit much in one go, especially when it's not just all big tables.

2 1

[PATCH 0/2] ASoC: audio_graph_card2: Support variable slot widths
by Richard Fitzgerald 17 Feb '22

17 Feb '22

This adds support for I2S/TDM links where the slot width varies depending on the sample width, in a way that cannot be guessed by component hw_params(). A typical example is: - 16-bit samples use 16-bit slots - 24-bit samples use 32-bit slots There is no way for a component hw_params() to deduce from the information it is passed that 24-bit samples will be in 32-bit slots. Some audio hardware cannot support a fixed slot width or a slot width equal to the sample width in all cases. This is usually due either to limitations of the audio serial port or system clocking restrictions. These two patches add support for defining a mapping between sample widths and sample slots. This allows audio_graph_card2 to be used in these situations instead of having to write a custom machine driver. Richard Fitzgerald (2): ASoC: dt-bindings: audio-graph-port: Add dai-tdm-slot-width-map ASoC: audio_graph_card2: Add support for variable slot widths .../bindings/sound/audio-graph-port.yaml | 7 ++ include/sound/simple_card_utils.h | 11 +++ sound/soc/generic/audio-graph-card2.c | 4 + sound/soc/generic/simple-card-utils.c | 95 +++++++++++++++++++ 4 files changed, 117 insertions(+) -- 2.30.2

2 4

[PATCH 0/3] ALSA: Set max DMA segment size
by Takashi Iwai 17 Feb '22

17 Feb '22

Hi, this is a oneliner patches to address the spurious kernel WARNING from DMA debug code for the missing setup of DMA segment size for SG pages. Takashi === Takashi Iwai (3): ALSA: hda: Set max DMA segment size ASoC: SOF: hda: Set max DMA segment size ASoC: intel: skylake: Set max DMA segment size sound/pci/hda/hda_intel.c | 1 + sound/soc/intel/skylake/skl.c | 1 + sound/soc/sof/intel/hda.c | 1 + 3 files changed, 3 insertions(+) -- 2.31.1

3 7

[PATCH v2] ALSA: hda/hdmi: add keep-alive support for ADL-P and DG2
by Kai Vehmanen 17 Feb '22

17 Feb '22

Implement HDA keep alive (KAE) support for Intel display codecs. When no audio stream is active, the display codec will provide a continuous clock and a valid but silent audio stream to any connected HDMI/DP receiver. Without this, upon starting a new playback stream, initial samples may be lost as many receivers require time to initialize for new clock. This is a new feature in Intel AlderLake-P display codec implementation and replaces the Intel i915 silent-stream extension that has been used on older hardware. Main benefit of the new method is that codec no longer needs to be kept in D0 power state. This patch depends on commit 112a87c48e83 ("drm/i915/display: program audio CDCLK-TS for keepalives"). Signed-off-by: Kai Vehmanen <kai.vehmanen(a)linux.intel.com> Reviewed-by: Pierre-Louis Bossart <pierre-louis.bossart(a)linux.intel.com> Reviewed-by: Jyri Sarha <jyri.sarha(a)intel.com> --- sound/pci/hda/Kconfig | 19 ++--- sound/pci/hda/patch_hdmi.c | 157 +++++++++++++++++++++++++++---------- 2 files changed, 127 insertions(+), 49 deletions(-) V1->V2: - fix unbalance in snd_hda_power_up_pm()/snd_hda_power_down_pm() diff --git a/sound/pci/hda/Kconfig b/sound/pci/hda/Kconfig index febe1c2b7d9a..9f6c99c1d87b 100644 --- a/sound/pci/hda/Kconfig +++ b/sound/pci/hda/Kconfig @@ -285,15 +285,16 @@ config SND_HDA_INTEL_HDMI_SILENT_STREAM bool "Enable Silent Stream always for HDMI" depends on SND_HDA_INTEL help - Intel hardware has a feature called 'silent stream', that - keeps external HDMI receiver's analog circuitry powered on - avoiding 2-3 sec silence during playback start. This mechanism - relies on setting channel_id as 0xf, sending info packet and - preventing codec D3 entry (increasing platform static power - consumption when HDMI receiver is plugged-in). 2-3 sec silence - at the playback start is expected whenever there is format change. - (default is 2 channel format). - Say Y to enable Silent Stream feature. + Say Y to enable HD-Audio Keep Alive (KAE) aka Silent Stream + for HDMI on hardware that supports the feature. + + When enabled, the HDMI/DisplayPort codec will continue to provide + a continuous clock and a valid but silent data stream to + any connected external receiver. This allows to avoid gaps + at start of playback. Many receivers require multiple seconds + to start playing audio after the clock has been stopped. + This feature can impact power consumption as resources + are kept reserved both at transmitter and receiver. endif diff --git a/sound/pci/hda/patch_hdmi.c b/sound/pci/hda/patch_hdmi.c index 64fe025fda86..a7016d51b2ff 100644 --- a/sound/pci/hda/patch_hdmi.c +++ b/sound/pci/hda/patch_hdmi.c @@ -120,6 +120,12 @@ struct hdmi_pcm { struct snd_kcontrol *eld_ctl; }; +enum { + SILENT_STREAM_OFF = 0, + SILENT_STREAM_KAE, /* use standard HDA Keep-Alive */ + SILENT_STREAM_I915, /* Intel i915 extension */ +}; + struct hdmi_spec { struct hda_codec *codec; int num_cvts; @@ -179,7 +185,7 @@ struct hdmi_spec { hda_nid_t vendor_nid; const int *port_map; int port_num; - bool send_silent_stream; /* Flag to enable silent stream feature */ + int silent_stream_type; }; #ifdef CONFIG_SND_HDA_COMPONENT @@ -1665,18 +1671,71 @@ static void hdmi_present_sense_via_verbs(struct hdmi_spec_per_pin *per_pin, #define I915_SILENT_FORMAT_BITS 16 #define I915_SILENT_FMT_MASK 0xf +static void silent_stream_enable_i915(struct hda_codec *codec, + struct hdmi_spec_per_pin *per_pin) +{ + unsigned int format; + + snd_hdac_sync_audio_rate(&codec->core, per_pin->pin_nid, + per_pin->dev_id, I915_SILENT_RATE); + + /* trigger silent stream generation in hw */ + format = snd_hdac_calc_stream_format(I915_SILENT_RATE, I915_SILENT_CHANNELS, + I915_SILENT_FORMAT, I915_SILENT_FORMAT_BITS, 0); + snd_hda_codec_setup_stream(codec, per_pin->cvt_nid, + I915_SILENT_FMT_MASK, I915_SILENT_FMT_MASK, format); + usleep_range(100, 200); + snd_hda_codec_setup_stream(codec, per_pin->cvt_nid, I915_SILENT_FMT_MASK, 0, format); + + per_pin->channels = I915_SILENT_CHANNELS; + hdmi_setup_audio_infoframe(codec, per_pin, per_pin->non_pcm); +} + +static void silent_stream_set_kae(struct hda_codec *codec, + struct hdmi_spec_per_pin *per_pin, + bool enable) +{ + unsigned int param; + + codec_dbg(codec, "HDMI: KAE %d cvt-NID=0x%x\n", enable, per_pin->cvt_nid); + + param = snd_hda_codec_read(codec, per_pin->cvt_nid, 0, AC_VERB_GET_DIGI_CONVERT_1, 0); + param = (param >> 16) & 0xff; + + if (enable) + param |= AC_DIG3_KAE; + else + param &= ~AC_DIG3_KAE; + + snd_hda_codec_write(codec, per_pin->cvt_nid, 0, AC_VERB_SET_DIGI_CONVERT_3, param); +} + static void silent_stream_enable(struct hda_codec *codec, struct hdmi_spec_per_pin *per_pin) { struct hdmi_spec *spec = codec->spec; struct hdmi_spec_per_cvt *per_cvt; int cvt_idx, pin_idx, err; - unsigned int format; + int keep_power = 0; + + /* + * Power-up will call hdmi_present_sense, so the PM calls + * have to be done without mutex held. + */ + + err = snd_hda_power_up_pm(codec); + if (err < 0 && err != -EACCES) { + codec_err(codec, + "Failed to power up codec for silent stream enable ret=[%d]\n", err); + snd_hda_power_down_pm(codec); + return; + } mutex_lock(&per_pin->lock); if (per_pin->setup) { codec_dbg(codec, "hdmi: PCM already open, no silent stream\n"); + err = -EBUSY; goto unlock_out; } @@ -1703,22 +1762,23 @@ static void silent_stream_enable(struct hda_codec *codec, /* configure unused pins to choose other converters */ pin_cvt_fixup(codec, per_pin, 0); - snd_hdac_sync_audio_rate(&codec->core, per_pin->pin_nid, - per_pin->dev_id, I915_SILENT_RATE); - - /* trigger silent stream generation in hw */ - format = snd_hdac_calc_stream_format(I915_SILENT_RATE, I915_SILENT_CHANNELS, - I915_SILENT_FORMAT, I915_SILENT_FORMAT_BITS, 0); - snd_hda_codec_setup_stream(codec, per_pin->cvt_nid, - I915_SILENT_FMT_MASK, I915_SILENT_FMT_MASK, format); - usleep_range(100, 200); - snd_hda_codec_setup_stream(codec, per_pin->cvt_nid, I915_SILENT_FMT_MASK, 0, format); - - per_pin->channels = I915_SILENT_CHANNELS; - hdmi_setup_audio_infoframe(codec, per_pin, per_pin->non_pcm); + switch (spec->silent_stream_type) { + case SILENT_STREAM_KAE: + silent_stream_set_kae(codec, per_pin, true); + break; + case SILENT_STREAM_I915: + silent_stream_enable_i915(codec, per_pin); + keep_power = 1; + break; + default: + break; + } unlock_out: mutex_unlock(&per_pin->lock); + + if (err || !keep_power) + snd_hda_power_down_pm(codec); } static void silent_stream_disable(struct hda_codec *codec, @@ -1726,7 +1786,16 @@ static void silent_stream_disable(struct hda_codec *codec, { struct hdmi_spec *spec = codec->spec; struct hdmi_spec_per_cvt *per_cvt; - int cvt_idx; + int cvt_idx, err; + + err = snd_hda_power_up_pm(codec); + if (err < 0 && err != -EACCES) { + codec_err(codec, + "Failed to power up codec for silent stream disable ret=[%d]\n", + err); + snd_hda_power_down_pm(codec); + return; + } mutex_lock(&per_pin->lock); if (!per_pin->silent_stream) @@ -1741,11 +1810,21 @@ static void silent_stream_disable(struct hda_codec *codec, per_cvt->assigned = 0; } + if (spec->silent_stream_type == SILENT_STREAM_I915) { + /* release ref taken in silent_stream_enable() */ + snd_hda_power_down_pm(codec); + } + else if (spec->silent_stream_type == SILENT_STREAM_KAE) { + silent_stream_set_kae(codec, per_pin, false); + } + per_pin->cvt_nid = 0; per_pin->silent_stream = false; unlock_out: mutex_unlock(&per_pin->lock); + + snd_hda_power_down_pm(codec); } /* update ELD and jack state via audio component */ @@ -1767,29 +1846,11 @@ static void sync_eld_via_acomp(struct hda_codec *codec, monitor_next = per_pin->sink_eld.monitor_present; mutex_unlock(&per_pin->lock); - /* - * Power-up will call hdmi_present_sense, so the PM calls - * have to be done without mutex held. - */ - - if (spec->send_silent_stream) { - int pm_ret; - - if (!monitor_prev && monitor_next) { - pm_ret = snd_hda_power_up_pm(codec); - if (pm_ret < 0) - codec_err(codec, - "Monitor plugged-in, Failed to power up codec ret=[%d]\n", - pm_ret); + if (spec->silent_stream_type) { + if (!monitor_prev && monitor_next) silent_stream_enable(codec, per_pin); - } else if (monitor_prev && !monitor_next) { + else if (monitor_prev && !monitor_next) silent_stream_disable(codec, per_pin); - pm_ret = snd_hda_power_down_pm(codec); - if (pm_ret < 0) - codec_err(codec, - "Monitor plugged-out, Failed to power down codec ret=[%d]\n", - pm_ret); - } } } @@ -2982,7 +3043,7 @@ static int intel_hsw_common_init(struct hda_codec *codec, hda_nid_t vendor_nid, * module param or Kconfig option */ if (send_silent_stream) - spec->send_silent_stream = true; + spec->silent_stream_type = SILENT_STREAM_I915; return parse_intel_hdmi(codec); } @@ -3035,6 +3096,22 @@ static int patch_i915_tgl_hdmi(struct hda_codec *codec) return ret; } +static int patch_i915_adlp_hdmi(struct hda_codec *codec) +{ + struct hdmi_spec *spec; + int res; + + res = patch_i915_tgl_hdmi(codec); + if (!res) { + spec = codec->spec; + + if (spec->silent_stream_type) + spec->silent_stream_type = SILENT_STREAM_KAE; + } + + return res; +} + /* Intel Baytrail and Braswell; with eld notifier */ static int patch_i915_byt_hdmi(struct hda_codec *codec) { @@ -4391,10 +4468,10 @@ HDA_CODEC_ENTRY(0x80862814, "DG1 HDMI", patch_i915_tgl_hdmi), HDA_CODEC_ENTRY(0x80862815, "Alderlake HDMI", patch_i915_tgl_hdmi), HDA_CODEC_ENTRY(0x80862816, "Rocketlake HDMI", patch_i915_tgl_hdmi), HDA_CODEC_ENTRY(0x80862818, "Raptorlake HDMI", patch_i915_tgl_hdmi), -HDA_CODEC_ENTRY(0x80862819, "DG2 HDMI", patch_i915_tgl_hdmi), +HDA_CODEC_ENTRY(0x80862819, "DG2 HDMI", patch_i915_adlp_hdmi), HDA_CODEC_ENTRY(0x8086281a, "Jasperlake HDMI", patch_i915_icl_hdmi), HDA_CODEC_ENTRY(0x8086281b, "Elkhartlake HDMI", patch_i915_icl_hdmi), -HDA_CODEC_ENTRY(0x8086281c, "Alderlake-P HDMI", patch_i915_tgl_hdmi), +HDA_CODEC_ENTRY(0x8086281c, "Alderlake-P HDMI", patch_i915_adlp_hdmi), HDA_CODEC_ENTRY(0x80862880, "CedarTrail HDMI", patch_generic_hdmi), HDA_CODEC_ENTRY(0x80862882, "Valleyview2 HDMI", patch_i915_byt_hdmi), HDA_CODEC_ENTRY(0x80862883, "Braswell HDMI", patch_i915_byt_hdmi), base-commit: ffef8d871491c18f64cf05f095740383785cd09a -- 2.35.1

2 1

[PATCH v3 0/5] Tegra234 APE support
by Sameer Pujar 17 Feb '22

17 Feb '22

This adds APE support on Tegra234 and enables sound card on Jetson AGX Orin platform. Changelog ========= v2->v3 ------ * Fixed DT build error related to power-domain and iommu reference. Reported-by: kernel test robot <lkp(a)intel.com> v1->v2 ------ * Rebased patches on latest linux-next Mohan Kumar (1): ASoC: tegra: Update AHUB driver for Tegra234 Sameer Pujar (4): dt-bindings: Add Tegra234 APE support dt-bindings: Document Tegra234 APE support arm64: tegra: Add audio devices on Tegra234 arm64: tegra: APE sound card for Jetson AGX Orin .../bindings/bus/nvidia,tegra210-aconnect.yaml | 1 + .../bindings/dma/nvidia,tegra210-adma.yaml | 4 +- .../bindings/interrupt-controller/arm,gic.yaml | 1 + .../bindings/sound/nvidia,tegra186-dspk.yaml | 4 +- .../bindings/sound/nvidia,tegra210-admaif.yaml | 4 +- .../bindings/sound/nvidia,tegra210-adx.yaml | 1 + .../bindings/sound/nvidia,tegra210-ahub.yaml | 1 + .../bindings/sound/nvidia,tegra210-amx.yaml | 3 + .../bindings/sound/nvidia,tegra210-dmic.yaml | 1 + .../bindings/sound/nvidia,tegra210-i2s.yaml | 1 + .../bindings/sound/nvidia,tegra210-mixer.yaml | 1 + .../bindings/sound/nvidia,tegra210-mvc.yaml | 1 + .../bindings/sound/nvidia,tegra210-sfc.yaml | 1 + .../dts/nvidia/tegra234-p3737-0000+p3701-0000.dts | 1783 ++++++++++++++++++++ arch/arm64/boot/dts/nvidia/tegra234.dtsi | 432 +++++ include/dt-bindings/clock/tegra234-clock.h | 74 +- include/dt-bindings/memory/tegra234-mc.h | 7 + include/dt-bindings/power/tegra234-powergate.h | 9 + sound/soc/tegra/tegra210_ahub.c | 146 +- sound/soc/tegra/tegra210_ahub.h | 4 +- 20 files changed, 2473 insertions(+), 6 deletions(-) create mode 100644 include/dt-bindings/power/tegra234-powergate.h -- 2.7.4

3 8

[RESEND v7 0/7] Add pin control support for lpass sc7280
by Srinivasa Rao Mandadapu 17 Feb '22

17 Feb '22

This patch series is to split lpass variant common pin control functions and SoC specific functions and to add lpass sc7280 pincontrol support. It also Adds dt-bindings for lpass sc7280 lpass lpi pincontrol. Changes Since V6: -- Update conditional clock voting to optional clock voting. -- Update Kconfig depends on field with select. -- Fix typo errors. Changes Since V5: -- Create new patch by updating macro name to lpi specific. -- Create new patch by updating lpi pin group structure with core group_desc structure. -- Fix typo errors. -- Sort macros in the make file and configuration file. Changes Since V4: -- Update commit message and description of the chip specific extraction patch. -- Sort macros in kconfig and makefile. -- Update optional clock voting to conditional clock voting. -- Fix typo errors. -- Move to quicinc domain email id's. Changes Since V3: -- Update separate Kconfig fields for sm8250 and sc7280. -- Update module license and description. -- Move static variables to corresponding .c files from header file. Changes Since V2: -- Add new dt-bindings for sc7280 lpi driver. -- Make clock voting change as separate patch. -- Split existing pincontrol driver and make common functions as part of separate file. -- Rename lpass pincontrol lpi dt-bindings to sm8250 specific dt-bindings Changes Since V1: -- Make lpi pinctrl variant data structure as constant -- Add appropriate commit message -- Change signedoff by sequence. Srinivasa Rao Mandadapu (7): dt-bindings: pinctrl: qcom: Update lpass lpi file name to SoC specific dt-bindings: pinctrl: qcom: Add sc7280 lpass lpi pinctrl bindings pinctrl: qcom: Update macro name to LPI specific pinctrl: qcom: Update lpi pin group structure pinctrl: qcom: Extract chip specific LPASS LPI code pinctrl: qcom: Add SC7280 lpass pin configuration pinctrl: qcom: Update clock voting as optional Tested this on SM8250 MTP with WSA and WCD codecs. Tested-by: Srinivas Kandagatla <srinivas.kandagatla(a)linaro.org> .../bindings/pinctrl/qcom,lpass-lpi-pinctrl.yaml | 133 ----------- .../pinctrl/qcom,sc7280-lpass-lpi-pinctrl.yaml | 115 ++++++++++ .../pinctrl/qcom,sm8250-lpass-lpi-pinctrl.yaml | 133 +++++++++++ drivers/pinctrl/qcom/Kconfig | 16 ++ drivers/pinctrl/qcom/Makefile | 2 + drivers/pinctrl/qcom/pinctrl-lpass-lpi.c | 245 +-------------------- drivers/pinctrl/qcom/pinctrl-lpass-lpi.h | 86 ++++++++ drivers/pinctrl/qcom/pinctrl-sc7280-lpass-lpi.c | 168 ++++++++++++++ drivers/pinctrl/qcom/pinctrl-sm8250-lpass-lpi.c | 166 ++++++++++++++ 9 files changed, 696 insertions(+), 368 deletions(-) delete mode 100644 Documentation/devicetree/bindings/pinctrl/qcom,lpass-lpi-pinctrl.yaml create mode 100644 Documentation/devicetree/bindings/pinctrl/qcom,sc7280-lpass-lpi-pinctrl.yaml create mode 100644 Documentation/devicetree/bindings/pinctrl/qcom,sm8250-lpass-lpi-pinctrl.yaml create mode 100644 drivers/pinctrl/qcom/pinctrl-lpass-lpi.h create mode 100644 drivers/pinctrl/qcom/pinctrl-sc7280-lpass-lpi.c create mode 100644 drivers/pinctrl/qcom/pinctrl-sm8250-lpass-lpi.c -- 2.7.4

1 7

[PATCH v7 7/7] pinctrl: qcom: Update clock voting as optional
by Srinivasa Rao Mandadapu 17 Feb '22

17 Feb '22

Update bulk clock voting to optional voting as ADSP bypass platform doesn't need macro and decodec clocks, these are maintained as power domains and operated from lpass audio core cc. Signed-off-by: Srinivasa Rao Mandadapu <quic_srivasam(a)quicinc.com> Co-developed-by: Venkata Prasad Potturu <quic_potturu(a)quicinc.com> Signed-off-by: Venkata Prasad Potturu <quic_potturu(a)quicinc.com> --- drivers/pinctrl/qcom/pinctrl-lpass-lpi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/pinctrl/qcom/pinctrl-lpass-lpi.c b/drivers/pinctrl/qcom/pinctrl-lpass-lpi.c index 8a82fd9..30a86c3 100644 --- a/drivers/pinctrl/qcom/pinctrl-lpass-lpi.c +++ b/drivers/pinctrl/qcom/pinctrl-lpass-lpi.c @@ -407,7 +407,7 @@ int lpi_pinctrl_probe(struct platform_device *pdev) return dev_err_probe(dev, PTR_ERR(pctrl->slew_base), "Slew resource not provided\n"); - ret = devm_clk_bulk_get(dev, MAX_LPI_NUM_CLKS, pctrl->clks); + ret = devm_clk_bulk_get_optional(dev, MAX_LPI_NUM_CLKS, pctrl->clks); if (ret) return dev_err_probe(dev, ret, "Can't get clocks\n"); -- 2.7.4

1 0

[PATCH -next] ASoC: codec: wcd938x: Fix NULL but dereferenced coccicheck error
by Yang Li 17 Feb '22

17 Feb '22

Eliminate the following coccicheck warning: ./sound/soc/codecs/wcd938x.c:4210:21-24: ERROR: component is NULL but dereferenced. Reported-by: Abaci Robot <abaci(a)linux.alibaba.com> Fixes: 013cc2aea0f6 ("ASoC: codec: wcd938x: Add switch control for selecting CTIA/OMTP Headset") Signed-off-by: Yang Li <yang.lee(a)linux.alibaba.com> --- sound/soc/codecs/wcd938x.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/soc/codecs/wcd938x.c b/sound/soc/codecs/wcd938x.c index 2663fe0bf64f..c46c4bfd84f2 100644 --- a/sound/soc/codecs/wcd938x.c +++ b/sound/soc/codecs/wcd938x.c @@ -4207,7 +4207,7 @@ static bool wcd938x_swap_gnd_mic(struct snd_soc_component *component, bool activ struct wcd938x_priv *wcd938x; if (!component) { - dev_err(component->dev, "%s component is NULL\n", __func__); + pr_err("The snd_soc_component is NULL\n"); return false; } -- 2.20.1.7.g153144c

3 2

[PATCH][next] treewide: Replace zero-length arrays with flexible-array members
by Gustavo A. R. Silva 16 Feb '22

16 Feb '22

There is a regular need in the kernel to provide a way to declare having a dynamically sized set of trailing elements in a structure. Kernel code should always use “flexible array members”[1] for these cases. The older style of one-element or zero-length arrays should no longer be used[2]. This code was transformed with the help of Coccinelle: (next-20220214$ spatch --jobs $(getconf _NPROCESSORS_ONLN) --sp-file script.cocci --include-headers --dir . > output.patch) @@ identifier S, member, array; type T1, T2; @@ struct S { ... T1 member; T2 array[ - 0 ]; }; UAPI and wireless changes were intentionally excluded from this patch and will be sent out separately. [1] https://en.wikipedia.org/wiki/Flexible_array_member [2] https://www.kernel.org/doc/html/v5.16/process/deprecated.html#zero-length-a… Link: https://github.com/KSPP/linux/issues/78 Signed-off-by: Gustavo A. R. Silva <gustavoars(a)kernel.org> --- Hi all, I'm expecting to carry this patch in my tree, so it'd be great to get some Acks. And given the size of the patch, I'm only sending this to mailing lists. Thanks! arch/alpha/include/asm/hwrpb.h | 2 +- arch/ia64/include/asm/sal.h | 2 +- arch/s390/include/asm/ccwgroup.h | 2 +- arch/s390/include/asm/chsc.h | 2 +- arch/s390/include/asm/eadm.h | 2 +- arch/s390/include/asm/fcx.h | 4 ++-- arch/s390/include/asm/idals.h | 2 +- arch/s390/include/asm/sclp.h | 2 +- arch/s390/include/asm/sysinfo.h | 6 +++--- arch/sh/include/asm/thread_info.h | 2 +- arch/sparc/include/asm/vio.h | 10 +++++----- arch/um/include/shared/net_kern.h | 2 +- arch/x86/include/asm/microcode_amd.h | 2 +- arch/x86/include/asm/microcode_intel.h | 4 ++-- arch/x86/include/asm/pci.h | 2 +- arch/x86/include/asm/pci_x86.h | 2 +- arch/xtensa/include/asm/bootparam.h | 2 +- drivers/crypto/caam/pdb.h | 2 +- drivers/gpu/drm/i915/gt/uc/intel_guc_ads.c | 2 +- drivers/gpu/drm/nouveau/include/nvfw/hs.h | 2 +- .../hwtracing/coresight/coresight-config.h | 2 +- drivers/misc/bcm-vk/bcm_vk.h | 2 +- .../misc/habanalabs/include/common/cpucp_if.h | 6 +++--- .../habanalabs/include/gaudi/gaudi_packets.h | 4 ++-- .../habanalabs/include/goya/goya_packets.h | 4 ++-- .../net/ethernet/freescale/enetc/enetc_hw.h | 2 +- drivers/net/ethernet/i825xx/sun3_82586.h | 2 +- .../net/ethernet/marvell/octeontx2/af/npc.h | 6 +++--- drivers/net/ethernet/qlogic/qed/qed_mfw_hsi.h | 2 +- drivers/net/ethernet/ti/davinci_mdio.c | 2 +- drivers/scsi/dpt/dpti_i2o.h | 2 +- drivers/scsi/elx/libefc_sli/sli4.h | 20 +++++++++---------- drivers/scsi/mpi3mr/mpi3mr.h | 2 +- drivers/scsi/qla2xxx/qla_bsg.h | 4 ++-- drivers/scsi/qla2xxx/qla_def.h | 2 +- drivers/scsi/qla2xxx/qla_edif_bsg.h | 4 ++-- drivers/scsi/qla2xxx/qla_fw.h | 2 +- drivers/scsi/qla4xxx/ql4_fw.h | 2 +- drivers/staging/r8188eu/include/ieee80211.h | 6 +++--- drivers/staging/r8188eu/include/rtw_cmd.h | 10 +++++----- drivers/staging/rtl8712/rtl871x_cmd.h | 8 ++++---- drivers/staging/rtl8723bs/include/ieee80211.h | 2 +- drivers/staging/rtl8723bs/include/rtw_cmd.h | 2 +- .../include/linux/raspberrypi/vchiq.h | 2 +- drivers/visorbus/vbuschannel.h | 2 +- fs/cifs/ntlmssp.h | 2 +- fs/ext4/fast_commit.h | 4 ++-- fs/ksmbd/ksmbd_netlink.h | 2 +- fs/ksmbd/ntlmssp.h | 6 +++--- fs/ksmbd/smb2pdu.h | 8 ++++---- fs/ksmbd/transport_rdma.c | 2 +- fs/ksmbd/xattr.h | 2 +- fs/xfs/scrub/attr.h | 2 +- include/acpi/actbl2.h | 2 +- include/asm-generic/tlb.h | 4 ++-- include/linux/greybus/greybus_manifest.h | 4 ++-- include/linux/greybus/hd.h | 2 +- include/linux/greybus/module.h | 2 +- include/linux/i3c/ccc.h | 6 +++--- include/linux/mlx5/mlx5_ifc_fpga.h | 2 +- include/linux/platform_data/brcmfmac.h | 2 +- .../linux/platform_data/cros_ec_commands.h | 2 +- include/net/bluetooth/mgmt.h | 2 +- include/net/ioam6.h | 2 +- include/sound/sof/channel_map.h | 4 ++-- scripts/dtc/libfdt/fdt.h | 4 ++-- sound/soc/intel/atom/sst-mfld-dsp.h | 4 ++-- sound/soc/intel/skylake/skl-topology.h | 2 +- tools/lib/perf/include/perf/event.h | 2 +- 69 files changed, 116 insertions(+), 116 deletions(-) diff --git a/arch/alpha/include/asm/hwrpb.h b/arch/alpha/include/asm/hwrpb.h index d8180e527a1e..fc76f36265ad 100644 --- a/arch/alpha/include/asm/hwrpb.h +++ b/arch/alpha/include/asm/hwrpb.h @@ -152,7 +152,7 @@ struct memdesc_struct { unsigned long chksum; unsigned long optional_pa; unsigned long numclusters; - struct memclust_struct cluster[0]; + struct memclust_struct cluster[]; }; struct dsr_struct { diff --git a/arch/ia64/include/asm/sal.h b/arch/ia64/include/asm/sal.h index 78f4f7b40435..22749a201e92 100644 --- a/arch/ia64/include/asm/sal.h +++ b/arch/ia64/include/asm/sal.h @@ -420,7 +420,7 @@ typedef struct sal_log_processor_info { * The rest of this structure consists of variable-length arrays, which can't be * expressed in C. */ - sal_log_mod_error_info_t info[0]; + sal_log_mod_error_info_t info[]; /* * This is what the rest looked like if C supported variable-length arrays: * diff --git a/arch/s390/include/asm/ccwgroup.h b/arch/s390/include/asm/ccwgroup.h index aa995d91cd1d..11d2fb3de4f5 100644 --- a/arch/s390/include/asm/ccwgroup.h +++ b/arch/s390/include/asm/ccwgroup.h @@ -25,7 +25,7 @@ struct ccwgroup_device { unsigned int count; struct device dev; struct work_struct ungroup_work; - struct ccw_device *cdev[0]; + struct ccw_device *cdev[]; }; /** diff --git a/arch/s390/include/asm/chsc.h b/arch/s390/include/asm/chsc.h index ae4d2549cd67..bb48ea380c0d 100644 --- a/arch/s390/include/asm/chsc.h +++ b/arch/s390/include/asm/chsc.h @@ -63,7 +63,7 @@ struct chsc_pnso_area { struct chsc_header response; u32:32; struct chsc_pnso_naihdr naihdr; - struct chsc_pnso_naid_l2 entries[0]; + struct chsc_pnso_naid_l2 entries[]; } __packed __aligned(PAGE_SIZE); #endif /* _ASM_S390_CHSC_H */ diff --git a/arch/s390/include/asm/eadm.h b/arch/s390/include/asm/eadm.h index 445fe4c8184a..06f795855af7 100644 --- a/arch/s390/include/asm/eadm.h +++ b/arch/s390/include/asm/eadm.h @@ -78,7 +78,7 @@ struct aob { struct aob_rq_header { struct scm_device *scmdev; - char data[0]; + char data[]; }; struct scm_device { diff --git a/arch/s390/include/asm/fcx.h b/arch/s390/include/asm/fcx.h index cff0749e9657..b8a028a36173 100644 --- a/arch/s390/include/asm/fcx.h +++ b/arch/s390/include/asm/fcx.h @@ -214,7 +214,7 @@ struct dcw_intrg_data { u32 :32; u64 time; u64 prog_id; - u8 prog_data[0]; + u8 prog_data[]; } __attribute__ ((packed)); #define DCW_FLAGS_CC (1 << (7 - 1)) @@ -241,7 +241,7 @@ struct dcw { u32 :8; u32 cd_count:8; u32 count; - u8 cd[0]; + u8 cd[]; } __attribute__ ((packed)); #define TCCB_FORMAT_DEFAULT 0x7f diff --git a/arch/s390/include/asm/idals.h b/arch/s390/include/asm/idals.h index 6fb7aced104a..40eae2c08d61 100644 --- a/arch/s390/include/asm/idals.h +++ b/arch/s390/include/asm/idals.h @@ -108,7 +108,7 @@ clear_normalized_cda(struct ccw1 * ccw) struct idal_buffer { size_t size; size_t page_order; - void *data[0]; + void *data[]; }; /* diff --git a/arch/s390/include/asm/sclp.h b/arch/s390/include/asm/sclp.h index c68ea35de498..22b3213c6c9d 100644 --- a/arch/s390/include/asm/sclp.h +++ b/arch/s390/include/asm/sclp.h @@ -112,7 +112,7 @@ struct zpci_report_error_header { * (OpenCrypto Successful Diagnostics Execution) */ u16 length; /* Length of Subsequent Data (up to 4K – SCLP header */ - u8 data[0]; /* Subsequent Data passed verbatim to SCLP ET 24 */ + u8 data[]; /* Subsequent Data passed verbatim to SCLP ET 24 */ } __packed; extern char *sclp_early_sccb; diff --git a/arch/s390/include/asm/sysinfo.h b/arch/s390/include/asm/sysinfo.h index fe7b3f8f0791..ab1c6316055c 100644 --- a/arch/s390/include/asm/sysinfo.h +++ b/arch/s390/include/asm/sysinfo.h @@ -67,12 +67,12 @@ struct sysinfo_1_2_2 { unsigned short cpus_configured; unsigned short cpus_standby; unsigned short cpus_reserved; - unsigned short adjustment[0]; + unsigned short adjustment[]; }; struct sysinfo_1_2_2_extension { unsigned int alt_capability; - unsigned short alt_adjustment[0]; + unsigned short alt_adjustment[]; }; struct sysinfo_2_2_1 { @@ -181,7 +181,7 @@ struct sysinfo_15_1_x { unsigned char reserved1; unsigned char mnest; unsigned char reserved2[4]; - union topology_entry tle[0]; + union topology_entry tle[]; }; int stsi(void *sysinfo, int fc, int sel1, int sel2); diff --git a/arch/sh/include/asm/thread_info.h b/arch/sh/include/asm/thread_info.h index 598d0184ffea..3a2d50d61fc9 100644 --- a/arch/sh/include/asm/thread_info.h +++ b/arch/sh/include/asm/thread_info.h @@ -33,7 +33,7 @@ struct thread_info { mm_segment_t addr_limit; /* thread address space */ unsigned long previous_sp; /* sp of previous stack in case of nested IRQ stacks */ - __u8 supervisor_stack[0]; + __u8 supervisor_stack[]; }; #endif diff --git a/arch/sparc/include/asm/vio.h b/arch/sparc/include/asm/vio.h index 8a1a83bbb6d5..2d7bdf665fd3 100644 --- a/arch/sparc/include/asm/vio.h +++ b/arch/sparc/include/asm/vio.h @@ -70,7 +70,7 @@ struct vio_dring_register { #define VIO_RX_DRING_DATA 0x0004 u16 resv; u32 num_cookies; - struct ldc_trans_cookie cookies[0]; + struct ldc_trans_cookie cookies[]; }; struct vio_dring_unregister { @@ -161,7 +161,7 @@ struct vio_disk_desc { u64 size; u32 ncookies; u32 resv2; - struct ldc_trans_cookie cookies[0]; + struct ldc_trans_cookie cookies[]; }; #define VIO_DISK_VNAME_LEN 8 @@ -200,13 +200,13 @@ struct vio_disk_devid { u16 resv; u16 type; u32 len; - char id[0]; + char id[]; }; struct vio_disk_efi { u64 lba; u64 len; - char data[0]; + char data[]; }; /* VIO net specific structures and defines */ @@ -246,7 +246,7 @@ struct vio_net_desc { struct vio_dring_hdr hdr; u32 size; u32 ncookies; - struct ldc_trans_cookie cookies[0]; + struct ldc_trans_cookie cookies[]; }; struct vio_net_dext { diff --git a/arch/um/include/shared/net_kern.h b/arch/um/include/shared/net_kern.h index 441a8a309329..67b2e9a1f2e5 100644 --- a/arch/um/include/shared/net_kern.h +++ b/arch/um/include/shared/net_kern.h @@ -39,7 +39,7 @@ struct uml_net_private { void (*add_address)(unsigned char *, unsigned char *, void *); void (*delete_address)(unsigned char *, unsigned char *, void *); - char user[0]; + char user[]; }; struct net_kern_info { diff --git a/arch/x86/include/asm/microcode_amd.h b/arch/x86/include/asm/microcode_amd.h index 7063b5a43220..ac31f9140d07 100644 --- a/arch/x86/include/asm/microcode_amd.h +++ b/arch/x86/include/asm/microcode_amd.h @@ -38,7 +38,7 @@ struct microcode_header_amd { struct microcode_amd { struct microcode_header_amd hdr; - unsigned int mpb[0]; + unsigned int mpb[]; }; #define PATCH_MAX_SIZE (3 * PAGE_SIZE) diff --git a/arch/x86/include/asm/microcode_intel.h b/arch/x86/include/asm/microcode_intel.h index d85a07d7154f..4c92cea7e4b5 100644 --- a/arch/x86/include/asm/microcode_intel.h +++ b/arch/x86/include/asm/microcode_intel.h @@ -19,7 +19,7 @@ struct microcode_header_intel { struct microcode_intel { struct microcode_header_intel hdr; - unsigned int bits[0]; + unsigned int bits[]; }; /* microcode format is extended from prescott processors */ @@ -33,7 +33,7 @@ struct extended_sigtable { unsigned int count; unsigned int cksum; unsigned int reserved[3]; - struct extended_signature sigs[0]; + struct extended_signature sigs[]; }; #define DEFAULT_UCODE_DATASIZE (2000) diff --git a/arch/x86/include/asm/pci.h b/arch/x86/include/asm/pci.h index d2c76c8d8cfd..f3fd5928bcbb 100644 --- a/arch/x86/include/asm/pci.h +++ b/arch/x86/include/asm/pci.h @@ -135,7 +135,7 @@ struct pci_setup_rom { unsigned long bus; unsigned long device; unsigned long function; - uint8_t romdata[0]; + uint8_t romdata[]; }; #endif /* _ASM_X86_PCI_H */ diff --git a/arch/x86/include/asm/pci_x86.h b/arch/x86/include/asm/pci_x86.h index 490411dba438..3fb6fc596095 100644 --- a/arch/x86/include/asm/pci_x86.h +++ b/arch/x86/include/asm/pci_x86.h @@ -87,7 +87,7 @@ struct irq_routing_table { u32 miniport_data; /* Crap */ u8 rfu[11]; u8 checksum; /* Modulo 256 checksum must give 0 */ - struct irq_info slots[0]; + struct irq_info slots[]; } __attribute__((packed)); extern unsigned int pcibios_irq_mask; diff --git a/arch/xtensa/include/asm/bootparam.h b/arch/xtensa/include/asm/bootparam.h index 892aab399ac8..6333bd1eb9d2 100644 --- a/arch/xtensa/include/asm/bootparam.h +++ b/arch/xtensa/include/asm/bootparam.h @@ -34,7 +34,7 @@ typedef struct bp_tag { unsigned short id; /* tag id */ unsigned short size; /* size of this record excluding the structure*/ - unsigned long data[0]; /* data */ + unsigned long data[]; /* data */ } bp_tag_t; struct bp_meminfo { diff --git a/drivers/crypto/caam/pdb.h b/drivers/crypto/caam/pdb.h index 8ccc22075043..4b1bcf53f7ac 100644 --- a/drivers/crypto/caam/pdb.h +++ b/drivers/crypto/caam/pdb.h @@ -144,7 +144,7 @@ struct ipsec_encap_pdb { }; u32 spi; u32 ip_hdr_len; - u32 ip_hdr[0]; + u32 ip_hdr[]; }; /** diff --git a/drivers/gpu/drm/i915/gt/uc/intel_guc_ads.c b/drivers/gpu/drm/i915/gt/uc/intel_guc_ads.c index 1a1edae67e4e..3acee0060e23 100644 --- a/drivers/gpu/drm/i915/gt/uc/intel_guc_ads.c +++ b/drivers/gpu/drm/i915/gt/uc/intel_guc_ads.c @@ -51,7 +51,7 @@ struct __guc_ads_blob { struct guc_gt_system_info system_info; struct guc_engine_usage engine_usage; /* From here on, location is dynamic! Refer to above diagram. */ - struct guc_mmio_reg regset[0]; + struct guc_mmio_reg regset[]; } __packed; static u32 guc_ads_regset_size(struct intel_guc *guc) diff --git a/drivers/gpu/drm/nouveau/include/nvfw/hs.h b/drivers/gpu/drm/nouveau/include/nvfw/hs.h index 64d0d32200c2..b53bbc4cd130 100644 --- a/drivers/gpu/drm/nouveau/include/nvfw/hs.h +++ b/drivers/gpu/drm/nouveau/include/nvfw/hs.h @@ -23,7 +23,7 @@ struct nvfw_hs_load_header { u32 data_dma_base; u32 data_size; u32 num_apps; - u32 apps[0]; + u32 apps[]; }; const struct nvfw_hs_load_header * diff --git a/drivers/hwtracing/coresight/coresight-config.h b/drivers/hwtracing/coresight/coresight-config.h index 9bd44b940add..2e1670523461 100644 --- a/drivers/hwtracing/coresight/coresight-config.h +++ b/drivers/hwtracing/coresight/coresight-config.h @@ -231,7 +231,7 @@ struct cscfg_config_csdev { bool enabled; struct list_head node; int nr_feat; - struct cscfg_feature_csdev *feats_csdev[0]; + struct cscfg_feature_csdev *feats_csdev[]; }; /** diff --git a/drivers/misc/bcm-vk/bcm_vk.h b/drivers/misc/bcm-vk/bcm_vk.h index a1338f375589..25d51222eedf 100644 --- a/drivers/misc/bcm-vk/bcm_vk.h +++ b/drivers/misc/bcm-vk/bcm_vk.h @@ -311,7 +311,7 @@ struct bcm_vk_peer_log { u32 wr_idx; u32 buf_size; u32 mask; - char data[0]; + char data[]; }; /* max buf size allowed */ diff --git a/drivers/misc/habanalabs/include/common/cpucp_if.h b/drivers/misc/habanalabs/include/common/cpucp_if.h index 737c39f33f05..f9c4acc9bf5a 100644 --- a/drivers/misc/habanalabs/include/common/cpucp_if.h +++ b/drivers/misc/habanalabs/include/common/cpucp_if.h @@ -540,19 +540,19 @@ struct cpucp_packet { struct cpucp_unmask_irq_arr_packet { struct cpucp_packet cpucp_pkt; __le32 length; - __le32 irqs[0]; + __le32 irqs[]; }; struct cpucp_nic_status_packet { struct cpucp_packet cpucp_pkt; __le32 length; - __le32 data[0]; + __le32 data[]; }; struct cpucp_array_data_packet { struct cpucp_packet cpucp_pkt; __le32 length; - __le32 data[0]; + __le32 data[]; }; enum cpucp_packet_rc { diff --git a/drivers/misc/habanalabs/include/gaudi/gaudi_packets.h b/drivers/misc/habanalabs/include/gaudi/gaudi_packets.h index 6e097ace2e96..66fc083a7c6a 100644 --- a/drivers/misc/habanalabs/include/gaudi/gaudi_packets.h +++ b/drivers/misc/habanalabs/include/gaudi/gaudi_packets.h @@ -54,7 +54,7 @@ struct gaudi_packet { /* The rest of the packet data follows. Use the corresponding * packet_XXX struct to deference the data, based on packet type */ - u8 contents[0]; + u8 contents[]; }; struct packet_nop { @@ -75,7 +75,7 @@ struct packet_wreg32 { struct packet_wreg_bulk { __le32 size64; __le32 ctl; - __le64 values[0]; /* data starts here */ + __le64 values[]; /* data starts here */ }; #define GAUDI_PKT_LONG_CTL_OP_SHIFT 20 diff --git a/drivers/misc/habanalabs/include/goya/goya_packets.h b/drivers/misc/habanalabs/include/goya/goya_packets.h index ef54bad20509..50ce5175b63a 100644 --- a/drivers/misc/habanalabs/include/goya/goya_packets.h +++ b/drivers/misc/habanalabs/include/goya/goya_packets.h @@ -62,7 +62,7 @@ struct goya_packet { /* The rest of the packet data follows. Use the corresponding * packet_XXX struct to deference the data, based on packet type */ - u8 contents[0]; + u8 contents[]; }; struct packet_nop { @@ -86,7 +86,7 @@ struct packet_wreg32 { struct packet_wreg_bulk { __le32 size64; __le32 ctl; - __le64 values[0]; /* data starts here */ + __le64 values[]; /* data starts here */ }; struct packet_msg_long { diff --git a/drivers/net/ethernet/freescale/enetc/enetc_hw.h b/drivers/net/ethernet/freescale/enetc/enetc_hw.h index 1514e6a4a3ff..ce5b677e8c2f 100644 --- a/drivers/net/ethernet/freescale/enetc/enetc_hw.h +++ b/drivers/net/ethernet/freescale/enetc/enetc_hw.h @@ -881,7 +881,7 @@ struct sgcl_data { u32 bth; u32 ct; u32 cte; - struct sgce sgcl[0]; + struct sgce sgcl[]; }; #define ENETC_CBDR_FMI_MR BIT(0) diff --git a/drivers/net/ethernet/i825xx/sun3_82586.h b/drivers/net/ethernet/i825xx/sun3_82586.h index 79aef681ac85..451cb3d26cb5 100644 --- a/drivers/net/ethernet/i825xx/sun3_82586.h +++ b/drivers/net/ethernet/i825xx/sun3_82586.h @@ -250,7 +250,7 @@ struct mcsetup_cmd_struct unsigned short cmd_cmd; unsigned short cmd_link; unsigned short mc_cnt; /* number of bytes in the MC-List */ - unsigned char mc_list[0][6]; /* pointer to 6 bytes entries */ + unsigned char mc_list[][6]; /* pointer to 6 bytes entries */ }; /* diff --git a/drivers/net/ethernet/marvell/octeontx2/af/npc.h b/drivers/net/ethernet/marvell/octeontx2/af/npc.h index 77fd39e2c8db..9b6e587e78b4 100644 --- a/drivers/net/ethernet/marvell/octeontx2/af/npc.h +++ b/drivers/net/ethernet/marvell/octeontx2/af/npc.h @@ -455,7 +455,7 @@ struct npc_coalesced_kpu_prfl { u8 name[NPC_NAME_LEN]; /* KPU Profile name */ u64 version; /* KPU firmware/profile version */ u8 num_prfl; /* No of NPC profiles. */ - u16 prfl_sz[0]; + u16 prfl_sz[]; }; struct npc_mcam_kex { @@ -482,7 +482,7 @@ struct npc_kpu_fwdata { * struct npc_kpu_profile_cam[entries]; * struct npc_kpu_profile_action[entries]; */ - u8 data[0]; + u8 data[]; } __packed; struct npc_lt_def { @@ -572,7 +572,7 @@ struct npc_kpu_profile_fwdata { * Custom KPU CAM and ACTION configuration entries. * struct npc_kpu_fwdata kpu[kpus]; */ - u8 data[0]; + u8 data[]; } __packed; struct rvu_npc_mcam_rule { diff --git a/drivers/net/ethernet/qlogic/qed/qed_mfw_hsi.h b/drivers/net/ethernet/qlogic/qed/qed_mfw_hsi.h index b70ee8200e15..6459dd3feb37 100644 --- a/drivers/net/ethernet/qlogic/qed/qed_mfw_hsi.h +++ b/drivers/net/ethernet/qlogic/qed/qed_mfw_hsi.h @@ -2470,6 +2470,6 @@ struct nvm_meta_bin_t { u32 version; #define NVM_META_BIN_VERSION 1 u32 num_options; - u32 options[0]; + u32 options[]; }; #endif diff --git a/drivers/net/ethernet/ti/davinci_mdio.c b/drivers/net/ethernet/ti/davinci_mdio.c index a4efd5e35158..fce2626e34fa 100644 --- a/drivers/net/ethernet/ti/davinci_mdio.c +++ b/drivers/net/ethernet/ti/davinci_mdio.c @@ -70,7 +70,7 @@ struct davinci_mdio_regs { #define USERACCESS_DATA (0xffff) u32 physel; - } user[0]; + } user[]; }; static const struct mdio_platform_data default_pdata = { diff --git a/drivers/scsi/dpt/dpti_i2o.h b/drivers/scsi/dpt/dpti_i2o.h index bf0daeeb50a9..e1fbbf55c09d 100644 --- a/drivers/scsi/dpt/dpti_i2o.h +++ b/drivers/scsi/dpt/dpti_i2o.h @@ -123,7 +123,7 @@ struct i2o_sys_tbl u32 change_ind; u32 reserved2; u32 reserved3; - struct i2o_sys_tbl_entry iops[0]; + struct i2o_sys_tbl_entry iops[]; }; /* diff --git a/drivers/scsi/elx/libefc_sli/sli4.h b/drivers/scsi/elx/libefc_sli/sli4.h index ee2a9e65a88d..38af166cc786 100644 --- a/drivers/scsi/elx/libefc_sli/sli4.h +++ b/drivers/scsi/elx/libefc_sli/sli4.h @@ -609,7 +609,7 @@ struct sli4_rqst_cmn_create_cq_v2 { __le16 cqe_count; __le16 rsvd30; __le32 rsvd32; - struct sli4_dmaaddr page_phys_addr[0]; + struct sli4_dmaaddr page_phys_addr[]; }; enum sli4_create_cqset_e { @@ -634,7 +634,7 @@ struct sli4_rqst_cmn_create_cq_set_v0 { __le16 num_cq_req; __le16 dw6w1_flags; __le16 eq_id[16]; - struct sli4_dmaaddr page_phys_addr[0]; + struct sli4_dmaaddr page_phys_addr[]; }; /* CQE count */ @@ -764,7 +764,7 @@ struct sli4_rqst_cmn_create_mq_ext { __le32 dw7_val; __le32 dw8_flags; __le32 rsvd36; - struct sli4_dmaaddr page_phys_addr[0]; + struct sli4_dmaaddr page_phys_addr[]; }; struct sli4_rsp_cmn_create_mq_ext { @@ -802,7 +802,7 @@ struct sli4_rqst_cmn_create_cq_v0 { __le32 dw6_flags; __le32 rsvd28; __le32 rsvd32; - struct sli4_dmaaddr page_phys_addr[0]; + struct sli4_dmaaddr page_phys_addr[]; }; enum sli4_create_rq_e { @@ -887,7 +887,7 @@ struct sli4_rqst_rq_create_v2 { __le16 base_cq_id; __le16 rsvd26; __le32 rsvd42; - struct sli4_dmaaddr page_phys_addr[0]; + struct sli4_dmaaddr page_phys_addr[]; }; struct sli4_rsp_rq_create_v2 { @@ -3168,7 +3168,7 @@ struct sli4_rqst_cmn_read_object { __le32 read_offset; u8 object_name[104]; __le32 host_buffer_descriptor_count; - struct sli4_bde host_buffer_descriptor[0]; + struct sli4_bde host_buffer_descriptor[]; }; #define RSP_COM_READ_OBJ_EOF 0x80000000 @@ -3191,7 +3191,7 @@ struct sli4_rqst_cmn_write_object { __le32 write_offset; u8 object_name[104]; __le32 host_buffer_descriptor_count; - struct sli4_bde host_buffer_descriptor[0]; + struct sli4_bde host_buffer_descriptor[]; }; #define RSP_CHANGE_STATUS 0xff @@ -3217,7 +3217,7 @@ struct sli4_rqst_cmn_read_object_list { __le32 read_offset; u8 object_name[104]; __le32 host_buffer_descriptor_count; - struct sli4_bde host_buffer_descriptor[0]; + struct sli4_bde host_buffer_descriptor[]; }; enum sli4_rqst_set_dump_flags { @@ -3342,7 +3342,7 @@ struct sli4_rspource_descriptor_v1 { u8 descriptor_type; u8 descriptor_length; __le16 rsvd16; - __le32 type_specific[0]; + __le32 type_specific[]; }; enum sli4_pcie_desc_flags { @@ -3474,7 +3474,7 @@ struct sli4_rqst_post_hdr_templates { struct sli4_rqst_hdr hdr; __le16 rpi_offset; __le16 page_count; - struct sli4_dmaaddr page_descriptor[0]; + struct sli4_dmaaddr page_descriptor[]; }; #define SLI4_HDR_TEMPLATE_SIZE 64 diff --git a/drivers/scsi/mpi3mr/mpi3mr.h b/drivers/scsi/mpi3mr/mpi3mr.h index fc4eaf6d1e47..fb7d8775c9f7 100644 --- a/drivers/scsi/mpi3mr/mpi3mr.h +++ b/drivers/scsi/mpi3mr/mpi3mr.h @@ -878,7 +878,7 @@ struct mpi3mr_fwevt { bool process_evt; u32 evt_ctx; struct kref ref_count; - char event_data[0] __aligned(4); + char event_data[] __aligned(4); }; diff --git a/drivers/scsi/qla2xxx/qla_bsg.h b/drivers/scsi/qla2xxx/qla_bsg.h index 0f8a4c7e52a2..6d2b0a7436c1 100644 --- a/drivers/scsi/qla2xxx/qla_bsg.h +++ b/drivers/scsi/qla2xxx/qla_bsg.h @@ -157,7 +157,7 @@ struct qla84_msg_mgmt { uint16_t rsrvd; struct qla84_mgmt_param mgmtp;/* parameters for cmd */ uint32_t len; /* bytes in payload following this struct */ - uint8_t payload[0]; /* payload for cmd */ + uint8_t payload[]; /* payload for cmd */ }; struct qla_bsg_a84_mgmt { @@ -216,7 +216,7 @@ struct qla_image_version { struct qla_image_version_list { uint32_t count; - struct qla_image_version version[0]; + struct qla_image_version version[]; } __packed; struct qla_status_reg { diff --git a/drivers/scsi/qla2xxx/qla_def.h b/drivers/scsi/qla2xxx/qla_def.h index 9ebf4a234d9a..b6434c72dee3 100644 --- a/drivers/scsi/qla2xxx/qla_def.h +++ b/drivers/scsi/qla2xxx/qla_def.h @@ -5410,7 +5410,7 @@ struct ql_vnd_stat_entry { struct ql_vnd_stats { u64 entry_count; /* Num of entries */ u64 rservd; - struct ql_vnd_stat_entry entry[0]; /* Place holder of entries */ + struct ql_vnd_stat_entry entry[]; /* Place holder of entries */ } __packed; struct ql_vnd_host_stats_resp { diff --git a/drivers/scsi/qla2xxx/qla_edif_bsg.h b/drivers/scsi/qla2xxx/qla_edif_bsg.h index 53026d82ebff..5a26c77157da 100644 --- a/drivers/scsi/qla2xxx/qla_edif_bsg.h +++ b/drivers/scsi/qla2xxx/qla_edif_bsg.h @@ -121,7 +121,7 @@ struct app_pinfo { struct app_pinfo_reply { uint8_t port_count; uint8_t reserved[VND_CMD_APP_RESERVED_SIZE]; - struct app_pinfo ports[0]; + struct app_pinfo ports[]; } __packed; struct app_sinfo_req { @@ -140,7 +140,7 @@ struct app_sinfo { struct app_stats_reply { uint8_t elem_count; - struct app_sinfo elem[0]; + struct app_sinfo elem[]; } __packed; struct qla_sa_update_frame { diff --git a/drivers/scsi/qla2xxx/qla_fw.h b/drivers/scsi/qla2xxx/qla_fw.h index 073d06e88c58..0bb1d562f0bf 100644 --- a/drivers/scsi/qla2xxx/qla_fw.h +++ b/drivers/scsi/qla2xxx/qla_fw.h @@ -1706,7 +1706,7 @@ struct qla_flt_header { __le16 length; __le16 checksum; __le16 unused; - struct qla_flt_region region[0]; + struct qla_flt_region region[]; }; #define FLT_REGION_SIZE 16 diff --git a/drivers/scsi/qla4xxx/ql4_fw.h b/drivers/scsi/qla4xxx/ql4_fw.h index 4e1764df0a73..860ec61b51b9 100644 --- a/drivers/scsi/qla4xxx/ql4_fw.h +++ b/drivers/scsi/qla4xxx/ql4_fw.h @@ -1028,7 +1028,7 @@ struct crash_record { uint8_t out_RISC_reg_dump[256]; /* 80 -17F */ uint8_t in_RISC_reg_dump[256]; /*180 -27F */ - uint8_t in_out_RISC_stack_dump[0]; /*280 - ??? */ + uint8_t in_out_RISC_stack_dump[]; /*280 - ??? */ }; struct conn_event_log_entry { diff --git a/drivers/staging/r8188eu/include/ieee80211.h b/drivers/staging/r8188eu/include/ieee80211.h index 3a23d5299314..5e7de631b8ef 100644 --- a/drivers/staging/r8188eu/include/ieee80211.h +++ b/drivers/staging/r8188eu/include/ieee80211.h @@ -185,7 +185,7 @@ struct ieee_param { struct ieee_param_ex { u32 cmd; u8 sta_addr[ETH_ALEN]; - u8 data[0]; + u8 data[]; }; struct sta_data { @@ -713,7 +713,7 @@ struct ieee80211_info_element_hdr { struct ieee80211_info_element { u8 id; u8 len; - u8 data[0]; + u8 data[]; } __packed; /* @@ -776,7 +776,7 @@ struct ieee80211_txb { u16 reserved; u16 frag_size; u16 payload_size; - struct sk_buff *fragments[0]; + struct sk_buff *fragments[]; }; /* SWEEP TABLE ENTRIES NUMBER*/ diff --git a/drivers/staging/r8188eu/include/rtw_cmd.h b/drivers/staging/r8188eu/include/rtw_cmd.h index cf0945ae11c1..f8991a0493d0 100644 --- a/drivers/staging/r8188eu/include/rtw_cmd.h +++ b/drivers/staging/r8188eu/include/rtw_cmd.h @@ -73,7 +73,7 @@ struct c2h_evt_hdr { u8 id:4; u8 plen:4; u8 seq; - u8 payload[0]; + u8 payload[]; }; #define c2h_evt_exist(c2h_evt) ((c2h_evt)->id || (c2h_evt)->plen) @@ -662,25 +662,25 @@ struct getcurtxpwrlevel_rspi { struct setprobereqextraie_parm { unsigned char e_id; unsigned char ie_len; - unsigned char ie[0]; + unsigned char ie[]; }; struct setassocreqextraie_parm { unsigned char e_id; unsigned char ie_len; - unsigned char ie[0]; + unsigned char ie[]; }; struct setproberspextraie_parm { unsigned char e_id; unsigned char ie_len; - unsigned char ie[0]; + unsigned char ie[]; }; struct setassocrspextraie_parm { unsigned char e_id; unsigned char ie_len; - unsigned char ie[0]; + unsigned char ie[]; }; struct addBaReq_parm { diff --git a/drivers/staging/rtl8712/rtl871x_cmd.h b/drivers/staging/rtl8712/rtl871x_cmd.h index ddd69c4ae208..95e9ea5b2d98 100644 --- a/drivers/staging/rtl8712/rtl871x_cmd.h +++ b/drivers/staging/rtl8712/rtl871x_cmd.h @@ -657,25 +657,25 @@ struct setra_parm { struct setprobereqextraie_parm { unsigned char e_id; unsigned char ie_len; - unsigned char ie[0]; + unsigned char ie[]; }; struct setassocreqextraie_parm { unsigned char e_id; unsigned char ie_len; - unsigned char ie[0]; + unsigned char ie[]; }; struct setproberspextraie_parm { unsigned char e_id; unsigned char ie_len; - unsigned char ie[0]; + unsigned char ie[]; }; struct setassocrspextraie_parm { unsigned char e_id; unsigned char ie_len; - unsigned char ie[0]; + unsigned char ie[]; }; struct addBaReq_parm { diff --git a/drivers/staging/rtl8723bs/include/ieee80211.h b/drivers/staging/rtl8723bs/include/ieee80211.h index c11d7e2d2347..1e627dc0044d 100644 --- a/drivers/staging/rtl8723bs/include/ieee80211.h +++ b/drivers/staging/rtl8723bs/include/ieee80211.h @@ -204,7 +204,7 @@ struct ieee_param { struct ieee_param_ex { u32 cmd; u8 sta_addr[ETH_ALEN]; - u8 data[0]; + u8 data[]; }; struct sta_data { diff --git a/drivers/staging/rtl8723bs/include/rtw_cmd.h b/drivers/staging/rtl8723bs/include/rtw_cmd.h index 28d2d2732374..1bf030cbbbbe 100644 --- a/drivers/staging/rtl8723bs/include/rtw_cmd.h +++ b/drivers/staging/rtl8723bs/include/rtw_cmd.h @@ -94,7 +94,7 @@ struct c2h_evt_hdr { u8 id:4; u8 plen:4; u8 seq; - u8 payload[0]; + u8 payload[]; }; struct c2h_evt_hdr_88xx { diff --git a/drivers/staging/vc04_services/include/linux/raspberrypi/vchiq.h b/drivers/staging/vc04_services/include/linux/raspberrypi/vchiq.h index 81db7fb76d6d..c93f2f3e87bb 100644 --- a/drivers/staging/vc04_services/include/linux/raspberrypi/vchiq.h +++ b/drivers/staging/vc04_services/include/linux/raspberrypi/vchiq.h @@ -45,7 +45,7 @@ struct vchiq_header { /* Size of message data. */ unsigned int size; - char data[0]; /* message */ + char data[]; /* message */ }; struct vchiq_element { diff --git a/drivers/visorbus/vbuschannel.h b/drivers/visorbus/vbuschannel.h index 4aaf6564eb9f..98711fb6d66e 100644 --- a/drivers/visorbus/vbuschannel.h +++ b/drivers/visorbus/vbuschannel.h @@ -89,7 +89,7 @@ struct visor_vbus_channel { struct visor_vbus_headerinfo hdr_info; struct visor_vbus_deviceinfo chp_info; struct visor_vbus_deviceinfo bus_info; - struct visor_vbus_deviceinfo dev_info[0]; + struct visor_vbus_deviceinfo dev_info[]; } __packed; #endif diff --git a/fs/cifs/ntlmssp.h b/fs/cifs/ntlmssp.h index 298458404252..55758b9ec877 100644 --- a/fs/cifs/ntlmssp.h +++ b/fs/cifs/ntlmssp.h @@ -107,7 +107,7 @@ struct negotiate_message { SECURITY_BUFFER WorkstationName; /* RFC 1001 and ASCII */ struct ntlmssp_version Version; /* SECURITY_BUFFER */ - char DomainString[0]; + char DomainString[]; /* followed by WorkstationString */ } __packed; diff --git a/fs/ext4/fast_commit.h b/fs/ext4/fast_commit.h index 083ad1cb705a..07e8b734c4fd 100644 --- a/fs/ext4/fast_commit.h +++ b/fs/ext4/fast_commit.h @@ -55,13 +55,13 @@ struct ext4_fc_del_range { struct ext4_fc_dentry_info { __le32 fc_parent_ino; __le32 fc_ino; - __u8 fc_dname[0]; + __u8 fc_dname[]; }; /* Value structure for EXT4_FC_TAG_INODE and EXT4_FC_TAG_INODE_PARTIAL. */ struct ext4_fc_inode { __le32 fc_ino; - __u8 fc_raw_inode[0]; + __u8 fc_raw_inode[]; }; /* Value structure for tag EXT4_FC_TAG_TAIL. */ diff --git a/fs/ksmbd/ksmbd_netlink.h b/fs/ksmbd/ksmbd_netlink.h index 71bfb7de4472..ebe6ca08467a 100644 --- a/fs/ksmbd/ksmbd_netlink.h +++ b/fs/ksmbd/ksmbd_netlink.h @@ -241,7 +241,7 @@ struct ksmbd_rpc_command { struct ksmbd_spnego_authen_request { __u32 handle; __u16 spnego_blob_len; /* the length of spnego_blob */ - __u8 spnego_blob[0]; /* + __u8 spnego_blob[]; /* * the GSS token from SecurityBuffer of * SMB2 SESSION SETUP request */ diff --git a/fs/ksmbd/ntlmssp.h b/fs/ksmbd/ntlmssp.h index adaf4c0cbe8f..f13153c18b4e 100644 --- a/fs/ksmbd/ntlmssp.h +++ b/fs/ksmbd/ntlmssp.h @@ -95,7 +95,7 @@ struct security_buffer { struct target_info { __le16 Type; __le16 Length; - __u8 Content[0]; + __u8 Content[]; } __packed; struct negotiate_message { @@ -108,7 +108,7 @@ struct negotiate_message { * struct security_buffer for version info not present since we * do not set the version is present flag */ - char DomainString[0]; + char DomainString[]; /* followed by WorkstationString */ } __packed; @@ -140,7 +140,7 @@ struct authenticate_message { * struct security_buffer for version info not present since we * do not set the version is present flag */ - char UserString[0]; + char UserString[]; } __packed; struct ntlmv2_resp { diff --git a/fs/ksmbd/smb2pdu.h b/fs/ksmbd/smb2pdu.h index 725b800c29c8..d49468426576 100644 --- a/fs/ksmbd/smb2pdu.h +++ b/fs/ksmbd/smb2pdu.h @@ -759,7 +759,7 @@ struct smb2_file_rename_info { /* encoding of request for level 10 */ __u8 Reserved[7]; __u64 RootDirectory; /* MBZ for network operations (why says spec?) */ __le32 FileNameLength; - char FileName[0]; /* New name to be assigned */ + char FileName[]; /* New name to be assigned */ } __packed; /* level 10 Set */ struct smb2_file_link_info { /* encoding of request for level 11 */ @@ -768,7 +768,7 @@ struct smb2_file_link_info { /* encoding of request for level 11 */ __u8 Reserved[7]; __u64 RootDirectory; /* MBZ for network operations (why says spec?) */ __le32 FileNameLength; - char FileName[0]; /* Name to be assigned to new link */ + char FileName[]; /* Name to be assigned to new link */ } __packed; /* level 11 Set */ /* @@ -810,7 +810,7 @@ struct smb2_file_basic_info { /* data block encoding of response to level 18 */ struct smb2_file_alt_name_info { __le32 FileNameLength; - char FileName[0]; + char FileName[]; } __packed; struct smb2_file_stream_info { @@ -818,7 +818,7 @@ struct smb2_file_stream_info { __le32 StreamNameLength; __le64 StreamSize; __le64 StreamAllocationSize; - char StreamName[0]; + char StreamName[]; } __packed; struct smb2_file_eof_info { /* encoding of request for level 10 */ diff --git a/fs/ksmbd/transport_rdma.c b/fs/ksmbd/transport_rdma.c index 3c1ec1ac0b27..9976d39c6ed8 100644 --- a/fs/ksmbd/transport_rdma.c +++ b/fs/ksmbd/transport_rdma.c @@ -211,7 +211,7 @@ struct smb_direct_rdma_rw_msg { struct completion *completion; struct rdma_rw_ctx rw_ctx; struct sg_table sgt; - struct scatterlist sg_list[0]; + struct scatterlist sg_list[]; }; static inline int get_buf_page_count(void *buf, int size) diff --git a/fs/ksmbd/xattr.h b/fs/ksmbd/xattr.h index 8857c01093d9..16499ca5c82d 100644 --- a/fs/ksmbd/xattr.h +++ b/fs/ksmbd/xattr.h @@ -76,7 +76,7 @@ struct xattr_acl_entry { struct xattr_smb_acl { int count; int next; - struct xattr_acl_entry entries[0]; + struct xattr_acl_entry entries[]; }; /* 64bytes hash in xattr_ntacl is computed with sha256 */ diff --git a/fs/xfs/scrub/attr.h b/fs/xfs/scrub/attr.h index 1719e1c4da59..3590e10e3e62 100644 --- a/fs/xfs/scrub/attr.h +++ b/fs/xfs/scrub/attr.h @@ -24,7 +24,7 @@ struct xchk_xattr_buf { * space bitmap follows immediately after; and we have a third buffer * for storing intermediate bitmap results. */ - uint8_t buf[0]; + uint8_t buf[]; }; /* A place to store attribute values. */ diff --git a/include/acpi/actbl2.h b/include/acpi/actbl2.h index 16847c8d9d5f..9ee4d1b39125 100644 --- a/include/acpi/actbl2.h +++ b/include/acpi/actbl2.h @@ -2319,7 +2319,7 @@ struct acpi_table_rgrt { u16 version; u8 image_type; u8 reserved; - u8 image[0]; + u8 image[]; }; /* image_type values */ diff --git a/include/asm-generic/tlb.h b/include/asm-generic/tlb.h index 2c68a545ffa7..fd7feb5c7894 100644 --- a/include/asm-generic/tlb.h +++ b/include/asm-generic/tlb.h @@ -180,7 +180,7 @@ struct mmu_table_batch { struct rcu_head rcu; #endif unsigned int nr; - void *tables[0]; + void *tables[]; }; #define MAX_TABLE_BATCH \ @@ -227,7 +227,7 @@ struct mmu_gather_batch { struct mmu_gather_batch *next; unsigned int nr; unsigned int max; - struct page *pages[0]; + struct page *pages[]; }; #define MAX_GATHER_BATCH \ diff --git a/include/linux/greybus/greybus_manifest.h b/include/linux/greybus/greybus_manifest.h index 6e62fe478712..bef9eb2093e9 100644 --- a/include/linux/greybus/greybus_manifest.h +++ b/include/linux/greybus/greybus_manifest.h @@ -100,7 +100,7 @@ enum { struct greybus_descriptor_string { __u8 length; __u8 id; - __u8 string[0]; + __u8 string[]; } __packed; /* @@ -175,7 +175,7 @@ struct greybus_manifest_header { struct greybus_manifest { struct greybus_manifest_header header; - struct greybus_descriptor descriptors[0]; + struct greybus_descriptor descriptors[]; } __packed; #endif /* __GREYBUS_MANIFEST_H */ diff --git a/include/linux/greybus/hd.h b/include/linux/greybus/hd.h index d3faf0c1a569..718e2857054e 100644 --- a/include/linux/greybus/hd.h +++ b/include/linux/greybus/hd.h @@ -58,7 +58,7 @@ struct gb_host_device { struct gb_svc *svc; /* Private data for the host driver */ - unsigned long hd_priv[0] __aligned(sizeof(s64)); + unsigned long hd_priv[] __aligned(sizeof(s64)); }; #define to_gb_host_device(d) container_of(d, struct gb_host_device, dev) diff --git a/include/linux/greybus/module.h b/include/linux/greybus/module.h index 47b839af145d..3efe2133acfd 100644 --- a/include/linux/greybus/module.h +++ b/include/linux/greybus/module.h @@ -23,7 +23,7 @@ struct gb_module { bool disconnected; - struct gb_interface *interfaces[0]; + struct gb_interface *interfaces[]; }; #define to_gb_module(d) container_of(d, struct gb_module, dev) diff --git a/include/linux/i3c/ccc.h b/include/linux/i3c/ccc.h index 73b0982cc519..ad59a4ae60d1 100644 --- a/include/linux/i3c/ccc.h +++ b/include/linux/i3c/ccc.h @@ -132,7 +132,7 @@ struct i3c_ccc_dev_desc { struct i3c_ccc_defslvs { u8 count; struct i3c_ccc_dev_desc master; - struct i3c_ccc_dev_desc slaves[0]; + struct i3c_ccc_dev_desc slaves[]; } __packed; /** @@ -240,7 +240,7 @@ struct i3c_ccc_bridged_slave_desc { */ struct i3c_ccc_setbrgtgt { u8 count; - struct i3c_ccc_bridged_slave_desc bslaves[0]; + struct i3c_ccc_bridged_slave_desc bslaves[]; } __packed; /** @@ -318,7 +318,7 @@ enum i3c_ccc_setxtime_subcmd { */ struct i3c_ccc_setxtime { u8 subcmd; - u8 data[0]; + u8 data[]; } __packed; #define I3C_CCC_GETXTIME_SYNC_MODE BIT(0) diff --git a/include/linux/mlx5/mlx5_ifc_fpga.h b/include/linux/mlx5/mlx5_ifc_fpga.h index 07d77323f78a..cac4e94abd3a 100644 --- a/include/linux/mlx5/mlx5_ifc_fpga.h +++ b/include/linux/mlx5/mlx5_ifc_fpga.h @@ -185,7 +185,7 @@ struct mlx5_ifc_fpga_access_reg_bits { u8 address[0x40]; - u8 data[0][0x8]; + u8 data[][0x8]; }; enum mlx5_ifc_fpga_qp_state { diff --git a/include/linux/platform_data/brcmfmac.h b/include/linux/platform_data/brcmfmac.h index 2b5676ff35be..f922a192fe58 100644 --- a/include/linux/platform_data/brcmfmac.h +++ b/include/linux/platform_data/brcmfmac.h @@ -178,7 +178,7 @@ struct brcmfmac_platform_data { void (*power_off)(void); char *fw_alternative_path; int device_count; - struct brcmfmac_pd_device devices[0]; + struct brcmfmac_pd_device devices[]; }; diff --git a/include/linux/platform_data/cros_ec_commands.h b/include/linux/platform_data/cros_ec_commands.h index 271bd87bff0a..728735aed980 100644 --- a/include/linux/platform_data/cros_ec_commands.h +++ b/include/linux/platform_data/cros_ec_commands.h @@ -5644,7 +5644,7 @@ struct ec_response_typec_discovery { uint8_t svid_count; /* Number of SVIDs partner sent */ uint16_t reserved; uint32_t discovery_vdo[6]; /* Max VDOs allowed after VDM header is 6 */ - struct svid_mode_info svids[0]; + struct svid_mode_info svids[]; } __ec_align1; /* USB Type-C commands for AP-controlled device policy. */ diff --git a/include/net/bluetooth/mgmt.h b/include/net/bluetooth/mgmt.h index 107b25deae68..9607ec289fd0 100644 --- a/include/net/bluetooth/mgmt.h +++ b/include/net/bluetooth/mgmt.h @@ -696,7 +696,7 @@ struct mgmt_cp_set_blocked_keys { #define MGMT_READ_CONTROLLER_CAP_SIZE 0 struct mgmt_rp_read_controller_cap { __le16 cap_len; - __u8 cap[0]; + __u8 cap[]; } __packed; #define MGMT_OP_READ_EXP_FEATURES_INFO 0x0049 diff --git a/include/net/ioam6.h b/include/net/ioam6.h index 3f45ba37a2c6..781d2d8b2f29 100644 --- a/include/net/ioam6.h +++ b/include/net/ioam6.h @@ -35,7 +35,7 @@ struct ioam6_schema { int len; __be32 hdr; - u8 data[0]; + u8 data[]; }; struct ioam6_pernet_data { diff --git a/include/sound/sof/channel_map.h b/include/sound/sof/channel_map.h index fd3a30fcf756..d363f0ca6979 100644 --- a/include/sound/sof/channel_map.h +++ b/include/sound/sof/channel_map.h @@ -39,7 +39,7 @@ struct sof_ipc_channel_map { uint32_t ext_id; uint32_t ch_mask; uint32_t reserved; - int32_t ch_coeffs[0]; + int32_t ch_coeffs[]; } __packed; /** @@ -55,7 +55,7 @@ struct sof_ipc_stream_map { struct sof_ipc_cmd_hdr hdr; uint32_t num_ch_map; uint32_t reserved[3]; - struct sof_ipc_channel_map ch_map[0]; + struct sof_ipc_channel_map ch_map[]; } __packed; #endif /* __IPC_CHANNEL_MAP_H__ */ diff --git a/scripts/dtc/libfdt/fdt.h b/scripts/dtc/libfdt/fdt.h index f2e68807f277..0c91aa7f67b5 100644 --- a/scripts/dtc/libfdt/fdt.h +++ b/scripts/dtc/libfdt/fdt.h @@ -35,14 +35,14 @@ struct fdt_reserve_entry { struct fdt_node_header { fdt32_t tag; - char name[0]; + char name[]; }; struct fdt_property { fdt32_t tag; fdt32_t len; fdt32_t nameoff; - char data[0]; + char data[]; }; #endif /* !__ASSEMBLY */ diff --git a/sound/soc/intel/atom/sst-mfld-dsp.h b/sound/soc/intel/atom/sst-mfld-dsp.h index 8d9e29b16e57..c8f0816edb53 100644 --- a/sound/soc/intel/atom/sst-mfld-dsp.h +++ b/sound/soc/intel/atom/sst-mfld-dsp.h @@ -427,7 +427,7 @@ struct snd_sst_drop_response { struct snd_sst_async_msg { u32 msg_id; /* Async msg id */ - u32 payload[0]; + u32 payload[]; }; struct snd_sst_async_err_msg { @@ -514,7 +514,7 @@ struct snd_sst_bytes_v2 { u8 pipe_id; u8 rsvd; u16 len; - char bytes[0]; + char bytes[]; }; #define MAX_VTSV_FILES 2 diff --git a/sound/soc/intel/skylake/skl-topology.h b/sound/soc/intel/skylake/skl-topology.h index 22963634fbea..a5bccf2fcd88 100644 --- a/sound/soc/intel/skylake/skl-topology.h +++ b/sound/soc/intel/skylake/skl-topology.h @@ -164,7 +164,7 @@ struct skl_base_cfg_ext { u8 reserved[8]; u32 priv_param_length; /* Input pin formats followed by output ones. */ - struct skl_pin_format pins_fmt[0]; + struct skl_pin_format pins_fmt[]; } __packed; struct skl_algo_cfg { diff --git a/tools/lib/perf/include/perf/event.h b/tools/lib/perf/include/perf/event.h index 75ee385fb078..e7758707cadd 100644 --- a/tools/lib/perf/include/perf/event.h +++ b/tools/lib/perf/include/perf/event.h @@ -240,7 +240,7 @@ struct id_index_entry { struct perf_record_id_index { struct perf_event_header header; __u64 nr; - struct id_index_entry entries[0]; + struct id_index_entry entries[]; }; struct perf_record_auxtrace_info { -- 2.27.0

4 6

[PATCH v2] ASoC: cs4265: Fix the duplicated control name
by Fabio Estevam 16 Feb '22

16 Feb '22

From: Fabio Estevam <festevam(a)denx.de> Currently, the following error messages are seen during boot: asoc-simple-card sound: control 2:0:0:SPDIF Switch:0 is already present cs4265 1-004f: ASoC: failed to add widget SPDIF dapm kcontrol SPDIF Switch: -16 Quoting Mark Brown: "The driver is just plain buggy, it defines both a regular SPIDF Switch control and a SND_SOC_DAPM_SWITCH() called SPDIF both of which will create an identically named control, it can never have loaded without error. One or both of those has to be renamed or they need to be merged into one thing." Fix the duplicated control name by combining the two SPDIF controls here and move the register bits onto the DAPM widget and have DAPM control them. Fixes: f853d6b3ba34 ("ASoC: cs4265: Add a S/PDIF enable switch") Signed-off-by: Fabio Estevam <festevam(a)denx.de> --- Changes since v1: - Combine the two controls (Charles) sound/soc/codecs/cs4265.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/sound/soc/codecs/cs4265.c b/sound/soc/codecs/cs4265.c index 4aaee1873a11..4415fb364d4d 100644 --- a/sound/soc/codecs/cs4265.c +++ b/sound/soc/codecs/cs4265.c @@ -150,7 +150,6 @@ static const struct snd_kcontrol_new cs4265_snd_controls[] = { SOC_SINGLE("E to F Buffer Disable Switch", CS4265_SPDIF_CTL1, 6, 1, 0), SOC_ENUM("C Data Access", cam_mode_enum), - SOC_SINGLE("SPDIF Switch", CS4265_SPDIF_CTL2, 5, 1, 1), SOC_SINGLE("Validity Bit Control Switch", CS4265_SPDIF_CTL2, 3, 1, 0), SOC_ENUM("SPDIF Mono/Stereo", spdif_mono_stereo_enum), @@ -186,7 +185,7 @@ static const struct snd_soc_dapm_widget cs4265_dapm_widgets[] = { SND_SOC_DAPM_SWITCH("Loopback", SND_SOC_NOPM, 0, 0, &loopback_ctl), - SND_SOC_DAPM_SWITCH("SPDIF", SND_SOC_NOPM, 0, 0, + SND_SOC_DAPM_SWITCH("SPDIF", CS4265_SPDIF_CTL2, 5, 1, &spdif_switch), SND_SOC_DAPM_SWITCH("DAC", CS4265_PWRCTL, 1, 1, &dac_switch), -- 2.25.1

3 2

[PATCH v7 0/7] Add pin control support for lpass sc7280
by Srinivasa Rao Mandadapu 16 Feb '22

16 Feb '22

This patch series is to split lpass variant common pin control functions and SoC specific functions and to add lpass sc7280 pincontrol support. It also Adds dt-bindings for lpass sc7280 lpass lpi pincontrol. Changes Since V6: -- Update conditional clock voting to optional clock voting. -- Update Kconfig depends on field with select. -- Fix typo errors. Changes Since V5: -- Create new patch by updating macro name to lpi specific. -- Create new patch by updating lpi pin group structure with core group_desc structure. -- Fix typo errors. -- Sort macros in the make file and configuration file. Changes Since V4: -- Update commit message and description of the chip specific extraction patch. -- Sort macros in kconfig and makefile. -- Update optional clock voting to conditional clock voting. -- Fix typo errors. -- Move to quicinc domain email id's. Changes Since V3: -- Update separate Kconfig fields for sm8250 and sc7280. -- Update module license and description. -- Move static variables to corresponding .c files from header file. Changes Since V2: -- Add new dt-bindings for sc7280 lpi driver. -- Make clock voting change as separate patch. -- Split existing pincontrol driver and make common functions as part of separate file. -- Rename lpass pincontrol lpi dt-bindings to sm8250 specific dt-bindings Changes Since V1: -- Make lpi pinctrl variant data structure as constant -- Add appropriate commit message -- Change signedoff by sequence. Srinivasa Rao Mandadapu (7): dt-bindings: pinctrl: qcom: Update lpass lpi file name to SoC specific dt-bindings: pinctrl: qcom: Add sc7280 lpass lpi pinctrl bindings pinctrl: qcom: Update macro name to LPI specific pinctrl: qcom: Update lpi pin group structure pinctrl: qcom: Extract chip specific LPASS LPI code pinctrl: qcom: Add SC7280 lpass pin configuration pinctrl: qcom: Update clock voting as optional Tested this on SM8250 MTP with WSA and WCD codecs. Tested-by: Srinivas Kandagatla <srinivas.kandagatla(a)linaro.org> .../bindings/pinctrl/qcom,lpass-lpi-pinctrl.yaml | 133 ----------- .../pinctrl/qcom,sc7280-lpass-lpi-pinctrl.yaml | 115 ++++++++++ .../pinctrl/qcom,sm8250-lpass-lpi-pinctrl.yaml | 133 +++++++++++ drivers/pinctrl/qcom/Kconfig | 16 ++ drivers/pinctrl/qcom/Makefile | 2 + drivers/pinctrl/qcom/pinctrl-lpass-lpi.c | 245 +-------------------- drivers/pinctrl/qcom/pinctrl-lpass-lpi.h | 86 ++++++++ drivers/pinctrl/qcom/pinctrl-sc7280-lpass-lpi.c | 168 ++++++++++++++ drivers/pinctrl/qcom/pinctrl-sm8250-lpass-lpi.c | 166 ++++++++++++++ 9 files changed, 696 insertions(+), 368 deletions(-) delete mode 100644 Documentation/devicetree/bindings/pinctrl/qcom,lpass-lpi-pinctrl.yaml create mode 100644 Documentation/devicetree/bindings/pinctrl/qcom,sc7280-lpass-lpi-pinctrl.yaml create mode 100644 Documentation/devicetree/bindings/pinctrl/qcom,sm8250-lpass-lpi-pinctrl.yaml create mode 100644 drivers/pinctrl/qcom/pinctrl-lpass-lpi.h create mode 100644 drivers/pinctrl/qcom/pinctrl-sc7280-lpass-lpi.c create mode 100644 drivers/pinctrl/qcom/pinctrl-sm8250-lpass-lpi.c -- 2.7.4

1 6

[PATCH v2 0/6] Add Tegra234 HDA support
by Mohan Kumar 16 Feb '22

16 Feb '22

This series add the support for TEGRA234 HDA driver support Mohan Kumar (6): ALSA: hda/tegra: Add Tegra234 hda driver support ALSA: hda/tegra: Hardcode GCAP ISS value on T234 ALSA: hda/tegra: Update scratch reg. communication dt-bindings: Add HDA support for Tegra234 dt-bindings: Document Tegra234 HDA support arm64: tegra: Add hda dts node for Tegra234 .../bindings/sound/nvidia,tegra30-hda.yaml | 3 + .../nvidia/tegra234-p3737-0000+p3701-0000.dts | 6 + arch/arm64/boot/dts/nvidia/tegra234.dtsi | 18 +++ include/dt-bindings/clock/tegra234-clock.h | 4 + include/dt-bindings/memory/tegra234-mc.h | 6 + .../dt-bindings/power/tegra234-powergate.h | 9 ++ include/dt-bindings/reset/tegra234-reset.h | 2 + sound/pci/hda/hda_tegra.c | 33 ++++- sound/pci/hda/patch_hdmi.c | 118 ++++++++++++++---- 9 files changed, 175 insertions(+), 24 deletions(-) create mode 100644 include/dt-bindings/power/tegra234-powergate.h -- 2.17.1

5 12

[PATCH] ASoC: core: unregister clients and machine drivers in .shutdown
by Kai Vehmanen 16 Feb '22

16 Feb '22

From: Pierre-Louis Bossart <pierre-louis.bossart(a)linux.intel.com> On a platform shutdown, the expectation for most drivers is that userspace tasks will release all resources. When those sequences do not complete, it can be the case that PCM devices exposed by ALSA cards are used *after* the DSP shutdown completes, leading to a platform hang. When the clients and machine drivers provide an _unregister callback, let's invoke it in the shutdown sequence. Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart(a)linux.intel.com> Reviewed-by: Kai Vehmanen <kai.vehmanen(a)linux.intel.com> Reviewed-by: Ranjani Sridharan <ranjani.sridharan(a)linux.intel.com> Signed-off-by: Kai Vehmanen <kai.vehmanen(a)linux.intel.com> --- sound/soc/sof/core.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/sound/soc/sof/core.c b/sound/soc/sof/core.c index d99ecbb4282d..2a35d8ddf43e 100644 --- a/sound/soc/sof/core.c +++ b/sound/soc/sof/core.c @@ -463,10 +463,19 @@ EXPORT_SYMBOL(snd_sof_device_remove); int snd_sof_device_shutdown(struct device *dev) { struct snd_sof_dev *sdev = dev_get_drvdata(dev); + struct snd_sof_pdata *pdata = sdev->pdata; if (IS_ENABLED(CONFIG_SND_SOC_SOF_PROBE_WORK_QUEUE)) cancel_work_sync(&sdev->probe_work); + /* + * make sure clients and machine driver(s) are unregistered to force + * all userspace devices to be closed prior to the DSP shutdown sequence + */ + sof_unregister_clients(sdev); + + snd_sof_machine_unregister(sdev, pdata); + if (sdev->fw_state == SOF_FW_BOOT_COMPLETE) return snd_sof_shutdown(sdev); base-commit: f7d344a2bd5ec81fbd1ce76928fd059e57ec9bea -- 2.35.1

2 2

[PATCH] ALSA: hda/hdmi: add keep-alive support for ADL-P and DG2
by Kai Vehmanen 16 Feb '22

16 Feb '22

Implement HDA keep alive (KAE) support for Intel display codecs. When no audio stream is active, the display codec will provide a continuous clock and a valid but silent audio stream to any connected HDMI/DP receiver. Without this, upon starting a new playback stream, initial samples may be lost as many receivers require time to initialize for new clock. This is a new feature in Intel AlderLake-P display codec implementation and replaces the Intel i915 silent-stream extension that has been used on older hardware. Main benefit of the new method is that codec no longer needs to be kept in D0 power state. This patch depends on commit 112a87c48e83 ("drm/i915/display: program audio CDCLK-TS for keepalives"). Signed-off-by: Kai Vehmanen <kai.vehmanen(a)linux.intel.com> Reviewed-by: Pierre-Louis Bossart <pierre-louis.bossart(a)linux.intel.com> Reviewed-by: Jyri Sarha <jyri.sarha(a)intel.com> --- Hi, with newer Intel hardware, we can support the HDMI/DP silent-stream/keep-alive with standard HDA KAE bit. This patch only enables KAE for Intel hardware, but the patch is done in a way to allow other vendor's to opt-in and use the same KAE code. As I can't validate this for other hw, I only enable the feature for hw I have. The Intel specific implementation is put under SILENT_STREAM_I915 and it continues to be used for older hardware. sound/pci/hda/Kconfig | 19 ++--- sound/pci/hda/patch_hdmi.c | 152 +++++++++++++++++++++++++++---------- 2 files changed, 122 insertions(+), 49 deletions(-) diff --git a/sound/pci/hda/Kconfig b/sound/pci/hda/Kconfig index febe1c2b7d9a..9f6c99c1d87b 100644 --- a/sound/pci/hda/Kconfig +++ b/sound/pci/hda/Kconfig @@ -285,15 +285,16 @@ config SND_HDA_INTEL_HDMI_SILENT_STREAM bool "Enable Silent Stream always for HDMI" depends on SND_HDA_INTEL help - Intel hardware has a feature called 'silent stream', that - keeps external HDMI receiver's analog circuitry powered on - avoiding 2-3 sec silence during playback start. This mechanism - relies on setting channel_id as 0xf, sending info packet and - preventing codec D3 entry (increasing platform static power - consumption when HDMI receiver is plugged-in). 2-3 sec silence - at the playback start is expected whenever there is format change. - (default is 2 channel format). - Say Y to enable Silent Stream feature. + Say Y to enable HD-Audio Keep Alive (KAE) aka Silent Stream + for HDMI on hardware that supports the feature. + + When enabled, the HDMI/DisplayPort codec will continue to provide + a continuous clock and a valid but silent data stream to + any connected external receiver. This allows to avoid gaps + at start of playback. Many receivers require multiple seconds + to start playing audio after the clock has been stopped. + This feature can impact power consumption as resources + are kept reserved both at transmitter and receiver. endif diff --git a/sound/pci/hda/patch_hdmi.c b/sound/pci/hda/patch_hdmi.c index 64fe025fda86..584af2aa2f41 100644 --- a/sound/pci/hda/patch_hdmi.c +++ b/sound/pci/hda/patch_hdmi.c @@ -120,6 +120,12 @@ struct hdmi_pcm { struct snd_kcontrol *eld_ctl; }; +enum { + SILENT_STREAM_OFF = 0, + SILENT_STREAM_KAE, /* use standard HDA Keep-Alive */ + SILENT_STREAM_I915, /* Intel i915 extension */ +}; + struct hdmi_spec { struct hda_codec *codec; int num_cvts; @@ -179,7 +185,7 @@ struct hdmi_spec { hda_nid_t vendor_nid; const int *port_map; int port_num; - bool send_silent_stream; /* Flag to enable silent stream feature */ + int silent_stream_type; }; #ifdef CONFIG_SND_HDA_COMPONENT @@ -1665,18 +1671,71 @@ static void hdmi_present_sense_via_verbs(struct hdmi_spec_per_pin *per_pin, #define I915_SILENT_FORMAT_BITS 16 #define I915_SILENT_FMT_MASK 0xf +static void silent_stream_enable_i915(struct hda_codec *codec, + struct hdmi_spec_per_pin *per_pin) +{ + unsigned int format; + + snd_hdac_sync_audio_rate(&codec->core, per_pin->pin_nid, + per_pin->dev_id, I915_SILENT_RATE); + + /* trigger silent stream generation in hw */ + format = snd_hdac_calc_stream_format(I915_SILENT_RATE, I915_SILENT_CHANNELS, + I915_SILENT_FORMAT, I915_SILENT_FORMAT_BITS, 0); + snd_hda_codec_setup_stream(codec, per_pin->cvt_nid, + I915_SILENT_FMT_MASK, I915_SILENT_FMT_MASK, format); + usleep_range(100, 200); + snd_hda_codec_setup_stream(codec, per_pin->cvt_nid, I915_SILENT_FMT_MASK, 0, format); + + per_pin->channels = I915_SILENT_CHANNELS; + hdmi_setup_audio_infoframe(codec, per_pin, per_pin->non_pcm); +} + +static void silent_stream_set_kae(struct hda_codec *codec, + struct hdmi_spec_per_pin *per_pin, + bool enable) +{ + unsigned int param; + + codec_dbg(codec, "HDMI: KAE %d cvt-NID=0x%x\n", enable, per_pin->cvt_nid); + + param = snd_hda_codec_read(codec, per_pin->cvt_nid, 0, AC_VERB_GET_DIGI_CONVERT_1, 0); + param = (param >> 16) & 0xff; + + if (enable) + param |= AC_DIG3_KAE; + else + param &= ~AC_DIG3_KAE; + + snd_hda_codec_write(codec, per_pin->cvt_nid, 0, AC_VERB_SET_DIGI_CONVERT_3, param); +} + static void silent_stream_enable(struct hda_codec *codec, struct hdmi_spec_per_pin *per_pin) { struct hdmi_spec *spec = codec->spec; struct hdmi_spec_per_cvt *per_cvt; int cvt_idx, pin_idx, err; - unsigned int format; + int keep_power = 0; + + /* + * Power-up will call hdmi_present_sense, so the PM calls + * have to be done without mutex held. + */ + + err = snd_hda_power_up_pm(codec); + if (err < 0 && err != -EACCES) { + codec_err(codec, + "Failed to power up codec for silent stream enable ret=[%d]\n", err); + snd_hda_power_down_pm(codec); + return; + } mutex_lock(&per_pin->lock); if (per_pin->setup) { codec_dbg(codec, "hdmi: PCM already open, no silent stream\n"); + err = -EBUSY; goto unlock_out; } @@ -1703,22 +1762,23 @@ static void silent_stream_enable(struct hda_codec *codec, /* configure unused pins to choose other converters */ pin_cvt_fixup(codec, per_pin, 0); - snd_hdac_sync_audio_rate(&codec->core, per_pin->pin_nid, - per_pin->dev_id, I915_SILENT_RATE); - - /* trigger silent stream generation in hw */ - format = snd_hdac_calc_stream_format(I915_SILENT_RATE, I915_SILENT_CHANNELS, - I915_SILENT_FORMAT, I915_SILENT_FORMAT_BITS, 0); - snd_hda_codec_setup_stream(codec, per_pin->cvt_nid, - I915_SILENT_FMT_MASK, I915_SILENT_FMT_MASK, format); - usleep_range(100, 200); - snd_hda_codec_setup_stream(codec, per_pin->cvt_nid, I915_SILENT_FMT_MASK, 0, format); - - per_pin->channels = I915_SILENT_CHANNELS; - hdmi_setup_audio_infoframe(codec, per_pin, per_pin->non_pcm); + switch (spec->silent_stream_type) { + case SILENT_STREAM_KAE: + silent_stream_set_kae(codec, per_pin, true); + break; + case SILENT_STREAM_I915: + silent_stream_enable_i915(codec, per_pin); + keep_power = 1; + break; + default: + break; + } unlock_out: mutex_unlock(&per_pin->lock); + + if (err || !keep_power) + snd_hda_power_down_pm(codec); } static void silent_stream_disable(struct hda_codec *codec, @@ -1726,7 +1786,16 @@ static void silent_stream_disable(struct hda_codec *codec, { struct hdmi_spec *spec = codec->spec; struct hdmi_spec_per_cvt *per_cvt; - int cvt_idx; + int cvt_idx, err; + + err = snd_hda_power_up_pm(codec); + if (err < 0 && err != -EACCES) { + codec_err(codec, + "Failed to power up codec for silent stream disable ret=[%d]\n", + err); + snd_hda_power_down_pm(codec); + return; + } mutex_lock(&per_pin->lock); if (!per_pin->silent_stream) @@ -1741,11 +1810,16 @@ static void silent_stream_disable(struct hda_codec *codec, per_cvt->assigned = 0; } + if (spec->silent_stream_type == SILENT_STREAM_KAE) + silent_stream_set_kae(codec, per_pin, false); + per_pin->cvt_nid = 0; per_pin->silent_stream = false; unlock_out: mutex_unlock(&per_pin->lock); + + snd_hda_power_down_pm(codec); } /* update ELD and jack state via audio component */ @@ -1767,29 +1841,11 @@ static void sync_eld_via_acomp(struct hda_codec *codec, monitor_next = per_pin->sink_eld.monitor_present; mutex_unlock(&per_pin->lock); - /* - * Power-up will call hdmi_present_sense, so the PM calls - * have to be done without mutex held. - */ - - if (spec->send_silent_stream) { - int pm_ret; - - if (!monitor_prev && monitor_next) { - pm_ret = snd_hda_power_up_pm(codec); - if (pm_ret < 0) - codec_err(codec, - "Monitor plugged-in, Failed to power up codec ret=[%d]\n", - pm_ret); + if (spec->silent_stream_type) { + if (!monitor_prev && monitor_next) silent_stream_enable(codec, per_pin); - } else if (monitor_prev && !monitor_next) { + else if (monitor_prev && !monitor_next) silent_stream_disable(codec, per_pin); - pm_ret = snd_hda_power_down_pm(codec); - if (pm_ret < 0) - codec_err(codec, - "Monitor plugged-out, Failed to power down codec ret=[%d]\n", - pm_ret); - } } } @@ -2982,7 +3038,7 @@ static int intel_hsw_common_init(struct hda_codec *codec, hda_nid_t vendor_nid, * module param or Kconfig option */ if (send_silent_stream) - spec->send_silent_stream = true; + spec->silent_stream_type = SILENT_STREAM_I915; return parse_intel_hdmi(codec); } @@ -3035,6 +3091,22 @@ static int patch_i915_tgl_hdmi(struct hda_codec *codec) return ret; } +static int patch_i915_adlp_hdmi(struct hda_codec *codec) +{ + struct hdmi_spec *spec; + int res; + + res = patch_i915_tgl_hdmi(codec); + if (!res) { + spec = codec->spec; + + if (spec->silent_stream_type) + spec->silent_stream_type = SILENT_STREAM_KAE; + } + + return res; +} + /* Intel Baytrail and Braswell; with eld notifier */ static int patch_i915_byt_hdmi(struct hda_codec *codec) { @@ -4391,10 +4463,10 @@ HDA_CODEC_ENTRY(0x80862814, "DG1 HDMI", patch_i915_tgl_hdmi), HDA_CODEC_ENTRY(0x80862815, "Alderlake HDMI", patch_i915_tgl_hdmi), HDA_CODEC_ENTRY(0x80862816, "Rocketlake HDMI", patch_i915_tgl_hdmi), HDA_CODEC_ENTRY(0x80862818, "Raptorlake HDMI", patch_i915_tgl_hdmi), -HDA_CODEC_ENTRY(0x80862819, "DG2 HDMI", patch_i915_tgl_hdmi), +HDA_CODEC_ENTRY(0x80862819, "DG2 HDMI", patch_i915_adlp_hdmi), HDA_CODEC_ENTRY(0x8086281a, "Jasperlake HDMI", patch_i915_icl_hdmi), HDA_CODEC_ENTRY(0x8086281b, "Elkhartlake HDMI", patch_i915_icl_hdmi), -HDA_CODEC_ENTRY(0x8086281c, "Alderlake-P HDMI", patch_i915_tgl_hdmi), +HDA_CODEC_ENTRY(0x8086281c, "Alderlake-P HDMI", patch_i915_adlp_hdmi), HDA_CODEC_ENTRY(0x80862880, "CedarTrail HDMI", patch_generic_hdmi), HDA_CODEC_ENTRY(0x80862882, "Valleyview2 HDMI", patch_i915_byt_hdmi), HDA_CODEC_ENTRY(0x80862883, "Braswell HDMI", patch_i915_byt_hdmi), base-commit: fc30f8dd54d4b42ace4e0bcf356ba2f2e1d8a2c7 -- 2.35.1

3 3

[PATCH v17 0/2] mtk: add ADSP mailbox controller for MT8195
by allen-kh.cheng 15 Feb '22

15 Feb '22

From: Allen-KH Cheng <Allen-KH.Cheng(a)mediatek.com> Mediatek ADSP IPC is used to send notification or short message between processors with dsp. It will place the message to the share buffer and will access the ADSP mailbox registers to kick dsp. Two mailboxes used to send notification or short message between processors with dsp. This patchset was tested and confirmed on MT8195 cherry board. Based on linux-next changes since v16: - fix WARNING: modpost: missing MODULE_LICENSE() in drivers/mailbox /mtk-adsp-mailbox.o. Add MODULE_LICENSE in the last line. - Due to WARNING: Missing or malformed SPDX-License-Identifier tag in line 1 in checkpatch, we don't remove SPDX-License in line 1. changes since v15: - add paragraphs to describe the config symbols fully changes since v14: - add inline for get_mtk_adsp_mbox_priv changes since v13: - rebase on v5.16-rc8 - add back ptr check from of_device_get_match_data changes since v12: - remove of_device_get_match_data ptr check: of_device_get_match_data(dev) will never going to return NULL. driver probe with compatible mediatek,mt8195-adsp-mbox. changes since v11: - remove useless MODULE_LICENSE changes since v10: - split up v9 into two separate submissions changes since v9: - rename adsp_mbox_chan_ops to mtk_adsp_mbox_chan_ops changes since v8: - remove struct adsp_mbox_ch_info - add get_mtk_adsp_mbox_priv - use mtk_adsp_mbox_priv va_mboxreg address in adsp mbox driver - add struct mtk_adsp_mbox_cfg for DSP mbox register offset - remove adsp mbox register offset hard code define - remove mtk-adsp-ipc.h reference in adsp mbox driver changes since v7: - add mtk prefix for adsp ipc functions - rename adsp_mbox_ch_info to mtk_adsp_mbox_ch_info - remove incorrect reviewers in commit message changes since v6: - dt-bindings: change example dtsi node. - rename config MTK_ADSP_IPC_MBOX to MTK_ADSP_MBOX - remove unused variable - add reviewers changes since v5: - remove some redundant code changes since v4: - use switch ... case in adsp_ipc_recv - add error handling path for chan_name pointer - refine some code to be concise changes since v3: - reorder MTK_ADSP_IPC_MBOX config - remove some redundant code - remove lock in mtk-adsp-mailbox changes since v2: - separate adsp_mailbox into two instances changes since v1: - fix dt_binding_check error Allen-KH Cheng (2): dt-bindings: mailbox: add mtk adsp-mbox document mailbox: mediatek: add support for adsp mailbox controller .../bindings/mailbox/mtk,adsp-mbox.yaml | 52 ++++++ drivers/mailbox/Kconfig | 9 + drivers/mailbox/Makefile | 2 + drivers/mailbox/mtk-adsp-mailbox.c | 176 ++++++++++++++++++ 4 files changed, 239 insertions(+) create mode 100644 Documentation/devicetree/bindings/mailbox/mtk,adsp-mbox.yaml create mode 100644 drivers/mailbox/mtk-adsp-mailbox.c -- 2.18.0

2 4

[PATCH] ASoC: tegra20: spdif: make const array rates static
by Colin Ian King 15 Feb '22

15 Feb '22

Don't populate the read-only const array rates on the stack but instead it static. Also makes the object code a little smaller. Signed-off-by: Colin Ian King <colin.i.king(a)gmail.com> --- sound/soc/tegra/tegra20_spdif.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/soc/tegra/tegra20_spdif.c b/sound/soc/tegra/tegra20_spdif.c index d09cd7ee6879..64c2f304f254 100644 --- a/sound/soc/tegra/tegra20_spdif.c +++ b/sound/soc/tegra/tegra20_spdif.c @@ -186,7 +186,7 @@ static int tegra20_spdif_filter_rates(struct snd_pcm_hw_params *params, struct snd_soc_dai *dai = rule->private; struct tegra20_spdif *spdif = dev_get_drvdata(dai->dev); struct clk *parent = clk_get_parent(spdif->clk_spdif_out); - const unsigned int rates[] = { 32000, 44100, 48000 }; + static const unsigned int rates[] = { 32000, 44100, 48000 }; long i, parent_rate, valid_rates = 0; parent_rate = clk_get_rate(parent); -- 2.34.1

2 1

[PATCH] ASoC: soc-core: skip zero num_dai component in searching dai name
by Shengjiu Wang 15 Feb '22

15 Feb '22

In the case like dmaengine which's not a dai but as a component, the num_dai is zero, dmaengine component has the same component_of_node as cpu dai, when cpu dai component is not ready, but dmaengine component is ready, try to get cpu dai name, the snd_soc_get_dai_name() return -EINVAL, not -EPROBE_DEFER, that cause below error: asoc-simple-card <card name>: parse error -22 asoc-simple-card: probe of <card name> failed with error -22 The sound card failed to probe. So this patch fixes the issue above by skipping the zero num_dai component in searching dai name. Signed-off-by: Shengjiu Wang <shengjiu.wang(a)nxp.com> --- sound/soc/soc-core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c index 434e61b46983..a088bc9f7dd7 100644 --- a/sound/soc/soc-core.c +++ b/sound/soc/soc-core.c @@ -3233,7 +3233,7 @@ int snd_soc_get_dai_name(const struct of_phandle_args *args, for_each_component(pos) { struct device_node *component_of_node = soc_component_to_node(pos); - if (component_of_node != args->np) + if (component_of_node != args->np || !pos->num_dai) continue; ret = snd_soc_component_of_xlate_dai_name(pos, args, dai_name); -- 2.17.1

2 1

[PATCH v2] ASoC: SOF: Makefile: Fix randconfig sof-client build when SND_SOC_SOF=y
by Peter Ujfalusi 15 Feb '22

15 Feb '22

Intel's kernel test robot found the following randconfig combination: SND_SOC_SOF=y SND_SOC_SOF_CLIENT=m In this the sof-client object is not going to be built into the snd-sof.o and we will have undefined references to the sof-client functions. Fixes: 6955d9512d0e ("ASoC: SOF: Introduce IPC SOF client support") Reported-by: kernel test robot <lkp(a)intel.com> Signed-off-by: Peter Ujfalusi <Peter Ujfalusi <peter.ujfalusi(a)linux.intel.com>> --- Hi Mark, Pierre, Changes since v1: - fix author and SoB from gmail.com to linux.intel.com When the client support was added we did some permutation tests (at least I did) but missed this combination. It is a valid one for sure and the proper fix is via the Makefile. Sorry for mising this Regards, Peter sound/soc/sof/Makefile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/sound/soc/sof/Makefile b/sound/soc/sof/Makefile index 4d31282c847d..a0459f06c68a 100644 --- a/sound/soc/sof/Makefile +++ b/sound/soc/sof/Makefile @@ -2,7 +2,9 @@ snd-sof-objs := core.o ops.o loader.o ipc.o pcm.o pm.o debug.o topology.o\ control.o trace.o iomem-utils.o sof-audio.o stream-ipc.o -snd-sof-$(CONFIG_SND_SOC_SOF_CLIENT) += sof-client.o +ifneq ($(CONFIG_SND_SOC_SOF_CLIENT),) +snd-sof-objs += sof-client.o +endif snd-sof-$(CONFIG_SND_SOC_SOF_COMPRESS) += compress.o -- 2.35.1

2 1

[PATCH] ASoC: cs4265: Fix the duplicated control name
by Fabio Estevam 15 Feb '22

15 Feb '22

From: Fabio Estevam <festevam(a)denx.de> Currently, the following error messages are seen during boot: asoc-simple-card sound: control 2:0:0:SPDIF Switch:0 is already present cs4265 1-004f: ASoC: failed to add widget SPDIF dapm kcontrol SPDIF Switch: -16 Quoting Mark Brown: "The driver is just plain buggy, it defines both a regular SPIDF Switch control and a SND_SOC_DAPM_SWITCH() called SPDIF both of which will create an identically named control, it can never have loaded without error. One or both of those has to be renamed." Rename it from "SPDIF Switch" to "SPDIF" to avoid the name confict. Signed-off-by: Fabio Estevam <festevam(a)denx.de> --- sound/soc/codecs/cs4265.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/soc/codecs/cs4265.c b/sound/soc/codecs/cs4265.c index c338c9f6cf91..8891e9275cba 100644 --- a/sound/soc/codecs/cs4265.c +++ b/sound/soc/codecs/cs4265.c @@ -150,7 +150,7 @@ static const struct snd_kcontrol_new cs4265_snd_controls[] = { SOC_SINGLE("E to F Buffer Disable Switch", CS4265_SPDIF_CTL1, 6, 1, 0), SOC_ENUM("C Data Access", cam_mode_enum), - SOC_SINGLE("SPDIF Switch", CS4265_SPDIF_CTL2, 5, 1, 1), + SOC_SINGLE("SPDIF", CS4265_SPDIF_CTL2, 5, 1, 1), SOC_SINGLE("Validity Bit Control Switch", CS4265_SPDIF_CTL2, 3, 1, 0), SOC_ENUM("SPDIF Mono/Stereo", spdif_mono_stereo_enum), -- 2.25.1

2 3

[PATCH] ASoC: codec: wm8960: complete discharge on BIAS OFF->STANDBY
by Viorel Suman (OSS) 15 Feb '22

15 Feb '22

From: Viorel Suman <viorel.suman(a)nxp.com> On BIAS STANDBY->OFF transition the current implementation sleeps 600ms on suspend in order to discharge the chip. The suspend is propagated from "snd_soc_suspend" call for all audio cards in a serial fashion, thus in case of boards like i.MX8DXL EVK which has 3 distinct WM8960 codecs the total cumulated sleep on suspend is 1.8 seconds. On the other hand the BIAS OFF->STANDBY transition happens asynchronously with regard to "snd_soc_resume" - the call is propagated from "soc_resume_deferred" which is just scheduled from "snd_soc_resume", each card having its own work scheduled to execute "soc_resume_deferred" call. The patch performs discharge completion on BIAS OFF->STANDBY transition so that the cumulated effect on suspend described above is avoided and discharge is completed in paralel in case of multiple WM8960 codecs on the board. Signed-off-by: Viorel Suman <viorel.suman(a)nxp.com> --- sound/soc/codecs/wm8960.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/sound/soc/codecs/wm8960.c b/sound/soc/codecs/wm8960.c index 75de6a81465df..b7a2246184e08 100644 --- a/sound/soc/codecs/wm8960.c +++ b/sound/soc/codecs/wm8960.c @@ -45,6 +45,8 @@ #define WM8960_DISOP 0x40 #define WM8960_DRES_MASK 0x30 +#define WM8960_DSCH_TOUT 600 /* discharge timeout, ms */ + static bool is_pll_freq_available(unsigned int source, unsigned int target); static int wm8960_set_pll(struct snd_soc_component *component, unsigned int freq_in, unsigned int freq_out); @@ -133,6 +135,7 @@ struct wm8960_priv { int freq_in; bool is_stream_in_use[2]; struct wm8960_data pdata; + ktime_t dsch_start; }; #define wm8960_reset(c) regmap_write(c, WM8960_RESET, 0) @@ -898,6 +901,7 @@ static int wm8960_set_bias_level_out3(struct snd_soc_component *component, struct wm8960_priv *wm8960 = snd_soc_component_get_drvdata(component); u16 pm2 = snd_soc_component_read(component, WM8960_POWER2); int ret; + ktime_t tout; switch (level) { case SND_SOC_BIAS_ON: @@ -944,6 +948,11 @@ static int wm8960_set_bias_level_out3(struct snd_soc_component *component, case SND_SOC_BIAS_STANDBY: if (snd_soc_component_get_bias_level(component) == SND_SOC_BIAS_OFF) { + /* ensure discharge is complete */ + tout = WM8960_DSCH_TOUT - ktime_ms_delta(ktime_get(), wm8960->dsch_start); + if (tout > 0) + msleep(tout); + regcache_sync(wm8960->regmap); /* Enable anti-pop features */ @@ -973,9 +982,9 @@ static int wm8960_set_bias_level_out3(struct snd_soc_component *component, WM8960_POBCTRL | WM8960_SOFT_ST | WM8960_BUFDCOPEN | WM8960_BUFIOEN); - /* Disable VMID and VREF, let them discharge */ + /* Disable VMID and VREF, mark discharge */ snd_soc_component_write(component, WM8960_POWER1, 0); - msleep(600); + wm8960->dsch_start = ktime_get(); break; } -- 2.26.3

3 2

[PATCH] conf: Remove left justification for SND_CONFIG_TYPE_REAL
by Simon Christensson 15 Feb '22

15 Feb '22

In order to avoid extra padding replace data type "%-16g" (left justification) with default right justification "%16g" when printing snd_config type SND_CONFIG_TYPE_REAL. Example for control "min_dB" available in softvol: Before patch: "min_dB -50 " After patch: "min_dB -50.0"

1 0

[PATCH 0/2] Add Euro Headset support for wcd938x codec
by Srinivasa Rao Mandadapu 15 Feb '22

15 Feb '22

This patch set is to add switch control for selecting CTIA/OMTP Headset Srinivasa Rao Mandadapu (2): ASoC: codec: wcd938x: Add switch control for selecting CTIA/OMTP Headset ASoC: dt-bindings: wcd938x: Add gpio property for selecting CTIA/OMTP headset .../devicetree/bindings/sound/qcom,wcd938x.yaml | 4 +++ sound/soc/codecs/wcd938x.c | 38 ++++++++++++++++++++++ 2 files changed, 42 insertions(+) -- 2.7.4

3 5

[PATCH 0/9] use GFP_KERNEL
by Julia Lawall 15 Feb '22

15 Feb '22

Platform_driver and pci_driver probe functions aren't called with locks held and thus don't need GFP_ATOMIC. Use GFP_KERNEL instead. All changes have been compile-tested. --- drivers/ata/pata_mpc52xx.c | 2 +- drivers/crypto/ux500/cryp/cryp_core.c | 2 +- drivers/crypto/ux500/hash/hash_core.c | 2 +- drivers/media/pci/cx18/cx18-driver.c | 2 +- drivers/media/platform/fsl-viu.c | 2 +- drivers/message/fusion/mptspi.c | 2 +- drivers/mfd/sta2x11-mfd.c | 2 +- drivers/mtd/devices/spear_smi.c | 2 +- drivers/net/ethernet/moxa/moxart_ether.c | 4 ++-- sound/soc/intel/boards/bytcr_wm5102.c | 2 +- 10 files changed, 11 insertions(+), 11 deletions(-)

5 5

[PATCH 20/23] ASoC: codecs: wcd938x: Make use of the helper component_compare/release_of
by Yong Wu 15 Feb '22

15 Feb '22

Use the common compare/release helpers from component. Cc: Liam Girdwood <lgirdwood(a)gmail.com> Cc: Mark Brown <broonie(a)kernel.org> Cc: Jaroslav Kysela <perex(a)perex.cz> Cc: Takashi Iwai <tiwai(a)suse.com> Cc: Srinivas Kandagatla <srinivas.kandagatla(a)linaro.org> Cc: Pierre-Louis Bossart <pierre-louis.bossart(a)linux.intel.com> Cc: alsa-devel(a)alsa-project.org Signed-off-by: Yong Wu <yong.wu(a)mediatek.com> --- sound/soc/codecs/wcd938x.c | 18 ++++-------------- 1 file changed, 4 insertions(+), 14 deletions(-) diff --git a/sound/soc/codecs/wcd938x.c b/sound/soc/codecs/wcd938x.c index eff200a07d9f..54f4a41ceca2 100644 --- a/sound/soc/codecs/wcd938x.c +++ b/sound/soc/codecs/wcd938x.c @@ -4417,16 +4417,6 @@ static const struct component_master_ops wcd938x_comp_ops = { .unbind = wcd938x_unbind, }; -static int wcd938x_compare_of(struct device *dev, void *data) -{ - return dev->of_node == data; -} - -static void wcd938x_release_of(struct device *dev, void *data) -{ - of_node_put(data); -} - static int wcd938x_add_slave_components(struct wcd938x_priv *wcd938x, struct device *dev, struct component_match **matchptr) @@ -4442,8 +4432,8 @@ static int wcd938x_add_slave_components(struct wcd938x_priv *wcd938x, } of_node_get(wcd938x->rxnode); - component_match_add_release(dev, matchptr, wcd938x_release_of, - wcd938x_compare_of, wcd938x->rxnode); + component_match_add_release(dev, matchptr, component_release_of, + component_compare_of, wcd938x->rxnode); wcd938x->txnode = of_parse_phandle(np, "qcom,tx-device", 0); if (!wcd938x->txnode) { @@ -4451,8 +4441,8 @@ static int wcd938x_add_slave_components(struct wcd938x_priv *wcd938x, return -ENODEV; } of_node_get(wcd938x->txnode); - component_match_add_release(dev, matchptr, wcd938x_release_of, - wcd938x_compare_of, wcd938x->txnode); + component_match_add_release(dev, matchptr, component_release_of, + component_compare_of, wcd938x->txnode); return 0; } -- 2.18.0

3 3

cs4265: failed to add widget SPDIF dapm kcontrol
by Fabio Estevam 14 Feb '22

14 Feb '22

Hi Charles, I have a custom board with a cs4265 codec and the audio plays fine. During boot, the following error messages are seen: asoc-simple-card sound: control 2:0:0:SPDIF Switch:0 is already present cs4265 1-004f: ASoC: failed to add widget SPDIF dapm kcontrol SPDIF Switch: -16 SPDIF is not used on this board. Would you have any recommendations for getting rid of such error messages? Thanks, Fabio Estevam

2 3

[PATCH v13 00/10] Add support for audio on SC7280 based targets
by Srinivasa Rao Mandadapu 14 Feb '22

14 Feb '22

This patch set is to add support for Audio over wcd codec, digital mics, through digital codecs and without ADSP. Changes Since V12: -- Fix typo errors. Changes Since V11: -- Fix kernel robot issue on arguments type mismatch. Changes Since V10: -- Split bulk clock voting to individual clock voting as per use case in cdc-dma driver. -- Add missing codec dma clocks. -- Update rxtx lpm buffer size. Changes Since V9: -- Change individual clock voting to bulk clock voting of lpass-sc7280 platform driver. -- Remove redundant clocks in lpass variant structure. -- Add mclk for MI2S based headset path. -- Remove unused lpass variant structure members in lpass header. Changes Since V8: -- Fix errors in sc7280 lpass cpu dt-bindings. -- Move to quicinc domain email id's. Changes Since V7: -- Fix indentation errors. -- Bisect patches to avoid interdependency. Changes Since V6: -- Split cdc dma regmap config macros. -- Add write dma reg fields for i2s path. -- Add helper function to distinguish rxtx and va dma ports. -- Optimizing clock and reg name in cpu dt-bindings. -- Update buffer management for cdc dma path. -- Remove Kconfig fields of machine driver. Changes Since V5: -- Include MI2S primary node to snd_soc_dai_driver in lpass-sc7280 platform driver. -- Move dependency patch list to corresponding patch. -- Add support for missing cdc-dma ports. -- Change if/else conditional statements to switch cases. -- Add missing error handlings. -- Typo errors fix. Changes Since V4: -- Remove unused variable in lpass-sc7280 platform driver. Changes Since V3: -- Remove redundant power domain controls. As power domains can be configured from dtsi. Changes Since V2: -- Split lpass sc7280 cpu driver patch and create regmap config patch. -- Create patches based on latest kernel tip. -- Add helper function to get dma control and lpaif handle. -- Remove unused variables. Changes Since V1: -- Typo errors fix -- CPU driver readable/writable apis optimization. -- Add Missing config patch -- Add Common api for repeated dmactl initialization. Srinivasa Rao Mandadapu (10): ASoC: qcom: SC7280: Update config for building codec dma drivers ASoC: qcom: Move lpass_pcm_data structure to lpass header ASoC: qcom: lpass: Add dma fields for codec dma lpass interface ASoC: qcom: Add helper function to get dma control and lpaif handle ASoC: qcom: Add register definition for codec rddma and wrdma ASoC: qcom: Add regmap config support for codec dma driver ASoC: qcom: Add support for codec dma driver ASoC: qcom: Add lpass CPU driver for codec dma control ASoC: dt-bindings: Add SC7280 lpass cpu bindings ASoC: qcom: lpass-sc7280: Add platform driver for lpass audio .../devicetree/bindings/sound/qcom,lpass-cpu.yaml | 75 ++- sound/soc/qcom/Kconfig | 11 + sound/soc/qcom/Makefile | 4 + sound/soc/qcom/lpass-cdc-dma.c | 304 ++++++++++ sound/soc/qcom/lpass-cpu.c | 244 +++++++- sound/soc/qcom/lpass-lpaif-reg.h | 127 ++++- sound/soc/qcom/lpass-platform.c | 617 ++++++++++++++++++--- sound/soc/qcom/lpass-sc7280.c | 447 +++++++++++++++ sound/soc/qcom/lpass.h | 145 +++++ 9 files changed, 1887 insertions(+), 87 deletions(-) create mode 100644 sound/soc/qcom/lpass-cdc-dma.c create mode 100644 sound/soc/qcom/lpass-sc7280.c -- 2.7.4

2 5

[GIT PULL] ASoC fixes for v5.17-rc4
by Mark Brown 14 Feb '22

14 Feb '22

The following changes since commit a4f399a1416f645ac701064a55b0cb5203707ac9: Input: wm97xx: Simplify resource management (2022-01-31 13:17:24 +0000) are available in the Git repository at: https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git tags/asoc-fix-v5.17-rc4 for you to fetch changes up to a887f9c7a4d37a8e874ba8415a42a92a1b5139fc: ASoC: wm_adsp: Correct control read size when parsing compressed buffer (2022-02-10 17:26:43 +0000) ---------------------------------------------------------------- ASoC: Fixes for v5.18 More fixes that have arrived in the past few -rcs, plus a MAINTAINERS update. The biggest update here is the fix for control change notifications in ASoC generic controls found by mixer-test. ---------------------------------------------------------------- Charles Keepax (1): ASoC: wm_adsp: Correct control read size when parsing compressed buffer Guenter Roeck (1): ASoC: Revert "ASoC: mediatek: Check for error clk pointer" Kai Vehmanen (3): ASoC: rt5682s: do not block workqueue if card is unbound ASoC: rt5668: do not block workqueue if card is unbound ASoC: rt5682: do not block workqueue if card is unbound Mark Brown (5): ASoC: ops: Fix stereo change notifications in snd_soc_put_volsw() ASoC: ops: Fix stereo change notifications in snd_soc_put_volsw_sx() ASoC: ops: Fix stereo change notifications in snd_soc_put_volsw_range() ASoC: ops: Fix stereo change notifications in snd_soc_put_xr_sx() ASoC: ops: Fix stereo change notifications Martin Povišer (1): ASoC: tas2770: Insert post reset delay Stephen Boyd (1): ASoC: qcom: Actually clear DMA interrupt register for HDMI Tzung-Bi Shih (1): MAINTAINERS: update cros_ec_codec maintainers V sujith kumar Reddy (1): ASoC: amd: acp: Set gpio_spkr_en to None for max speaker amplifer in machine driver .../bindings/sound/google,cros-ec-codec.yaml | 1 + MAINTAINERS | 1 + drivers/soc/mediatek/mtk-scpsys.c | 15 +++----- sound/soc/amd/acp/acp-mach.h | 1 - sound/soc/amd/acp/acp-sof-mach.c | 4 +-- sound/soc/codecs/rt5668.c | 12 ++++--- sound/soc/codecs/rt5682.c | 12 ++++--- sound/soc/codecs/rt5682s.c | 12 ++++--- sound/soc/codecs/tas2770.c | 7 +++- sound/soc/codecs/wm_adsp.c | 3 +- sound/soc/qcom/lpass-platform.c | 8 ++--- sound/soc/soc-ops.c | 41 ++++++++++++++++------ 12 files changed, 72 insertions(+), 45 deletions(-)

2 1

[PATCH] ASoC: wm8731: Delete empty remove() function
by Mark Brown 14 Feb '22

14 Feb '22

The I2C remove function is empty for the wm8731 driver, it can just be deleted. Signed-off-by: Mark Brown <broonie(a)kernel.org> --- sound/soc/codecs/wm8731.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/sound/soc/codecs/wm8731.c b/sound/soc/codecs/wm8731.c index 86b1f6eaa599..5d4949c2ec9b 100644 --- a/sound/soc/codecs/wm8731.c +++ b/sound/soc/codecs/wm8731.c @@ -777,11 +777,6 @@ static int wm8731_i2c_probe(struct i2c_client *i2c, return 0; } -static int wm8731_i2c_remove(struct i2c_client *client) -{ - return 0; -} - static const struct i2c_device_id wm8731_i2c_id[] = { { "wm8731", 0 }, { } @@ -794,7 +789,6 @@ static struct i2c_driver wm8731_i2c_driver = { .of_match_table = wm8731_of_match, }, .probe = wm8731_i2c_probe, - .remove = wm8731_i2c_remove, .id_table = wm8731_i2c_id, }; #endif -- 2.30.2

2 2

[PATCH 0/4] ASoC: pcm3168a: code cleanup
by Nikita Yushchenko 14 Feb '22

14 Feb '22

These patches clean up pcm3168a driver, without introducing any functional change. Nikita Yushchenko (4): ASoC: pcm3168a: cleanup unintuitive mask usage ASoC: pcm3168a: refactor hw_params routine ASoC: pcm3168a: refactor format handling ASoC: pcm3168a: remove numeric PCM3168A_NUM_SUPPLIES sound/soc/codecs/pcm3168a.c | 150 +++++++++++++++++------------------- 1 file changed, 70 insertions(+), 80 deletions(-) -- 2.30.2

2 5

[PATCH v2 1/2] platform: make platform_get_irq_optional() optional
by Sergey Shtylyov 14 Feb '22

14 Feb '22

This patch is based on the former Andy Shevchenko's patch: https://lore.kernel.org/lkml/20210331144526.19439-1-andriy.shevchenko@linux… Currently platform_get_irq_optional() returns an error code even if IRQ resource simply has not been found. It prevents the callers from being error code agnostic in their error handling: ret = platform_get_irq_optional(...); if (ret < 0 && ret != -ENXIO) return ret; // respect deferred probe if (ret > 0) ...we get an IRQ... All other *_optional() APIs seem to return 0 or NULL in case an optional resource is not available. Let's follow this good example, so that the callers would look like: ret = platform_get_irq_optional(...); if (ret < 0) return ret; if (ret > 0) ...we get an IRQ... Reported-by: Matthias Schiffer <matthias.schiffer(a)ew.tq-group.com> Signed-off-by: Sergey Shtylyov <s.shtylyov(a)omp.ru> --- Changes in version 2: - added the error check using dev_err_probe() to platform_get_irq_optional(); - fixed up the IRQ checks in 'drivers/char/ipmi/bt-bmc.c'; - fixed up the IRQ check in 'drivers/thermal/rcar_gen3_thermal.c'; - removed from the patch 'drivers/edac/xgene_edac.c and 'drivers/power/supply/mp2629_charger.c' as they were switched to calling platform_get_irq(); - shortened the IRQ checking code in 'drivers/vfio/platform/vfio_platform.c'; - rebased atop of the recent platform_get_irq_byname() patch; - reformatted the patch description. drivers/base/platform.c | 60 +++++++++++++++--------- drivers/char/ipmi/bt-bmc.c | 6 +-- drivers/counter/interrupt-cnt.c | 4 +- drivers/gpio/gpio-altera.c | 3 +- drivers/gpio/gpio-mvebu.c | 2 +- drivers/gpio/gpio-tqmx86.c | 2 +- drivers/i2c/busses/i2c-brcmstb.c | 8 ++-- drivers/i2c/busses/i2c-ocores.c | 4 +- drivers/mmc/host/sh_mmcif.c | 4 +- drivers/mtd/nand/raw/brcmnand/brcmnand.c | 4 +- drivers/net/ethernet/davicom/dm9000.c | 2 +- drivers/net/ethernet/freescale/fec_ptp.c | 2 +- drivers/phy/renesas/phy-rcar-gen3-usb2.c | 4 +- drivers/platform/chrome/cros_ec_lpc.c | 2 +- drivers/platform/x86/intel/punit_ipc.c | 2 +- drivers/spi/spi-hisi-sfc-v3xx.c | 2 +- drivers/spi/spi-mtk-nor.c | 3 +- drivers/thermal/rcar_gen3_thermal.c | 2 + drivers/tty/serial/8250/8250_mtk.c | 4 +- drivers/tty/serial/sh-sci.c | 6 +-- drivers/uio/uio_pdrv_genirq.c | 2 +- drivers/vfio/platform/vfio_platform.c | 3 +- sound/soc/dwc/dwc-i2s.c | 4 +- 23 files changed, 76 insertions(+), 59 deletions(-) diff --git a/drivers/base/platform.c b/drivers/base/platform.c index 7d08cd8947be..52a8356f8261 100644 --- a/drivers/base/platform.c +++ b/drivers/base/platform.c @@ -148,25 +148,7 @@ devm_platform_ioremap_resource_byname(struct platform_device *pdev, EXPORT_SYMBOL_GPL(devm_platform_ioremap_resource_byname); #endif /* CONFIG_HAS_IOMEM */ -/** - * platform_get_irq_optional - get an optional IRQ for a device - * @dev: platform device - * @num: IRQ number index - * - * Gets an IRQ for a platform device. Device drivers should check the return - * value for errors so as to not pass a negative integer value to the - * request_irq() APIs. This is the same as platform_get_irq(), except that it - * does not print an error message if an IRQ can not be obtained. - * - * For example:: - * - * int irq = platform_get_irq_optional(pdev, 0); - * if (irq < 0) - * return irq; - * - * Return: non-zero IRQ number on success, negative error number on failure. - */ -int platform_get_irq_optional(struct platform_device *dev, unsigned int num) +static int __platform_get_irq(struct platform_device *dev, unsigned int num) { int ret; #ifdef CONFIG_SPARC @@ -235,6 +217,42 @@ int platform_get_irq_optional(struct platform_device *dev, unsigned int num) return -EINVAL; return ret; } + +/** + * platform_get_irq_optional - get an optional IRQ for a device + * @dev: platform device + * @num: IRQ number index + * + * Gets an IRQ for a platform device. Device drivers should check the return + * value for errors so as to not pass a negative integer value to the + * request_irq() APIs. This is the same as platform_get_irq(), except that it + * does not print an error message if an IRQ can not be obtained and returns + * 0 when IRQ resource has not been found. + * + * For example:: + * + * int irq = platform_get_irq_optional(pdev, 0); + * if (irq < 0) + * return irq; + * if (irq > 0) + * ...we have IRQ line defined... + * + * Return: non-zero IRQ number on success, 0 if IRQ wasn't found, negative error + * number on failure. + */ +int platform_get_irq_optional(struct platform_device *dev, unsigned int num) +{ + int ret; + + ret = __platform_get_irq(dev, num); + if (ret == -ENXIO) + return 0; + if (ret < 0) + return dev_err_probe(&dev->dev, ret, + "IRQ index %u not found\n", num); + + return ret; +} EXPORT_SYMBOL_GPL(platform_get_irq_optional); /** @@ -258,7 +276,7 @@ int platform_get_irq(struct platform_device *dev, unsigned int num) { int ret; - ret = platform_get_irq_optional(dev, num); + ret = __platform_get_irq(dev, num); if (ret < 0) return dev_err_probe(&dev->dev, ret, "IRQ index %u not found\n", num); @@ -277,7 +295,7 @@ int platform_irq_count(struct platform_device *dev) { int ret, nr = 0; - while ((ret = platform_get_irq_optional(dev, nr)) >= 0) + while ((ret = __platform_get_irq(dev, nr)) >= 0) nr++; if (ret == -EPROBE_DEFER) diff --git a/drivers/char/ipmi/bt-bmc.c b/drivers/char/ipmi/bt-bmc.c index 7450904e330a..289acaf4e720 100644 --- a/drivers/char/ipmi/bt-bmc.c +++ b/drivers/char/ipmi/bt-bmc.c @@ -380,7 +380,7 @@ static int bt_bmc_config_irq(struct bt_bmc *bt_bmc, u32 reg; bt_bmc->irq = platform_get_irq_optional(pdev, 0); - if (bt_bmc->irq < 0) + if (bt_bmc->irq <= 0) return bt_bmc->irq; rc = devm_request_irq(dev, bt_bmc->irq, bt_bmc_irq, IRQF_SHARED, @@ -438,7 +438,7 @@ static int bt_bmc_probe(struct platform_device *pdev) bt_bmc_config_irq(bt_bmc, pdev); - if (bt_bmc->irq >= 0) { + if (bt_bmc->irq > 0) { dev_info(dev, "Using IRQ %d\n", bt_bmc->irq); } else { dev_info(dev, "No IRQ; using timer\n"); @@ -464,7 +464,7 @@ static int bt_bmc_remove(struct platform_device *pdev) struct bt_bmc *bt_bmc = dev_get_drvdata(&pdev->dev); misc_deregister(&bt_bmc->miscdev); - if (bt_bmc->irq < 0) + if (bt_bmc->irq <= 0) del_timer_sync(&bt_bmc->poll_timer); return 0; } diff --git a/drivers/counter/interrupt-cnt.c b/drivers/counter/interrupt-cnt.c index 9e99702470c2..a2443c66330b 100644 --- a/drivers/counter/interrupt-cnt.c +++ b/drivers/counter/interrupt-cnt.c @@ -157,9 +157,7 @@ static int interrupt_cnt_probe(struct platform_device *pdev) priv = counter_priv(counter); priv->irq = platform_get_irq_optional(pdev, 0); - if (priv->irq == -ENXIO) - priv->irq = 0; - else if (priv->irq < 0) + if (priv->irq < 0) return dev_err_probe(dev, priv->irq, "failed to get IRQ\n"); priv->gpio = devm_gpiod_get_optional(dev, NULL, GPIOD_IN); diff --git a/drivers/gpio/gpio-altera.c b/drivers/gpio/gpio-altera.c index b59fae993626..02a2995aa368 100644 --- a/drivers/gpio/gpio-altera.c +++ b/drivers/gpio/gpio-altera.c @@ -267,8 +267,7 @@ static int altera_gpio_probe(struct platform_device *pdev) altera_gc->mmchip.gc.parent = &pdev->dev; altera_gc->mapped_irq = platform_get_irq_optional(pdev, 0); - - if (altera_gc->mapped_irq < 0) + if (altera_gc->mapped_irq <= 0) goto skip_irq; if (of_property_read_u32(node, "altr,interrupt-type", &reg)) { diff --git a/drivers/gpio/gpio-mvebu.c b/drivers/gpio/gpio-mvebu.c index 4c1f9e1091b7..d94594807697 100644 --- a/drivers/gpio/gpio-mvebu.c +++ b/drivers/gpio/gpio-mvebu.c @@ -1293,7 +1293,7 @@ static int mvebu_gpio_probe(struct platform_device *pdev) for (i = 0; i < 4; i++) { int irq = platform_get_irq_optional(pdev, i); - if (irq < 0) + if (irq <= 0) continue; irq_set_chained_handler_and_data(irq, mvebu_gpio_irq_handler, mvchip); diff --git a/drivers/gpio/gpio-tqmx86.c b/drivers/gpio/gpio-tqmx86.c index 5b103221b58d..dc0f83236ce8 100644 --- a/drivers/gpio/gpio-tqmx86.c +++ b/drivers/gpio/gpio-tqmx86.c @@ -237,7 +237,7 @@ static int tqmx86_gpio_probe(struct platform_device *pdev) int ret, irq; irq = platform_get_irq_optional(pdev, 0); - if (irq < 0 && irq != -ENXIO) + if (irq < 0) return irq; res = platform_get_resource(pdev, IORESOURCE_IO, 0); diff --git a/drivers/i2c/busses/i2c-brcmstb.c b/drivers/i2c/busses/i2c-brcmstb.c index 490ee3962645..69395ae27a1a 100644 --- a/drivers/i2c/busses/i2c-brcmstb.c +++ b/drivers/i2c/busses/i2c-brcmstb.c @@ -250,7 +250,7 @@ static int brcmstb_i2c_wait_for_completion(struct brcmstb_i2c_dev *dev) int ret = 0; unsigned long timeout = msecs_to_jiffies(I2C_TIMEOUT); - if (dev->irq >= 0) { + if (dev->irq > 0) { if (!wait_for_completion_timeout(&dev->done, timeout)) ret = -ETIMEDOUT; } else { @@ -297,7 +297,7 @@ static int brcmstb_send_i2c_cmd(struct brcmstb_i2c_dev *dev, return rc; /* only if we are in interrupt mode */ - if (dev->irq >= 0) + if (dev->irq > 0) reinit_completion(&dev->done); /* enable BSC CTL interrupt line */ @@ -652,7 +652,7 @@ static int brcmstb_i2c_probe(struct platform_device *pdev) brcmstb_i2c_enable_disable_irq(dev, INT_DISABLE); /* register the ISR handler */ - if (dev->irq >= 0) { + if (dev->irq > 0) { rc = devm_request_irq(&pdev->dev, dev->irq, brcmstb_i2c_isr, IRQF_SHARED, int_name ? int_name : pdev->name, @@ -696,7 +696,7 @@ static int brcmstb_i2c_probe(struct platform_device *pdev) dev_info(dev->device, "%s@%dhz registered in %s mode\n", int_name ? int_name : " ", dev->clk_freq_hz, - (dev->irq >= 0) ? "interrupt" : "polling"); + (dev->irq > 0) ? "interrupt" : "polling"); return 0; diff --git a/drivers/i2c/busses/i2c-ocores.c b/drivers/i2c/busses/i2c-ocores.c index a0af027db04c..1f4d5e52ff42 100644 --- a/drivers/i2c/busses/i2c-ocores.c +++ b/drivers/i2c/busses/i2c-ocores.c @@ -691,10 +691,10 @@ static int ocores_i2c_probe(struct platform_device *pdev) if (of_device_is_compatible(pdev->dev.of_node, "sifive,fu540-c000-i2c")) { i2c->flags |= OCORES_FLAG_BROKEN_IRQ; - irq = -ENXIO; + irq = 0; } - if (irq == -ENXIO) { + if (!irq) { ocores_algorithm.master_xfer = ocores_xfer_polling; } else { if (irq < 0) diff --git a/drivers/mmc/host/sh_mmcif.c b/drivers/mmc/host/sh_mmcif.c index bcc595c70a9f..f558b9862032 100644 --- a/drivers/mmc/host/sh_mmcif.c +++ b/drivers/mmc/host/sh_mmcif.c @@ -1465,14 +1465,14 @@ static int sh_mmcif_probe(struct platform_device *pdev) sh_mmcif_sync_reset(host); sh_mmcif_writel(host->addr, MMCIF_CE_INT_MASK, MASK_ALL); - name = irq[1] < 0 ? dev_name(dev) : "sh_mmc:error"; + name = irq[1] <= 0 ? dev_name(dev) : "sh_mmc:error"; ret = devm_request_threaded_irq(dev, irq[0], sh_mmcif_intr, sh_mmcif_irqt, 0, name, host); if (ret) { dev_err(dev, "request_irq error (%s)\n", name); goto err_clk; } - if (irq[1] >= 0) { + if (irq[1] > 0) { ret = devm_request_threaded_irq(dev, irq[1], sh_mmcif_intr, sh_mmcif_irqt, 0, "sh_mmc:int", host); diff --git a/drivers/mtd/nand/raw/brcmnand/brcmnand.c b/drivers/mtd/nand/raw/brcmnand/brcmnand.c index f75929783b94..ac222985efde 100644 --- a/drivers/mtd/nand/raw/brcmnand/brcmnand.c +++ b/drivers/mtd/nand/raw/brcmnand/brcmnand.c @@ -1521,7 +1521,7 @@ static irqreturn_t brcmnand_ctlrdy_irq(int irq, void *data) /* check if you need to piggy back on the ctrlrdy irq */ if (ctrl->edu_pending) { - if (irq == ctrl->irq && ((int)ctrl->edu_irq >= 0)) + if (irq == ctrl->irq && ((int)ctrl->edu_irq > 0)) /* Discard interrupts while using dedicated edu irq */ return IRQ_HANDLED; @@ -2956,7 +2956,7 @@ static int brcmnand_edu_setup(struct platform_device *pdev) brcmnand_edu_init(ctrl); ctrl->edu_irq = platform_get_irq_optional(pdev, 1); - if (ctrl->edu_irq < 0) { + if (ctrl->edu_irq <= 0) { dev_warn(dev, "FLASH EDU enabled, using ctlrdy irq\n"); } else { diff --git a/drivers/net/ethernet/davicom/dm9000.c b/drivers/net/ethernet/davicom/dm9000.c index 0985ab216566..740c660a9411 100644 --- a/drivers/net/ethernet/davicom/dm9000.c +++ b/drivers/net/ethernet/davicom/dm9000.c @@ -1509,7 +1509,7 @@ dm9000_probe(struct platform_device *pdev) } db->irq_wake = platform_get_irq_optional(pdev, 1); - if (db->irq_wake >= 0) { + if (db->irq_wake > 0) { dev_dbg(db->dev, "wakeup irq %d\n", db->irq_wake); ret = request_irq(db->irq_wake, dm9000_wol_interrupt, diff --git a/drivers/net/ethernet/freescale/fec_ptp.c b/drivers/net/ethernet/freescale/fec_ptp.c index af99017a5453..de1d23808b6c 100644 --- a/drivers/net/ethernet/freescale/fec_ptp.c +++ b/drivers/net/ethernet/freescale/fec_ptp.c @@ -616,7 +616,7 @@ void fec_ptp_init(struct platform_device *pdev, int irq_idx) /* Failure to get an irq is not fatal, * only the PTP_CLOCK_PPS clock events should stop */ - if (irq >= 0) { + if (irq > 0) { ret = devm_request_irq(&pdev->dev, irq, fec_pps_interrupt, 0, pdev->name, ndev); if (ret < 0) diff --git a/drivers/phy/renesas/phy-rcar-gen3-usb2.c b/drivers/phy/renesas/phy-rcar-gen3-usb2.c index 9de617ca9daa..4914d6aca208 100644 --- a/drivers/phy/renesas/phy-rcar-gen3-usb2.c +++ b/drivers/phy/renesas/phy-rcar-gen3-usb2.c @@ -439,7 +439,7 @@ static int rcar_gen3_phy_usb2_init(struct phy *p) u32 val; int ret; - if (!rcar_gen3_is_any_rphy_initialized(channel) && channel->irq >= 0) { + if (!rcar_gen3_is_any_rphy_initialized(channel) && channel->irq > 0) { INIT_WORK(&channel->work, rcar_gen3_phy_usb2_work); ret = request_irq(channel->irq, rcar_gen3_phy_usb2_irq, IRQF_SHARED, dev_name(channel->dev), channel); @@ -486,7 +486,7 @@ static int rcar_gen3_phy_usb2_exit(struct phy *p) val &= ~USB2_INT_ENABLE_UCOM_INTEN; writel(val, usb2_base + USB2_INT_ENABLE); - if (channel->irq >= 0 && !rcar_gen3_is_any_rphy_initialized(channel)) + if (channel->irq > 0 && !rcar_gen3_is_any_rphy_initialized(channel)) free_irq(channel->irq, channel); return 0; diff --git a/drivers/platform/chrome/cros_ec_lpc.c b/drivers/platform/chrome/cros_ec_lpc.c index d6306d2a096f..91686d306534 100644 --- a/drivers/platform/chrome/cros_ec_lpc.c +++ b/drivers/platform/chrome/cros_ec_lpc.c @@ -400,7 +400,7 @@ static int cros_ec_lpc_probe(struct platform_device *pdev) irq = platform_get_irq_optional(pdev, 0); if (irq > 0) ec_dev->irq = irq; - else if (irq != -ENXIO) { + else if (irq < 0) { dev_err(dev, "couldn't retrieve IRQ number (%d)\n", irq); return irq; } diff --git a/drivers/platform/x86/intel/punit_ipc.c b/drivers/platform/x86/intel/punit_ipc.c index 66bb39fd0ef9..f3cf5ee1466f 100644 --- a/drivers/platform/x86/intel/punit_ipc.c +++ b/drivers/platform/x86/intel/punit_ipc.c @@ -278,7 +278,7 @@ static int intel_punit_ipc_probe(struct platform_device *pdev) platform_set_drvdata(pdev, punit_ipcdev); irq = platform_get_irq_optional(pdev, 0); - if (irq < 0) { + if (irq <= 0) { dev_warn(&pdev->dev, "Invalid IRQ, using polling mode\n"); } else { ret = devm_request_irq(&pdev->dev, irq, intel_punit_ioc, diff --git a/drivers/spi/spi-hisi-sfc-v3xx.c b/drivers/spi/spi-hisi-sfc-v3xx.c index d3a23b1c2a4c..476ddc081c60 100644 --- a/drivers/spi/spi-hisi-sfc-v3xx.c +++ b/drivers/spi/spi-hisi-sfc-v3xx.c @@ -467,7 +467,7 @@ static int hisi_sfc_v3xx_probe(struct platform_device *pdev) dev_err(dev, "failed to request irq%d, ret = %d\n", host->irq, ret); host->irq = 0; } - } else { + } else if (host->irq < 0) { host->irq = 0; } diff --git a/drivers/spi/spi-mtk-nor.c b/drivers/spi/spi-mtk-nor.c index 5c93730615f8..2422b0545936 100644 --- a/drivers/spi/spi-mtk-nor.c +++ b/drivers/spi/spi-mtk-nor.c @@ -829,8 +829,7 @@ static int mtk_nor_probe(struct platform_device *pdev) mtk_nor_init(sp); irq = platform_get_irq_optional(pdev, 0); - - if (irq < 0) { + if (irq <= 0) { dev_warn(sp->dev, "IRQ not available."); } else { ret = devm_request_irq(sp->dev, irq, mtk_nor_irq_handler, 0, diff --git a/drivers/thermal/rcar_gen3_thermal.c b/drivers/thermal/rcar_gen3_thermal.c index 43eb25b167bc..359b9941c42b 100644 --- a/drivers/thermal/rcar_gen3_thermal.c +++ b/drivers/thermal/rcar_gen3_thermal.c @@ -432,6 +432,8 @@ static int rcar_gen3_thermal_request_irqs(struct rcar_gen3_thermal_priv *priv, irq = platform_get_irq_optional(pdev, i); if (irq < 0) return irq; + if (!irq) + return -ENXIO; irqname = devm_kasprintf(dev, GFP_KERNEL, "%s:ch%d", dev_name(dev), i); diff --git a/drivers/tty/serial/8250/8250_mtk.c b/drivers/tty/serial/8250/8250_mtk.c index fb65dc601b23..328ab074fd89 100644 --- a/drivers/tty/serial/8250/8250_mtk.c +++ b/drivers/tty/serial/8250/8250_mtk.c @@ -621,7 +621,7 @@ static int __maybe_unused mtk8250_suspend(struct device *dev) serial8250_suspend_port(data->line); pinctrl_pm_select_sleep_state(dev); - if (irq >= 0) { + if (irq > 0) { err = enable_irq_wake(irq); if (err) { dev_err(dev, @@ -641,7 +641,7 @@ static int __maybe_unused mtk8250_resume(struct device *dev) struct mtk8250_data *data = dev_get_drvdata(dev); int irq = data->rx_wakeup_irq; - if (irq >= 0) + if (irq > 0) disable_irq_wake(irq); pinctrl_pm_select_default_state(dev); diff --git a/drivers/tty/serial/sh-sci.c b/drivers/tty/serial/sh-sci.c index 968967d722d4..96c3146ff6a4 100644 --- a/drivers/tty/serial/sh-sci.c +++ b/drivers/tty/serial/sh-sci.c @@ -1915,7 +1915,7 @@ static int sci_request_irq(struct sci_port *port) * Certain port types won't support all of the * available interrupt sources. */ - if (unlikely(irq < 0)) + if (unlikely(irq <= 0)) continue; } @@ -1963,7 +1963,7 @@ static void sci_free_irq(struct sci_port *port) * Certain port types won't support all of the available * interrupt sources. */ - if (unlikely(irq < 0)) + if (unlikely(irq <= 0)) continue; /* Check if already freed (irq was muxed) */ @@ -2875,7 +2875,7 @@ static int sci_init_single(struct platform_device *dev, if (sci_port->irqs[0] < 0) return -ENXIO; - if (sci_port->irqs[1] < 0) + if (sci_port->irqs[1] <= 0) for (i = 1; i < ARRAY_SIZE(sci_port->irqs); i++) sci_port->irqs[i] = sci_port->irqs[0]; diff --git a/drivers/uio/uio_pdrv_genirq.c b/drivers/uio/uio_pdrv_genirq.c index 63258b6accc4..7fd275fc6ceb 100644 --- a/drivers/uio/uio_pdrv_genirq.c +++ b/drivers/uio/uio_pdrv_genirq.c @@ -162,7 +162,7 @@ static int uio_pdrv_genirq_probe(struct platform_device *pdev) if (!uioinfo->irq) { ret = platform_get_irq_optional(pdev, 0); uioinfo->irq = ret; - if (ret == -ENXIO) + if (!ret) uioinfo->irq = UIO_IRQ_NONE; else if (ret == -EPROBE_DEFER) return ret; diff --git a/drivers/vfio/platform/vfio_platform.c b/drivers/vfio/platform/vfio_platform.c index 68a1c87066d7..f7423d10cefd 100644 --- a/drivers/vfio/platform/vfio_platform.c +++ b/drivers/vfio/platform/vfio_platform.c @@ -32,8 +32,9 @@ static struct resource *get_platform_resource(struct vfio_platform_device *vdev, static int get_platform_irq(struct vfio_platform_device *vdev, int i) { struct platform_device *pdev = (struct platform_device *) vdev->opaque; + int ret = platform_get_irq_optional(pdev, i); - return platform_get_irq_optional(pdev, i); + return ret ? ret : -ENXIO; } static int vfio_platform_probe(struct platform_device *pdev) diff --git a/sound/soc/dwc/dwc-i2s.c b/sound/soc/dwc/dwc-i2s.c index 5cb58929090d..ff19c5130459 100644 --- a/sound/soc/dwc/dwc-i2s.c +++ b/sound/soc/dwc/dwc-i2s.c @@ -643,7 +643,7 @@ static int dw_i2s_probe(struct platform_device *pdev) dev->dev = &pdev->dev; irq = platform_get_irq_optional(pdev, 0); - if (irq >= 0) { + if (irq > 0) { ret = devm_request_irq(&pdev->dev, irq, i2s_irq_handler, 0, pdev->name, dev); if (ret < 0) { @@ -697,7 +697,7 @@ static int dw_i2s_probe(struct platform_device *pdev) } if (!pdata) { - if (irq >= 0) { + if (irq > 0) { ret = dw_pcm_register(pdev); dev->use_pio = true; } else { -- 2.26.3

4 7

[PATCH] ALSA: hda/realtek: Fix deadlock by COEF mutex
by Takashi Iwai 14 Feb '22

14 Feb '22

The recently introduced coef_mutex for Realtek codec seems causing a deadlock when the relevant code is invoked from the power-off state; then the HD-audio core tries to power-up internally, and this kicks off the codec runtime PM code that tries to take the same coef_mutex. In order to avoid the deadlock, do the temporary power up/down around the coef_mutex acquisition and release. This assures that the power-up sequence runs before the mutex, hence no re-entrance will happen. Fixes: b837a9f5ab3b ("ALSA: hda: realtek: Fix race at concurrent COEF updates") Reported-and-tested-by: Julian Wollrath <jwollrath(a)web.de> Cc: <stable(a)vger.kernel.org> Link: https://lore.kernel.org/r/20220214132838.4db10fca@schienar Signed-off-by: Takashi Iwai <tiwai(a)suse.de> --- sound/pci/hda/patch_realtek.c | 39 +++++++++++++++++++++-------------- 1 file changed, 24 insertions(+), 15 deletions(-) diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c index 9473fb76ff19..3a42457984e9 100644 --- a/sound/pci/hda/patch_realtek.c +++ b/sound/pci/hda/patch_realtek.c @@ -138,6 +138,22 @@ struct alc_spec { * COEF access helper functions */ +static void coef_mutex_lock(struct hda_codec *codec) +{ + struct alc_spec *spec = codec->spec; + + snd_hda_power_up_pm(codec); + mutex_lock(&spec->coef_mutex); +} + +static void coef_mutex_unlock(struct hda_codec *codec) +{ + struct alc_spec *spec = codec->spec; + + mutex_unlock(&spec->coef_mutex); + snd_hda_power_down_pm(codec); +} + static int __alc_read_coefex_idx(struct hda_codec *codec, hda_nid_t nid, unsigned int coef_idx) { @@ -151,12 +167,11 @@ static int __alc_read_coefex_idx(struct hda_codec *codec, hda_nid_t nid, static int alc_read_coefex_idx(struct hda_codec *codec, hda_nid_t nid, unsigned int coef_idx) { - struct alc_spec *spec = codec->spec; unsigned int val; - mutex_lock(&spec->coef_mutex); + coef_mutex_lock(codec); val = __alc_read_coefex_idx(codec, nid, coef_idx); - mutex_unlock(&spec->coef_mutex); + coef_mutex_unlock(codec); return val; } @@ -173,11 +188,9 @@ static void __alc_write_coefex_idx(struct hda_codec *codec, hda_nid_t nid, static void alc_write_coefex_idx(struct hda_codec *codec, hda_nid_t nid, unsigned int coef_idx, unsigned int coef_val) { - struct alc_spec *spec = codec->spec; - - mutex_lock(&spec->coef_mutex); + coef_mutex_lock(codec); __alc_write_coefex_idx(codec, nid, coef_idx, coef_val); - mutex_unlock(&spec->coef_mutex); + coef_mutex_unlock(codec); } #define alc_write_coef_idx(codec, coef_idx, coef_val) \ @@ -198,11 +211,9 @@ static void alc_update_coefex_idx(struct hda_codec *codec, hda_nid_t nid, unsigned int coef_idx, unsigned int mask, unsigned int bits_set) { - struct alc_spec *spec = codec->spec; - - mutex_lock(&spec->coef_mutex); + coef_mutex_lock(codec); __alc_update_coefex_idx(codec, nid, coef_idx, mask, bits_set); - mutex_unlock(&spec->coef_mutex); + coef_mutex_unlock(codec); } #define alc_update_coef_idx(codec, coef_idx, mask, bits_set) \ @@ -235,9 +246,7 @@ struct coef_fw { static void alc_process_coef_fw(struct hda_codec *codec, const struct coef_fw *fw) { - struct alc_spec *spec = codec->spec; - - mutex_lock(&spec->coef_mutex); + coef_mutex_lock(codec); for (; fw->nid; fw++) { if (fw->mask == (unsigned short)-1) __alc_write_coefex_idx(codec, fw->nid, fw->idx, fw->val); @@ -245,7 +254,7 @@ static void alc_process_coef_fw(struct hda_codec *codec, __alc_update_coefex_idx(codec, fw->nid, fw->idx, fw->mask, fw->val); } - mutex_unlock(&spec->coef_mutex); + coef_mutex_unlock(codec); } /* -- 2.31.1

1 0

[PATCH] ALSA: usb-audio: Don't abort resume upon errors
by Takashi Iwai 14 Feb '22

14 Feb '22

The default mixer resume code treats the errors at restoring the modified mixer items as a fatal error, and it returns back to the caller. This ends up in the resume failure, and the device will be come unavailable, although basically those errors are intermittent and can be safely ignored. The problem itself has been present from the beginning, but it didn't hit usually because the code tries to resume only the modified items. But now with the recent commit to forcibly initialize each item at the probe time, the problem surfaced more often, hence it appears as a regression. This patch fixes the regression simply by ignoring the errors at resume. Fixes: b96681bd5827 ("ALSA: usb-audio: Initialize every feature unit once at probe time") Cc: <stable(a)vger.kernel.org> BugLink: https://bugzilla.kernel.org/show_bug.cgi?id=215561 Signed-off-by: Takashi Iwai <tiwai(a)suse.de> --- sound/usb/mixer.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/sound/usb/mixer.c b/sound/usb/mixer.c index 630766ba259f..a5641956ef10 100644 --- a/sound/usb/mixer.c +++ b/sound/usb/mixer.c @@ -3678,17 +3678,14 @@ static int restore_mixer_value(struct usb_mixer_elem_list *list) err = snd_usb_set_cur_mix_value(cval, c + 1, idx, cval->cache_val[idx]); if (err < 0) - return err; + break; } idx++; } } else { /* master */ - if (cval->cached) { - err = snd_usb_set_cur_mix_value(cval, 0, 0, *cval->cache_val); - if (err < 0) - return err; - } + if (cval->cached) + snd_usb_set_cur_mix_value(cval, 0, 0, *cval->cache_val); } return 0; -- 2.31.1

1 0

[PATCH] ASoC: SOF: compr: Mark snd_compress_ops static
by Daniel Baluta 14 Feb '22

14 Feb '22

From: Daniel Baluta <daniel.baluta(a)nxp.com> Functions won't be directly used outside of compress.c file so mark them as static. This will also fix warnings reported by kernel test robot: >> sound/soc/sof/compress.c:91:5: warning: no previous prototype for function 'sof_compr_open' [-Wmissing-prototypes] int sof_compr_open(struct snd_soc_component *component, ^ sound/soc/sof/compress.c:91:1: note: declare 'static' if the function is not intended to be used outside of this translation unit int sof_compr_open(struct snd_soc_component *component, Fixes: 6324cf901e14 ("SoC: SOF: compr: Add compress ops implementation") Reported-by: kernel test robot <lkp(a)intel.com> Signed-off-by: Daniel Baluta <daniel.baluta(a)nxp.com> --- sound/soc/sof/compress.c | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/sound/soc/sof/compress.c b/sound/soc/sof/compress.c index 2137d1d65dd9..2af8d75204e9 100644 --- a/sound/soc/sof/compress.c +++ b/sound/soc/sof/compress.c @@ -89,8 +89,8 @@ static int create_page_table(struct snd_soc_component *component, spcm->stream[dir].page_table.area, size); } -int sof_compr_open(struct snd_soc_component *component, - struct snd_compr_stream *cstream) +static int sof_compr_open(struct snd_soc_component *component, + struct snd_compr_stream *cstream) { struct snd_soc_pcm_runtime *rtd = cstream->private_data; struct snd_compr_runtime *crtd = cstream->runtime; @@ -125,8 +125,8 @@ int sof_compr_open(struct snd_soc_component *component, return 0; } -int sof_compr_free(struct snd_soc_component *component, - struct snd_compr_stream *cstream) +static int sof_compr_free(struct snd_soc_component *component, + struct snd_compr_stream *cstream) { struct snd_sof_dev *sdev = snd_soc_component_get_drvdata(component); struct snd_compr_tstamp *tstamp = cstream->runtime->private_data; @@ -159,8 +159,8 @@ int sof_compr_free(struct snd_soc_component *component, return ret; } -int sof_compr_set_params(struct snd_soc_component *component, - struct snd_compr_stream *cstream, struct snd_compr_params *params) +static int sof_compr_set_params(struct snd_soc_component *component, + struct snd_compr_stream *cstream, struct snd_compr_params *params) { struct snd_sof_dev *sdev = snd_soc_component_get_drvdata(component); struct snd_soc_pcm_runtime *rtd = cstream->private_data; @@ -222,8 +222,8 @@ int sof_compr_set_params(struct snd_soc_component *component, return 0; } -int sof_compr_get_params(struct snd_soc_component *component, - struct snd_compr_stream *cstream, struct snd_codec *params) +static int sof_compr_get_params(struct snd_soc_component *component, + struct snd_compr_stream *cstream, struct snd_codec *params) { /* TODO: we don't query the supported codecs for now, if the * application asks for an unsupported codec the set_params() will fail. @@ -231,8 +231,8 @@ int sof_compr_get_params(struct snd_soc_component *component, return 0; } -int sof_compr_trigger(struct snd_soc_component *component, - struct snd_compr_stream *cstream, int cmd) +static int sof_compr_trigger(struct snd_soc_component *component, + struct snd_compr_stream *cstream, int cmd) { struct snd_sof_dev *sdev = snd_soc_component_get_drvdata(component); struct snd_soc_pcm_runtime *rtd = cstream->private_data; @@ -271,9 +271,9 @@ int sof_compr_trigger(struct snd_soc_component *component, &reply, sizeof(reply)); } -int sof_compr_copy(struct snd_soc_component *component, - struct snd_compr_stream *cstream, - char __user *buf, size_t count) +static int sof_compr_copy(struct snd_soc_component *component, + struct snd_compr_stream *cstream, + char __user *buf, size_t count) { struct snd_compr_runtime *rtd = cstream->runtime; unsigned int offset, n; -- 2.27.0

2 1

[PATCH 1/3] ASoC: wm_adsp: Correct control read size when parsing compressed buffer
by Charles Keepax 14 Feb '22

14 Feb '22

When parsing the compressed stream the whole buffer descriptor is now read in a single cs_dsp_coeff_read_ctrl; on older firmwares this descriptor is just 4 bytes but on more modern firmwares it is 24 bytes. The current code reads the full 24 bytes regardless, this was working but reading junk for the last 20 bytes. However commit f444da38ac92 ("firmware: cs_dsp: Add offset to cs_dsp read/write") added a size check into cs_dsp_coeff_read_ctrl, causing the older firmwares to now return an error. Update the code to only read the amount of data appropriate for the firmware loaded. Fixes: 04ae08596737 ("ASoC: wm_adsp: Switch to using wm_coeff_read_ctrl for compressed buffers") Signed-off-by: Charles Keepax <ckeepax(a)opensource.cirrus.com> --- sound/soc/codecs/wm_adsp.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sound/soc/codecs/wm_adsp.c b/sound/soc/codecs/wm_adsp.c index f3672e3d1703e..0582585236a28 100644 --- a/sound/soc/codecs/wm_adsp.c +++ b/sound/soc/codecs/wm_adsp.c @@ -1441,7 +1441,8 @@ static int wm_adsp_buffer_parse_coeff(struct cs_dsp_coeff_ctl *cs_ctl) int ret, i; for (i = 0; i < 5; ++i) { - ret = cs_dsp_coeff_read_ctrl(cs_ctl, 0, &coeff_v1, sizeof(coeff_v1)); + ret = cs_dsp_coeff_read_ctrl(cs_ctl, 0, &coeff_v1, + min(cs_ctl->len, sizeof(coeff_v1))); if (ret < 0) return ret; -- 2.11.0

2 4

[PATCH] ALSA: pcm: accept the OPEN state for snd_pcm_stop()
by Jaroslav Kysela 14 Feb '22

14 Feb '22

It may be useful to completely invalidate streaming under some circumstances like the USB gadget detach. This case is a bit different than the complete disconnection. The applications should be notified that the PCM streaming is no longer available, but the recovery may be expected. This patch adds support for SNDRV_PCM_STATE_OPEN passed to snd_pcm_stop() function. Only the hw_free ioctl is allowed to free the buffers in this state for a full recovery operation or the PCM file handle must be closed. In the OPEN state, ioctls return EBADFD error (with the added hw_free exception above). The applications which are not aware about this new state transition (and recovery) will fail with an error. This operation is expected. Link: https://lore.kernel.org/alsa-devel/4e17c99b-1d8a-8ebe-972c-9b1299952ff8@ivi… Cc: Pavel Hofman <pavel.hofman(a)ivitera.com> Signed-off-by: Jaroslav Kysela <perex(a)perex.cz> --- include/sound/pcm.h | 1 + sound/core/pcm.c | 1 + sound/core/pcm_native.c | 12 +++++++++++- 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/include/sound/pcm.h b/include/sound/pcm.h index 33451f8ff755..4de1c2c91109 100644 --- a/include/sound/pcm.h +++ b/include/sound/pcm.h @@ -467,6 +467,7 @@ struct snd_pcm_substream { /* -- assigned files -- */ int ref_count; atomic_t mmap_count; + atomic_t queued_hw_free; unsigned int f_flags; void (*pcm_release)(struct snd_pcm_substream *); struct pid *pid; diff --git a/sound/core/pcm.c b/sound/core/pcm.c index 6fd3677685d7..8dc7e99b2113 100644 --- a/sound/core/pcm.c +++ b/sound/core/pcm.c @@ -694,6 +694,7 @@ int snd_pcm_new_stream(struct snd_pcm *pcm, int stream, int substream_count) snd_pcm_group_init(&substream->self_group); list_add_tail(&substream->link_list, &substream->self_group.substreams); atomic_set(&substream->mmap_count, 0); + atomic_set(&substream->queued_hw_free, 0); prev = substream; } return 0; diff --git a/sound/core/pcm_native.c b/sound/core/pcm_native.c index 621883e71194..118ad3f26f4a 100644 --- a/sound/core/pcm_native.c +++ b/sound/core/pcm_native.c @@ -686,10 +686,13 @@ static int snd_pcm_hw_params(struct snd_pcm_substream *substream, snd_pcm_stream_lock_irq(substream); switch (runtime->status->state) { case SNDRV_PCM_STATE_OPEN: + if (atomic_read(&substream->queued_hw_free)) + goto __badfd; case SNDRV_PCM_STATE_SETUP: case SNDRV_PCM_STATE_PREPARED: break; default: +__badfd: snd_pcm_stream_unlock_irq(substream); return -EBADFD; } @@ -829,6 +832,7 @@ static int do_hw_free(struct snd_pcm_substream *substream) result = substream->ops->hw_free(substream); if (substream->managed_buffer_alloc) snd_pcm_lib_free_pages(substream); + atomic_set(&substream->queued_hw_free, 0); return result; } @@ -1454,6 +1458,8 @@ static void snd_pcm_post_stop(struct snd_pcm_substream *substream, } wake_up(&runtime->sleep); wake_up(&runtime->tsleep); + if (state == SNDRV_PCM_STATE_OPEN) + atomic_set(&substream->queued_hw_free, 1); } static const struct action_ops snd_pcm_action_stop = { @@ -1469,6 +1475,9 @@ static const struct action_ops snd_pcm_action_stop = { * * The state of each stream is then changed to the given state unconditionally. * + * If the requested state is OPEN, the stream is invalidated and + * the application must call hw_free to recover the operation. + * * Return: Zero if successful, or a negative error code. */ int snd_pcm_stop(struct snd_pcm_substream *substream, snd_pcm_state_t state) @@ -2637,7 +2646,8 @@ void snd_pcm_release_substream(struct snd_pcm_substream *substream) snd_pcm_drop(substream); if (substream->hw_opened) { - if (substream->runtime->status->state != SNDRV_PCM_STATE_OPEN) + if (substream->runtime->status->state != SNDRV_PCM_STATE_OPEN || + atomic_read(&substream->queued_hw_free)) do_hw_free(substream); substream->ops->close(substream); substream->hw_opened = 0; -- 2.33.1

5 7

[PATCH 1/2] ALSA: hda: Fix regression on forced probe mask option
by Takashi Iwai 14 Feb '22

14 Feb '22

The forced probe mask via probe_mask 0x100 bit doesn't work any longer as expected since the bus init code was moved and it's clearing the codec_mask value that was set beforehand. This patch fixes the long-time regression by moving the check_probe_mask() call. Fixes: a41d122449be ("ALSA: hda - Embed bus into controller object") Reported-by: dmummenschanz(a)web.de Cc: <stable(a)vger.kernel.org> Link: https://lore.kernel.org/r/trinity-f018660b-95c9-442b-a2a8-c92a56eb07ed-1644… Signed-off-by: Takashi Iwai <tiwai(a)suse.de> --- sound/pci/hda/hda_intel.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c index 4b0338c4c543..18b795220b52 100644 --- a/sound/pci/hda/hda_intel.c +++ b/sound/pci/hda/hda_intel.c @@ -1798,8 +1798,6 @@ static int azx_create(struct snd_card *card, struct pci_dev *pci, assign_position_fix(chip, check_position_fix(chip, position_fix[dev])); - check_probe_mask(chip, dev); - if (single_cmd < 0) /* allow fallback to single_cmd at errors */ chip->fallback_to_single_cmd = 1; else /* explicitly set to single_cmd or not */ @@ -1825,6 +1823,8 @@ static int azx_create(struct snd_card *card, struct pci_dev *pci, chip->bus.core.needs_damn_long_delay = 1; } + check_probe_mask(chip, dev); + err = snd_device_new(card, SNDRV_DEV_LOWLEVEL, chip, &ops); if (err < 0) { dev_err(card->dev, "Error creating device [card]!\n"); -- 2.31.1

1 1

Cannon Lake PCH cAVS (ALC892) not detected by kernel driver
by dmummenschanz＠web.de 14 Feb '22

14 Feb '22

Hello, the audio chip Cannon Lake PCH cAVS ALC892 does not get recognized on my system. Only the HDMI devices are recognized. lspci shows the following audio device: 00:1f.3 Audio device: Intel Corporation Cannon Lake PCH cAVS (rev 10) dmesg only shows: [ 189.559786] snd_hda_intel 0000:00:1f.3: bound 0000:00:02.0 (ops i915_exit [i915]) [ 189.581395] input: HDA Intel PCH HDMI/DP,pcm=3 as /devices/pci0000:00/0000:00:1f.3/sound/card0/input20 [ 189.581503] input: HDA Intel PCH HDMI/DP,pcm=7 as /devices/pci0000:00/0000:00:1f.3/sound/card0/input21 [ 189.581628] input: HDA Intel PCH HDMI/DP,pcm=8 as /devices/pci0000:00/0000:00:1f.3/sound/card0/input22 [ 189.581711] input: HDA Intel PCH HDMI/DP,pcm=9 as /devices/pci0000:00/0000:00:1f.3/sound/card0/input23 [ 189.581849] input: HDA Intel PCH HDMI/DP,pcm=10 as /devices/pci0000:00/0000:00:1f.3/sound/card0/input24 ALSA-info file: http://alsa-project.org/db/?f=96102ee84f258d1cac83ed33795356550181511c There is a workaround availble: echo auto | tee /sys/devices/pci0000\:00/0000\:00\:1f.3/power/control echo 1 | tee /sys/devices/pci0000\:00/0000\:00\:1f.3/remove echo 1 | tee /sys/bus/pci/rescan unfortunately this doesn't work for me. The device never shows up. Sound on winX works fine on this device btw. I'm happy to assist with any attempts to make the sound work.

3 13

[PATCH 0/4] ALSA: hda: Expose codec organization functions
by Cezary Rojewski 14 Feb '22

14 Feb '22

Changes expose several function that are currently unavailable for HDA-DSP drivers for use. Those functions are: snd_hda_codec_cleanup_for_unbind() snd_hda_codec_set_power_save() snd_hda_codec_register() snd_hda_codec_unregister() snd_hda_codec_device_init() This allows upcoming AVS driver [1] to re-use even mode of HDA related code that is currently available in sound/pci/hda and sound/hda and prevent any code duplication within avs-driver that would otherwise had to happen. Last patch in the series provides snd_hdac_ext_bus_link_at() - a helper function which allows for retrieval of HDA segment (link) based on codec address directly. This is simpler than parsing codec-name first to extract the address what is the case for snd_hdac_ext_bus_get_link(). The latter function is updated to re-use newly added one so core logic is not duplicated after the addition. [1]: https://lore.kernel.org/all/20211208111301.1817725-1-cezary.rojewski@intel.… Cezary Rojewski (4): ALSA: hda: Add snd_hdac_ext_bus_link_at() helper ALSA: hda: Update and expose snd_hda_codec_device_init() ALSA: hda: Update and expose codec register procedures ALSA: hda: Expose codec cleanup and power-save functions include/sound/hda_codec.h | 11 +++- include/sound/hdaudio_ext.h | 1 + sound/hda/ext/hdac_ext_controller.c | 31 +++++++--- sound/pci/hda/hda_codec.c | 94 ++++++++++++++++++++--------- sound/pci/hda/hda_local.h | 2 - sound/soc/codecs/hdac_hda.c | 2 +- 6 files changed, 100 insertions(+), 41 deletions(-) -- 2.25.1

4 18

[PATCH] ALSA: hda/realtek: Add quirk for Legion Y9000X 2019
by Yu Huang 14 Feb '22

14 Feb '22

Legion Y9000X 2019 has the same speaker with Y9000X 2020, but with a different quirk address. Add one quirk entry to make the speaker work on Y9000X 2019 too. Signed-off-by: Yu Huang <diwang90(a)gmail.com> --- sound/pci/hda/patch_realtek.c | 1 + 1 file changed, 1 insertion(+) diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c index 8315bf7d4c38..9473fb76ff19 100644 --- a/sound/pci/hda/patch_realtek.c +++ b/sound/pci/hda/patch_realtek.c @@ -9170,6 +9170,7 @@ static const struct snd_pci_quirk alc269_fixup_tbl[] = { SND_PCI_QUIRK(0x17aa, 0x3824, "Legion Y9000X 2020", ALC285_FIXUP_LEGION_Y9000X_SPEAKERS), SND_PCI_QUIRK(0x17aa, 0x3827, "Ideapad S740", ALC285_FIXUP_IDEAPAD_S740_COEF), SND_PCI_QUIRK(0x17aa, 0x3834, "Lenovo IdeaPad Slim 9i 14ITL5", ALC287_FIXUP_YOGA7_14ITL_SPEAKERS), + SND_PCI_QUIRK(0x17aa, 0x383d, "Legion Y9000X 2019", ALC285_FIXUP_LEGION_Y9000X_SPEAKERS), SND_PCI_QUIRK(0x17aa, 0x3843, "Yoga 9i", ALC287_FIXUP_IDEAPAD_BASS_SPK_AMP), SND_PCI_QUIRK(0x17aa, 0x3847, "Legion 7 16ACHG6", ALC287_FIXUP_LEGION_16ACHG6), SND_PCI_QUIRK(0x17aa, 0x384a, "Lenovo Yoga 7 15ITL5", ALC287_FIXUP_YOGA7_14ITL_SPEAKERS), -- 2.34.1

2 1

Re: [PATCH 1/1] ALSA: usb-audio: revert to IMPLICIT_FB_FIXED_DEV for M-Audio FastTrack Ultra
by Takashi Iwai 14 Feb '22

14 Feb '22

On Fri, 11 Feb 2022 23:49:13 +0100, Matteo Martelli wrote: > > Commit 83b7dcbc51c930fc2079ab6c6fc9d719768321f1 introduced a generic > implicit feedback parser, which fails to execute for M-Audio FastTrack > Ultra sound cards. The issue is with the ENDPOINT_SYNCTYPE check in > add_generic_implicit_fb() where the SYNCTYPE is ADAPTIVE instead of ASYNC. > The reason is that the sync type of the FastTrack output endpoints are > set to adaptive in the quirks table since commit > 65f04443c96dbda11b8fff21d6390e082846aa3c. > > Signed-off-by: Matteo Martelli <matteomartelli3(a)gmail.com> Thanks, applied now. Takashi

1 0

[PATCH v12 00/10] Add support for audio on SC7280 based targets
by Srinivasa Rao Mandadapu 14 Feb '22

14 Feb '22

This patch set is to add support for Audio over wcd codec, digital mics, through digital codecs and without ADSP. Changes Since V11: -- Fix kernel robot issue on arguments type mismatch. Changes Since V10: -- Split bulk clock voting to individual clock voting as per use case in cdc-dma driver. -- Add missing codec dma clocks. -- Update rxtx lpm buffer size. Changes Since V9: -- Change individual clock voting to bulk clock voting of lpass-sc7280 platform driver. -- Remove redundant clocks in lpass variant structure. -- Add mclk for MI2S based headset path. -- Remove unused lpass variant structure members in lpass header. Changes Since V8: -- Fix errors in sc7280 lpass cpu dt-bindings. -- Move to quicinc domain email id's. Changes Since V7: -- Fix indentation errors. -- Bisect patches to avoid interdependency. Changes Since V6: -- Split cdc dma regmap config macros. -- Add write dma reg fields for i2s path. -- Add helper function to distinguish rxtx and va dma ports. -- Optimizing clock and reg name in cpu dt-bindings. -- Update buffer management for cdc dma path. -- Remove Kconfig fields of machine driver. Changes Since V5: -- Include MI2S primary node to snd_soc_dai_driver in lpass-sc7280 platform driver. -- Move dependency patch list to corresponding patch. -- Add support for missing cdc-dma ports. -- Change if/else conditional statements to switch cases. -- Add missing error handlings. -- Typo errors fix. Changes Since V4: -- Remove unused variable in lpass-sc7280 platform driver. Changes Since V3: -- Remove redundant power domain controls. As power domains can be configured from dtsi. Changes Since V2: -- Split lpass sc7280 cpu driver patch and create regmap config patch. -- Create patches based on latest kernel tip. -- Add helper function to get dma control and lpaif handle. -- Remove unused variables. Changes Since V1: -- Typo errors fix -- CPU driver readable/writable apis optimization. -- Add Missing config patch -- Add Common api for repeated dmactl initialization. Srinivasa Rao Mandadapu (10): ASoC: qcom: SC7280: Update config for building codec dma drivers ASoC: qcom: Move lpass_pcm_data structure to lpass header ASoC: qcom: lpass: Add dma fields for codec dma lpass interface ASoC: qcom: Add helper function to get dma control and lpaif handle ASoC: qcom: Add register definition for codec rddma and wrdma ASoC: qcom: Add regmap config support for codec dma driver ASoC: qcom: Add support for codec dma driver ASoC: qcom: Add lpass CPU driver for codec dma control ASoC: dt-bindings: Add SC7280 lpass cpu bindings ASoC: qcom: lpass-sc7280: Add platform driver for lpass audio .../devicetree/bindings/sound/qcom,lpass-cpu.yaml | 75 ++- sound/soc/qcom/Kconfig | 11 + sound/soc/qcom/Makefile | 4 + sound/soc/qcom/lpass-cdc-dma.c | 304 ++++++++++ sound/soc/qcom/lpass-cpu.c | 244 +++++++- sound/soc/qcom/lpass-lpaif-reg.h | 127 ++++- sound/soc/qcom/lpass-platform.c | 617 ++++++++++++++++++--- sound/soc/qcom/lpass-sc7280.c | 447 +++++++++++++++ sound/soc/qcom/lpass.h | 145 +++++ 9 files changed, 1887 insertions(+), 87 deletions(-) create mode 100644 sound/soc/qcom/lpass-cdc-dma.c create mode 100644 sound/soc/qcom/lpass-sc7280.c -- 2.7.4

1 1

[PATCH] ASoC: SOF: Makefile: Fix randconfig sof-client build when SND_SOC_SOF=y
by Peter Ujfalusi 14 Feb '22

14 Feb '22

From: Peter Ujfalusi <peter.ujfalusi(a)gmail.com> Intel's kernel test robot found the following randconfig combination: SND_SOC_SOF=y SND_SOC_SOF_CLIENT=m In this the sof-client object is not going to be built into the snd-sof.o and we will have undefined references to the sof-client functions. Fixes: 6955d9512d0e ("ASoC: SOF: Introduce IPC SOF client support") Reported-by: kernel test robot <lkp(a)intel.com> Signed-off-by: Peter Ujfalusi <peter.ujfalusi(a)gmail.com> --- Hi Mark, Pierre, When the client support was added we did some permutation tests (at least I did) but missed this combination. It is a valid one for sure and the proper fix is via the Makefile. Sorry for mising this Regards, Peter sound/soc/sof/Makefile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/sound/soc/sof/Makefile b/sound/soc/sof/Makefile index 4d31282c847d..a0459f06c68a 100644 --- a/sound/soc/sof/Makefile +++ b/sound/soc/sof/Makefile @@ -2,7 +2,9 @@ snd-sof-objs := core.o ops.o loader.o ipc.o pcm.o pm.o debug.o topology.o\ control.o trace.o iomem-utils.o sof-audio.o stream-ipc.o -snd-sof-$(CONFIG_SND_SOC_SOF_CLIENT) += sof-client.o +ifneq ($(CONFIG_SND_SOC_SOF_CLIENT),) +snd-sof-objs += sof-client.o +endif snd-sof-$(CONFIG_SND_SOC_SOF_COMPRESS) += compress.o -- 2.35.1

1 0

[PATCH 23/23] ALSA: hda/realtek: Make use of the helper component_compare_dev_name
by Yong Wu 14 Feb '22

14 Feb '22

Use the common compare helper from component. Cc: Jaroslav Kysela <perex(a)perex.cz> Cc: Takashi Iwai <tiwai(a)suse.com> Cc: Jeremy Szu <jeremy.szu(a)canonical.com> Cc: Werner Sembach <wse(a)tuxedocomputers.com> Cc: Hui Wang <hui.wang(a)canonical.com> Cc: Cameron Berkenpas <cam(a)neo-zeon.de> Cc: Kailang Yang <kailang(a)realtek.com> Cc: Lucas Tanure <tanureal(a)opensource.cirrus.com> Cc: Sami Loone <sami(a)loone.fi> Cc: alsa-devel(a)alsa-project.org Signed-off-by: Yong Wu <yong.wu(a)mediatek.com> --- sound/pci/hda/patch_realtek.c | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c index 668274e52674..9da004d99cdb 100644 --- a/sound/pci/hda/patch_realtek.c +++ b/sound/pci/hda/patch_realtek.c @@ -6530,11 +6530,6 @@ static void alc287_fixup_legion_15imhg05_speakers(struct hda_codec *codec, } } -static int comp_match_dev_name(struct device *dev, void *data) -{ - return strcmp(dev_name(dev), data) == 0; -} - static int find_comp_by_dev_name(struct alc_spec *spec, const char *name) { int i; @@ -6595,7 +6590,7 @@ static void cs35l41_generic_fixup(struct hda_codec *cdc, int action, const char "%s-%s:00-cs35l41-hda.%d", bus, hid, i); if (!name) return; - component_match_add(dev, &spec->match, comp_match_dev_name, name); + component_match_add(dev, &spec->match, component_compare_dev_name, name); } ret = component_master_add_with_match(dev, &comp_master_ops, spec->match); if (ret) @@ -6644,9 +6639,9 @@ static void alc287_fixup_legion_16achg6_speakers(struct hda_codec *cdc, const st switch (action) { case HDA_FIXUP_ACT_PRE_PROBE: - component_match_add(dev, &spec->match, comp_match_dev_name, + component_match_add(dev, &spec->match, component_compare_dev_name, "i2c-CLSA0100:00-cs35l41-hda.0"); - component_match_add(dev, &spec->match, comp_match_dev_name, + component_match_add(dev, &spec->match, component_compare_dev_name, "i2c-CLSA0100:00-cs35l41-hda.1"); ret = component_master_add_with_match(dev, &comp_master_ops, spec->match); if (ret) -- 2.18.0

1 0

[PATCH v11 00/10] Add support for audio on SC7280 based targets
by Srinivasa Rao Mandadapu 13 Feb '22

13 Feb '22

This patch set is to add support for Audio over wcd codec, digital mics, through digital codecs and without ADSP. Changes Since V10: -- Split bulk clock voting to individual clock voting as per use case in cdc-dma driver. -- Add missing codec dma clocks. -- Update rxtx lpm buffer size. Changes Since V9: -- Change individual clock voting to bulk clock voting of lpass-sc7280 platform driver. -- Remove redundant clocks in lpass variant structure. -- Add mclk for MI2S based headset path. -- Remove unused lpass variant structure members in lpass header. Changes Since V8: -- Fix errors in sc7280 lpass cpu dt-bindings. -- Move to quicinc domain email id's. Changes Since V7: -- Fix indentation errors. -- Bisect patches to avoid interdependency. Changes Since V6: -- Split cdc dma regmap config macros. -- Add write dma reg fields for i2s path. -- Add helper function to distinguish rxtx and va dma ports. -- Optimizing clock and reg name in cpu dt-bindings. -- Update buffer management for cdc dma path. -- Remove Kconfig fields of machine driver. Changes Since V5: -- Include MI2S primary node to snd_soc_dai_driver in lpass-sc7280 platform driver. -- Move dependency patch list to corresponding patch. -- Add support for missing cdc-dma ports. -- Change if/else conditional statements to switch cases. -- Add missing error handlings. -- Typo errors fix. Changes Since V4: -- Remove unused variable in lpass-sc7280 platform driver. Changes Since V3: -- Remove redundant power domain controls. As power domains can be configured from dtsi. Changes Since V2: -- Split lpass sc7280 cpu driver patch and create regmap config patch. -- Create patches based on latest kernel tip. -- Add helper function to get dma control and lpaif handle. -- Remove unused variables. Changes Since V1: -- Typo errors fix -- CPU driver readable/writable apis optimization. -- Add Missing config patch -- Add Common api for repeated dmactl initialization. Srinivasa Rao Mandadapu (10): ASoC: qcom: SC7280: Update config for building codec dma drivers ASoC: qcom: Move lpass_pcm_data structure to lpass header ASoC: qcom: lpass: Add dma fields for codec dma lpass interface ASoC: qcom: Add helper function to get dma control and lpaif handle ASoC: qcom: Add register definition for codec rddma and wrdma ASoC: qcom: Add regmap config support for codec dma driver ASoC: qcom: Add support for codec dma driver ASoC: qcom: Add lpass CPU driver for codec dma control ASoC: dt-bindings: Add SC7280 lpass cpu bindings ASoC: qcom: lpass-sc7280: Add platform driver for lpass audio .../devicetree/bindings/sound/qcom,lpass-cpu.yaml | 75 ++- sound/soc/qcom/Kconfig | 11 + sound/soc/qcom/Makefile | 4 + sound/soc/qcom/lpass-cdc-dma.c | 304 ++++++++++ sound/soc/qcom/lpass-cpu.c | 244 +++++++- sound/soc/qcom/lpass-lpaif-reg.h | 127 ++++- sound/soc/qcom/lpass-platform.c | 617 ++++++++++++++++++--- sound/soc/qcom/lpass-sc7280.c | 447 +++++++++++++++ sound/soc/qcom/lpass.h | 145 +++++ 9 files changed, 1887 insertions(+), 87 deletions(-) create mode 100644 sound/soc/qcom/lpass-cdc-dma.c create mode 100644 sound/soc/qcom/lpass-sc7280.c -- 2.7.4

2 11

Conflictuous devices name
by GitHub issues - opened 12 Feb '22

12 Feb '22

alsa-project/alsa-lib issue #212 was opened from nm2107: Hello, I'm using [mixxx](https://github.com/mixxxdj/mixxx) (which uses [portmidi](https://github.com/PortMidi/portmidi), which uses ALSA) with a pair of Denon SC3900 decks connected via USB MIDI. However, I'm running into an issue where I cannot distinguish both SC3900 units anymore, as they are reported by alsa with the same name : ```bash $ amidi -l Dir Device Name IO hw:2,0,0 SC3900 MIDI 1 IO hw:3,0,0 SC3900 MIDI 1 ``` (they were previously differentiated by `SC3900 MIDI 1` and `SC3900 MIDI 2` names). PortMIDI (and so mixxx) are relying on the device name to identify them, so I'm not able to distinguish the two plugged in units (only one device is listed in mixxx, as the name is common). I'm using alsa-libs 1.2.6.1. I tried to downgrade to version 1.2.5.1, but is hasn't solved my issue. Along with this downgrade, I also tried to downgrade my linux kernel to v5.13 (I was on v5.16), but it hasn't shown any improvement. Do you have an idea of what may cause this naming conflict ? Thank you :) Issue URL : https://github.com/alsa-project/alsa-lib/issues/212 Repository URL: https://github.com/alsa-project/alsa-lib

1 0

[PATCH v2 0/3] firewire: assist unit driver to compute packet time stamp
by Takashi Sakamoto 12 Feb '22

12 Feb '22

Hi, Current implementation of Linux FireWire subsystem doesn't allow unit driver to operate content of packet in IR context according to time stamp. Additionally it doesn't allow unit driver to read current value of CYCLE_TIME register in OHCI 1394 controller. It brings disadvantages to drivers in Linux sound subsystem in regards of handling time for sampled data such as PCM frames and MIDI messages. This rerolled patchset is first step to improve the situation. Changes in v2: * Rebase v1 patchset to v5.16 release V1: * https://lore.kernel.org/lkml/20211202113457.24011-1-o-takashi@sakamocchi.jp/ Hector Martin (1): firewire: Add dummy read_csr/write_csr functions Takashi Sakamoto (2): firewire: add kernel API to access CYCLE_TIME register firewire: add kernel API to access packet structure in request structure for AR context drivers/firewire/core-card.c | 39 +++++++++++++++++++++++++++++ drivers/firewire/core-cdev.c | 6 +++-- drivers/firewire/core-transaction.c | 18 +++++++++++++ include/linux/firewire.h | 3 +++ 4 files changed, 64 insertions(+), 2 deletions(-) -- 2.32.0

1 3

[PATCH] ALSA: cleanup double word in comment
by trix＠redhat.com 11 Feb '22

11 Feb '22

From: Tom Rix <trix(a)redhat.com> Remove the second 'device'. Signed-off-by: Tom Rix <trix(a)redhat.com> --- include/sound/hda_verbs.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/sound/hda_verbs.h b/include/sound/hda_verbs.h index e36b77531c5c3..006d358acce25 100644 --- a/include/sound/hda_verbs.h +++ b/include/sound/hda_verbs.h @@ -461,7 +461,7 @@ enum { #define AC_DE_ELDV (1<<1) #define AC_DE_IA (1<<2) -/* device device types (0x0-0xf) */ +/* device types (0x0-0xf) */ enum { AC_JACK_LINE_OUT, AC_JACK_SPEAKER, -- 2.26.3

2 1

[PATCH] ALSA: hda: Add PCI and HDMI IDs for Intel Raptor Lake
by Kai Vehmanen 11 Feb '22

11 Feb '22

Add a set of HD Audio PCI IDs, and the HDMI codec VID, for Intel Raptor Lake. Signed-off-by: Kai Vehmanen <kai.vehmanen(a)linux.intel.com> --- sound/pci/hda/hda_intel.c | 11 +++++++++++ sound/pci/hda/patch_hdmi.c | 1 + 2 files changed, 12 insertions(+) diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c index a2922233e85f..a3c4d6e293e1 100644 --- a/sound/pci/hda/hda_intel.c +++ b/sound/pci/hda/hda_intel.c @@ -2510,6 +2510,17 @@ static const struct pci_device_id azx_ids[] = { .driver_data = AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE}, { PCI_DEVICE(0x8086, 0x4b58), .driver_data = AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE}, + /* Raptor Lake */ + { PCI_DEVICE(0x8086, 0x7a50), + .driver_data = AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE}, + { PCI_DEVICE(0x8086, 0x51ca), + .driver_data = AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE}, + { PCI_DEVICE(0x8086, 0x51cb), + .driver_data = AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE}, + { PCI_DEVICE(0x8086, 0x51ce), + .driver_data = AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE}, + { PCI_DEVICE(0x8086, 0x51cf), + .driver_data = AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE}, /* Broxton-P(Apollolake) */ { PCI_DEVICE(0x8086, 0x5a98), .driver_data = AZX_DRIVER_SKL | AZX_DCAPS_INTEL_BROXTON }, diff --git a/sound/pci/hda/patch_hdmi.c b/sound/pci/hda/patch_hdmi.c index 92df4f243ec6..64fe025fda86 100644 --- a/sound/pci/hda/patch_hdmi.c +++ b/sound/pci/hda/patch_hdmi.c @@ -4390,6 +4390,7 @@ HDA_CODEC_ENTRY(0x80862812, "Tigerlake HDMI", patch_i915_tgl_hdmi), HDA_CODEC_ENTRY(0x80862814, "DG1 HDMI", patch_i915_tgl_hdmi), HDA_CODEC_ENTRY(0x80862815, "Alderlake HDMI", patch_i915_tgl_hdmi), HDA_CODEC_ENTRY(0x80862816, "Rocketlake HDMI", patch_i915_tgl_hdmi), +HDA_CODEC_ENTRY(0x80862818, "Raptorlake HDMI", patch_i915_tgl_hdmi), HDA_CODEC_ENTRY(0x80862819, "DG2 HDMI", patch_i915_tgl_hdmi), HDA_CODEC_ENTRY(0x8086281a, "Jasperlake HDMI", patch_i915_icl_hdmi), HDA_CODEC_ENTRY(0x8086281b, "Elkhartlake HDMI", patch_i915_icl_hdmi), base-commit: 44cb545b0c2afe21b38044b3595a2579f3a8d7b2 -- 2.35.1

3 2

Re: [PATCH 31/31] sound: soc: sof: changing LED_* from enum led_brightness to actual value
by Mark Brown 11 Feb '22

11 Feb '22

On Fri, Jan 21, 2022 at 01:54:36PM -0300, Luiz Sampaio wrote: > The enum led_brightness, which contains the declaration of LED_OFF, > LED_ON, LED_HALF and LED_FULL is obsolete, as the led class now supports > max_brightness. > --- You've not provided a Signed-off-by for this so I can't do anything with it, please see Documentation/process/submitting-patches.rst for details on what this is and why it's important. Please submit patches using subject lines reflecting the style for the subsystem, this makes it easier for people to identify relevant patches. Look at what existing commits in the area you're changing are doing and make sure your subject lines visually resemble what they're doing. There's no need to resubmit to fix this alone.

1 0

[PATCH 00/19] soundwire: stream: cleanup of 'stream' support
by Bard Liao 11 Feb '22

11 Feb '22

This series revisits the SoundWire 'sdw_stream' support to split allocation and configuration steps. This is necessary if for example the routines are called multiple times from the hw_params stage. This also helps with better error handling. Pierre-Louis Bossart (19): soundwire: stream: remove unused parameter in sdw_stream_add_slave soundwire: stream: add slave runtime to list earlier soundwire: stream: simplify check on port range soundwire: stream: add alloc/config/free helpers for ports soundwire: stream: split port allocation and configuration loops soundwire: stream: split alloc and config in two functions soundwire: stream: add 'slave' prefix for port range checks soundwire: stream: group sdw_port and sdw_master/slave_port functions soundwire: stream: simplify sdw_alloc_master_rt() soundwire: stream: split sdw_alloc_master_rt() in alloc and config soundwire: stream: move sdw_alloc_slave_rt() before 'master' helpers soundwire: stream: split sdw_alloc_slave_rt() in alloc and config soundwire: stream: group sdw_stream_ functions soundwire: stream: rename and move master/slave_rt_free routines soundwire: stream: move list addition to sdw_slave_alloc_rt() soundwire: stream: separate alloc and config within sdw_stream_add_xxx() soundwire: stream: introduce sdw_slave_rt_find() helper soundwire: stream: sdw_stream_add_ functions can be called multiple times soundwire: stream: make enable/disable/deprepare idempotent drivers/soundwire/stream.c | 960 +++++++++++++++++++++---------------- 1 file changed, 547 insertions(+), 413 deletions(-) -- 2.17.1

2 20

[PATCH] ASoC: tlv320adc3xxx: Add IIR filter configuration
by Ricard Wanderlof 10 Feb '22

10 Feb '22

The TLV320ADC3001/3101 have an internal DSP, which can either be used in various preset configurations (called "Processing Blocks" in the data sheet), or as a freely programmable (using the "PurePath Studio" graphical programming tool from TI) but rather small DSP ("miniDSP"). Using the default configuration (PRB_R1) it's possible to set up filtering using a first-order IIR, which can be useful for adding a digital high pass filter to the signal chain, for instance. This patch adds support for configuring the IIR filter coefficients. The filter itself is always enabled; the default coefficients implement a pass-through function. Signed-off-by: Ricard Wanderlof <ricardw(a)axis.com> --- sound/soc/codecs/tlv320adc3xxx.c | 160 +++++++++++++++++++++++++++++-- 1 file changed, 153 insertions(+), 7 deletions(-) diff --git a/sound/soc/codecs/tlv320adc3xxx.c b/sound/soc/codecs/tlv320adc3xxx.c index 4baf3d881633..d0d5206db0c7 100644 --- a/sound/soc/codecs/tlv320adc3xxx.c +++ b/sound/soc/codecs/tlv320adc3xxx.c @@ -169,6 +169,23 @@ #define ADC3XXX_ANALOG_PGA_FLAGS ADC3XXX_REG(1, 62) /* 63-127 Reserved */ +/* + * Page 4 registers. First page of coefficient memory for the miniDSP. + */ +#define ADC3XXX_LEFT_ADC_IIR_COEFF_N0_MSB ADC3XXX_REG(4, 8) +#define ADC3XXX_LEFT_ADC_IIR_COEFF_N0_LSB ADC3XXX_REG(4, 9) +#define ADC3XXX_LEFT_ADC_IIR_COEFF_N1_MSB ADC3XXX_REG(4, 10) +#define ADC3XXX_LEFT_ADC_IIR_COEFF_N1_LSB ADC3XXX_REG(4, 11) +#define ADC3XXX_LEFT_ADC_IIR_COEFF_D1_MSB ADC3XXX_REG(4, 12) +#define ADC3XXX_LEFT_ADC_IIR_COEFF_D1_LSB ADC3XXX_REG(4, 13) + +#define ADC3XXX_RIGHT_ADC_IIR_COEFF_N0_MSB ADC3XXX_REG(4, 72) +#define ADC3XXX_RIGHT_ADC_IIR_COEFF_N0_LSB ADC3XXX_REG(4, 73) +#define ADC3XXX_RIGHT_ADC_IIR_COEFF_N1_MSB ADC3XXX_REG(4, 74) +#define ADC3XXX_RIGHT_ADC_IIR_COEFF_N1_LSB ADC3XXX_REG(4, 75) +#define ADC3XXX_RIGHT_ADC_IIR_COEFF_D1_MSB ADC3XXX_REG(4, 76) +#define ADC3XXX_RIGHT_ADC_IIR_COEFF_D1_LSB ADC3XXX_REG(4, 77) + /* * Register bits. */ @@ -373,22 +390,63 @@ static const struct reg_default adc3xxx_defaults[] = { { 180, 0xff }, { 181, 0x00 }, { 182, 0x3f }, { 183, 0xff }, { 184, 0x00 }, { 185, 0x3f }, { 186, 0x00 }, { 187, 0x80 }, { 188, 0x80 }, { 189, 0x00 }, { 190, 0x00 }, { 191, 0x00 }, + + /* Page 4 */ + { 1024, 0x00 }, { 1026, 0x01 }, { 1027, 0x17 }, + { 1028, 0x01 }, { 1029, 0x17 }, { 1030, 0x7d }, { 1031, 0xd3 }, + { 1032, 0x7f }, { 1033, 0xff }, { 1034, 0x00 }, { 1035, 0x00 }, + { 1036, 0x00 }, { 1037, 0x00 }, { 1038, 0x7f }, { 1039, 0xff }, + { 1040, 0x00 }, { 1041, 0x00 }, { 1042, 0x00 }, { 1043, 0x00 }, + { 1044, 0x00 }, { 1045, 0x00 }, { 1046, 0x00 }, { 1047, 0x00 }, + { 1048, 0x7f }, { 1049, 0xff }, { 1050, 0x00 }, { 1051, 0x00 }, + { 1052, 0x00 }, { 1053, 0x00 }, { 1054, 0x00 }, { 1055, 0x00 }, + { 1056, 0x00 }, { 1057, 0x00 }, { 1058, 0x7f }, { 1059, 0xff }, + { 1060, 0x00 }, { 1061, 0x00 }, { 1062, 0x00 }, { 1063, 0x00 }, + { 1064, 0x00 }, { 1065, 0x00 }, { 1066, 0x00 }, { 1067, 0x00 }, + { 1068, 0x7f }, { 1069, 0xff }, { 1070, 0x00 }, { 1071, 0x00 }, + { 1072, 0x00 }, { 1073, 0x00 }, { 1074, 0x00 }, { 1075, 0x00 }, + { 1076, 0x00 }, { 1077, 0x00 }, { 1078, 0x7f }, { 1079, 0xff }, + { 1080, 0x00 }, { 1081, 0x00 }, { 1082, 0x00 }, { 1083, 0x00 }, + { 1084, 0x00 }, { 1085, 0x00 }, { 1086, 0x00 }, { 1087, 0x00 }, + { 1088, 0x00 }, { 1089, 0x00 }, { 1090, 0x00 }, { 1091, 0x00 }, + { 1092, 0x00 }, { 1093, 0x00 }, { 1094, 0x00 }, { 1095, 0x00 }, + { 1096, 0x00 }, { 1097, 0x00 }, { 1098, 0x00 }, { 1099, 0x00 }, + { 1100, 0x00 }, { 1101, 0x00 }, { 1102, 0x00 }, { 1103, 0x00 }, + { 1104, 0x00 }, { 1105, 0x00 }, { 1106, 0x00 }, { 1107, 0x00 }, + { 1108, 0x00 }, { 1109, 0x00 }, { 1110, 0x00 }, { 1111, 0x00 }, + { 1112, 0x00 }, { 1113, 0x00 }, { 1114, 0x00 }, { 1115, 0x00 }, + { 1116, 0x00 }, { 1117, 0x00 }, { 1118, 0x00 }, { 1119, 0x00 }, + { 1120, 0x00 }, { 1121, 0x00 }, { 1122, 0x00 }, { 1123, 0x00 }, + { 1124, 0x00 }, { 1125, 0x00 }, { 1126, 0x00 }, { 1127, 0x00 }, + { 1128, 0x00 }, { 1129, 0x00 }, { 1130, 0x00 }, { 1131, 0x00 }, + { 1132, 0x00 }, { 1133, 0x00 }, { 1134, 0x00 }, { 1135, 0x00 }, + { 1136, 0x00 }, { 1137, 0x00 }, { 1138, 0x00 }, { 1139, 0x00 }, + { 1140, 0x00 }, { 1141, 0x00 }, { 1142, 0x00 }, { 1143, 0x00 }, + { 1144, 0x00 }, { 1145, 0x00 }, { 1146, 0x00 }, { 1147, 0x00 }, + { 1148, 0x00 }, { 1149, 0x00 }, { 1150, 0x00 }, { 1151, 0x00 }, }; static bool adc3xxx_volatile_reg(struct device *dev, unsigned int reg) { - switch (reg) { - case ADC3XXX_RESET: + if (reg == ADC3XXX_RESET) return true; - default: - return false; - } + + /* + * Coefficient RAM registers for miniDSP are marked as volatile + * mainly because they must be written in pairs, so we don't want + * them to be cached. Updates are not likely to occur very often, + * so the performance penalty is minimal. + */ + if (reg >= ADC3XXX_REG(4, 2) && reg <= ADC3XXX_REG(4, 128)) + return true; + + return false; } static const struct regmap_range_cfg adc3xxx_ranges[] = { { .range_min = 0, - .range_max = 2 * ADC3XXX_PAGE_SIZE, + .range_max = 5 * ADC3XXX_PAGE_SIZE, .selector_reg = ADC3XXX_PAGE_SELECT, .selector_mask = 0xff, .selector_shift = 0, @@ -410,7 +468,7 @@ static const struct regmap_config adc3xxx_regmap = { .ranges = adc3xxx_ranges, .num_ranges = ARRAY_SIZE(adc3xxx_ranges), - .max_register = 2 * ADC3XXX_PAGE_SIZE, + .max_register = 5 * ADC3XXX_PAGE_SIZE, }; struct adc3xxx_rate_divs { @@ -497,6 +555,83 @@ static int adc3xxx_pll_delay(struct snd_soc_dapm_widget *w, return 0; } +static int adc3xxx_coefficient_info(struct snd_kcontrol *kcontrol, + struct snd_ctl_elem_info *uinfo) +{ + int numcoeff = kcontrol->private_value >> 16; + + uinfo->type = SNDRV_CTL_ELEM_TYPE_INTEGER; + uinfo->count = numcoeff; + uinfo->value.integer.min = 0; + uinfo->value.integer.max = 0xffff; /* all coefficients are 16 bit */ + return 0; +} + +static int adc3xxx_coefficient_get(struct snd_kcontrol *kcontrol, + struct snd_ctl_elem_value *ucontrol) +{ + struct snd_soc_component *component = snd_soc_kcontrol_component(kcontrol); + int numcoeff = kcontrol->private_value >> 16; + int reg = kcontrol->private_value & 0xffff; + int index = 0; + + while (index < numcoeff) { + unsigned int value_msb, value_lsb, value; + + value_msb = snd_soc_component_read(component, reg++); + if ((int)value_msb < 0) + return (int)value_msb; + + value_lsb = snd_soc_component_read(component, reg++); + if ((int)value_lsb < 0) + return (int)value_lsb; + + value = (value_msb << 8) | value_lsb; + ucontrol->value.integer.value[index++] = value; + } + + return 0; +} + +static int adc3xxx_coefficient_put(struct snd_kcontrol *kcontrol, + struct snd_ctl_elem_value *ucontrol) +{ + struct snd_soc_component *component = snd_soc_kcontrol_component(kcontrol); + int numcoeff = kcontrol->private_value >> 16; + int reg = kcontrol->private_value & 0xffff; + int index = 0; + int ret; + + while (index < numcoeff) { + unsigned int value = ucontrol->value.integer.value[index++]; + unsigned int value_msb = (value >> 8) & 0xff; + unsigned int value_lsb = value & 0xff; + + ret = snd_soc_component_write(component, reg++, value_msb); + if (ret) + return ret; + + ret = snd_soc_component_write(component, reg++, value_lsb); + if (ret) + return ret; + } + + return 0; +} + +/* All on-chip filters have coefficients which are expressed in terms of + * 16 bit values, so represent them as strings of 16-bit integers. + */ +#define TI_COEFFICIENTS(xname, reg, numcoeffs) { \ + .iface = SNDRV_CTL_ELEM_IFACE_MIXER, \ + .name = xname, \ + .info = adc3xxx_coefficient_info, \ + .get = adc3xxx_coefficient_get,\ + .put = adc3xxx_coefficient_put, \ + .access = SNDRV_CTL_ELEM_ACCESS_READWRITE, \ + .private_value = reg | (numcoeffs << 16) \ +} + static const char * const adc_softstepping_text[] = { "1 step", "2 step", "off" }; static SOC_ENUM_SINGLE_DECL(adc_softstepping_enum, ADC3XXX_ADC_DIGITAL, 0, adc_softstepping_text); @@ -640,6 +775,17 @@ static const struct snd_kcontrol_new adc3xxx_snd_controls[] = { SOC_SINGLE("Right ADC Unselected CM Bias Capture Switch", ADC3XXX_RIGHT_PGA_SEL_2, 6, 1, 0), SOC_ENUM("Dither Control DC Offset", dither_dc_offset_enum), + + /* Coefficient memory for miniDSP. */ + /* For the default PRB_R1 processing block, the only available + * filter is the first order IIR. + */ + + TI_COEFFICIENTS("Left ADC IIR Coefficients N0 N1 D1", + ADC3XXX_LEFT_ADC_IIR_COEFF_N0_MSB, 3), + + TI_COEFFICIENTS("Right ADC IIR Coefficients N0 N1 D1", + ADC3XXX_RIGHT_ADC_IIR_COEFF_N0_MSB, 3), }; /* Left input selection, Single Ended inputs and Differential inputs */ -- 2.20.1 -- Ricard Wolf Wanderlof ricardw(at)axis.com Axis Communications AB, Lund, Sweden www.axis.com Phone +46 46 272 2016 Fax +46 46 13 61 30

2 8

[PATCH v2 0/9] ASoC: SOF: IPC client infrastructure
by Peter Ujfalusi 10 Feb '22

10 Feb '22

Hi, Changes since v1: - Fix compilation error in sound/soc/sof/compress.c: error: implicit declaration of function 'snd_sof_create_page_table' The patch introducing this is not in sof-dev, and I have missed cross compiling for aarch64. Original Cover letter The Linux SOF implementation is historically monolithic in a sense that all features accessible in the firmware can be used via the snd_sof_dev struct in one way or another. Support for features can not be added or removed runtime and with the current way of things it is hard if not impossible to implement support for dynamic feature support when based on the firmware manifest we can easily enable/access independent modules with the SOF. In order to be able to support such modularity this series introduces a small framework within SOF for client support using the Auxiliary bus. Client drivers can be removed runtime and later re-loaded if needed without affecting the core's behaviour, but it is the core's and the platform's duty to create the Auxiliary devices usable in the platform and via the firmware. There is still a need for SOF manifest update to convey information about features to really make the full dynamic client device creation. The series will introduce the core SOF client support and converts the generic ipc flood test, ipc message injector and the probes (Intel HDA only) to a client driver. Regards, Peter --- Peter Ujfalusi (8): ASoC: SOF: Drop unused DSP power states: D3_HOT and D3_COLD ASoC: SOF: Move the definition of enum sof_dsp_power_states to global header ASoC: SOF: ipc: Read and pass the whole message to handlers for IPC events ASoC: SOF: Split up utils.c into sof-utils and iomem-utils ASoC: SOF: Introduce IPC SOF client support ASoC: SOF: sof-client: Add support for clients not managed by pm framework ASoC: SOF: Convert the generic IPC message injector into SOF client ASoC: SOF: Convert the generic probe support to SOF client Ranjani Sridharan (1): ASoC: SOF: Convert the generic IPC flood test into SOF client include/sound/sof.h | 8 + sound/soc/sof/Kconfig | 33 +- sound/soc/sof/Makefile | 15 +- sound/soc/sof/compress.c | 1 + sound/soc/sof/core.c | 50 +- sound/soc/sof/debug.c | 565 -------------- sound/soc/sof/intel/Kconfig | 19 +- sound/soc/sof/intel/apl.c | 13 +- sound/soc/sof/intel/cnl.c | 13 +- sound/soc/sof/intel/hda-dai.c | 19 - sound/soc/sof/intel/hda-dsp.c | 6 - sound/soc/sof/intel/hda-probes.c | 72 +- sound/soc/sof/intel/hda.c | 10 + sound/soc/sof/intel/hda.h | 49 +- sound/soc/sof/intel/icl.c | 13 +- sound/soc/sof/intel/tgl.c | 13 +- sound/soc/sof/{utils.c => iomem-utils.c} | 61 +- sound/soc/sof/ipc.c | 88 ++- sound/soc/sof/ops.h | 43 - sound/soc/sof/pcm.c | 7 +- sound/soc/sof/pm.c | 13 +- sound/soc/sof/sof-client-ipc-flood-test.c | 396 ++++++++++ sound/soc/sof/sof-client-ipc-msg-injector.c | 192 +++++ sound/soc/sof/sof-client-probes.c | 821 ++++++++++++++++++++ sound/soc/sof/sof-client-probes.h | 31 + sound/soc/sof/sof-client.c | 469 +++++++++++ sound/soc/sof/sof-client.h | 67 ++ sound/soc/sof/sof-priv.h | 139 ++-- sound/soc/sof/sof-probes.c | 364 --------- sound/soc/sof/sof-probes.h | 38 - sound/soc/sof/sof-utils.c | 77 ++ sound/soc/sof/sof-utils.h | 19 + sound/soc/sof/trace.c | 1 + 33 files changed, 2416 insertions(+), 1309 deletions(-) rename sound/soc/sof/{utils.c => iomem-utils.c} (59%) create mode 100644 sound/soc/sof/sof-client-ipc-flood-test.c create mode 100644 sound/soc/sof/sof-client-ipc-msg-injector.c create mode 100644 sound/soc/sof/sof-client-probes.c create mode 100644 sound/soc/sof/sof-client-probes.h create mode 100644 sound/soc/sof/sof-client.c create mode 100644 sound/soc/sof/sof-client.h delete mode 100644 sound/soc/sof/sof-probes.c delete mode 100644 sound/soc/sof/sof-probes.h create mode 100644 sound/soc/sof/sof-utils.c create mode 100644 sound/soc/sof/sof-utils.h -- 2.35.1

2 10

[PATCH 0/9] ASoC: SOF: IPC client infrastructure
by Peter Ujfalusi 10 Feb '22

10 Feb '22

Hi, The Linux SOF implementation is historically monolithic in a sense that all features accessible in the firmware can be used via the snd_sof_dev struct in one way or another. Support for features can not be added or removed runtime and with the current way of things it is hard if not impossible to implement support for dynamic feature support when based on the firmware manifest we can easily enable/access independent modules with the SOF. In order to be able to support such modularity this series introduces a small framework within SOF for client support using the Auxiliary bus. Client drivers can be removed runtime and later re-loaded if needed without affecting the core's behaviour, but it is the core's and the platform's duty to create the Auxiliary devices usable in the platform and via the firmware. There is still a need for SOF manifest update to convey information about features to really make the full dynamic client device creation. The series will introduce the core SOF client support and converts the generic ipc flood test, ipc message injector and the probes (Intel HDA only) to a client driver. Regards, Peter --- Peter Ujfalusi (8): ASoC: SOF: Drop unused DSP power states: D3_HOT and D3_COLD ASoC: SOF: Move the definition of enum sof_dsp_power_states to global header ASoC: SOF: ipc: Read and pass the whole message to handlers for IPC events ASoC: SOF: Split up utils.c into sof-utils and iomem-utils ASoC: SOF: Introduce IPC SOF client support ASoC: SOF: sof-client: Add support for clients not managed by pm framework ASoC: SOF: Convert the generic IPC message injector into SOF client ASoC: SOF: Convert the generic probe support to SOF client Ranjani Sridharan (1): ASoC: SOF: Convert the generic IPC flood test into SOF client include/sound/sof.h | 8 + sound/soc/sof/Kconfig | 33 +- sound/soc/sof/Makefile | 15 +- sound/soc/sof/core.c | 50 +- sound/soc/sof/debug.c | 565 -------------- sound/soc/sof/intel/Kconfig | 19 +- sound/soc/sof/intel/apl.c | 13 +- sound/soc/sof/intel/cnl.c | 13 +- sound/soc/sof/intel/hda-dai.c | 19 - sound/soc/sof/intel/hda-dsp.c | 6 - sound/soc/sof/intel/hda-probes.c | 72 +- sound/soc/sof/intel/hda.c | 10 + sound/soc/sof/intel/hda.h | 49 +- sound/soc/sof/intel/icl.c | 13 +- sound/soc/sof/intel/tgl.c | 13 +- sound/soc/sof/{utils.c => iomem-utils.c} | 61 +- sound/soc/sof/ipc.c | 88 ++- sound/soc/sof/ops.h | 43 - sound/soc/sof/pcm.c | 7 +- sound/soc/sof/pm.c | 13 +- sound/soc/sof/sof-client-ipc-flood-test.c | 396 ++++++++++ sound/soc/sof/sof-client-ipc-msg-injector.c | 192 +++++ sound/soc/sof/sof-client-probes.c | 821 ++++++++++++++++++++ sound/soc/sof/sof-client-probes.h | 31 + sound/soc/sof/sof-client.c | 469 +++++++++++ sound/soc/sof/sof-client.h | 67 ++ sound/soc/sof/sof-priv.h | 139 ++-- sound/soc/sof/sof-probes.c | 364 --------- sound/soc/sof/sof-probes.h | 38 - sound/soc/sof/sof-utils.c | 77 ++ sound/soc/sof/sof-utils.h | 19 + sound/soc/sof/trace.c | 1 + 32 files changed, 2415 insertions(+), 1309 deletions(-) rename sound/soc/sof/{utils.c => iomem-utils.c} (59%) create mode 100644 sound/soc/sof/sof-client-ipc-flood-test.c create mode 100644 sound/soc/sof/sof-client-ipc-msg-injector.c create mode 100644 sound/soc/sof/sof-client-probes.c create mode 100644 sound/soc/sof/sof-client-probes.h create mode 100644 sound/soc/sof/sof-client.c create mode 100644 sound/soc/sof/sof-client.h delete mode 100644 sound/soc/sof/sof-probes.c delete mode 100644 sound/soc/sof/sof-probes.h create mode 100644 sound/soc/sof/sof-utils.c create mode 100644 sound/soc/sof/sof-utils.h -- 2.35.1

2 13

[PATCH v2 0/6] ASoC: dt-bindings: samsung: convert to dtschema
by Krzysztof Kozlowski 10 Feb '22

10 Feb '22

Hi, The patchset is based on Rob's sound-dai changes: https://lore.kernel.org/all/20220126231427.1638089-1-robh@kernel.org/ Changes since v1: 1. Correct samsung,snow cpu/sound-dai. Best regards, Krzysztof Krzysztof Kozlowski (6): ASoC: dt-bindings: samsung,aries-wm8994: require sound-dai property ASoC: dt-bindings: samsung,arndale: convert to dtschema ASoC: dt-bindings: samsung,arndale: document ALC5631 ASoC: dt-bindings: samsung,smdk5250: convert to dtschema ASoC: dt-bindings: samsung,snow: convert to dtschema ASoC: dt-bindings: samsung,tm2: convert to dtschema .../devicetree/bindings/sound/arndale.txt | 25 ------ .../bindings/sound/samsung,aries-wm8994.yaml | 4 + .../bindings/sound/samsung,arndale.yaml | 45 +++++++++++ .../bindings/sound/samsung,smdk-wm8994.txt | 14 ---- .../bindings/sound/samsung,smdk5250.yaml | 38 +++++++++ .../bindings/sound/samsung,snow.yaml | 74 +++++++++++++++++ .../bindings/sound/samsung,tm2-audio.txt | 42 ---------- .../bindings/sound/samsung,tm2.yaml | 80 +++++++++++++++++++ .../devicetree/bindings/sound/snow.txt | 31 ------- 9 files changed, 241 insertions(+), 112 deletions(-) delete mode 100644 Documentation/devicetree/bindings/sound/arndale.txt create mode 100644 Documentation/devicetree/bindings/sound/samsung,arndale.yaml delete mode 100644 Documentation/devicetree/bindings/sound/samsung,smdk-wm8994.txt create mode 100644 Documentation/devicetree/bindings/sound/samsung,smdk5250.yaml create mode 100644 Documentation/devicetree/bindings/sound/samsung,snow.yaml delete mode 100644 Documentation/devicetree/bindings/sound/samsung,tm2-audio.txt create mode 100644 Documentation/devicetree/bindings/sound/samsung,tm2.yaml delete mode 100644 Documentation/devicetree/bindings/sound/snow.txt -- 2.32.0

3 13

[PATCH v9 0/3] Machine driver to support LPASS SC7280 sound card registration
by Srinivasa Rao Mandadapu 10 Feb '22

10 Feb '22

This patch set is to add support for SC7280 sound card registration and to add dt-bindings documentation file. Srinivasa Rao Mandadapu (3): ASoC: google: dt-bindings: Add sc7280-herobrine machine bindings ASoC: qcom: Add macro for lpass DAI id's max limit ASoC: qcom: SC7280: Add machine driver Changes Since V8: -- Update snd_soc_dai_get_sdw_stream api compatible to latest kernel. -- Fix bot errors in dt-bindings file. -- Add co-developer email id. Changes Since V7: -- Create separate patch for dai id's macro. -- Remove unused dapm widget structure. -- Move to quicinc domain email id's. Changes Since V6: -- Remove redundant headers. -- Move max ports macro to lpass.h header. -- Arrange structure alignment. -- Fix indentation errors. -- Update module license. Changes Since V5: -- Add required properties to dt-bindings Changes Since V4: -- Add COMPILE_TEST flag in sc7280 configuration. -- Remove redundant startup and shutdown callbacks of snd_soc_ops. -- Fix typo errors. Changes Since V3: -- Change audio jack playpause key value. Changes Since V2: -- updated required field in bindings -- updated Return type check with proper enum in sc7280.c -- Updated Header name and Typos in sc7280.c Changes Since V1: -- Indentation changes and typo. .../bindings/sound/google,sc7280-herobrine.yaml | 180 +++++++++++++ sound/soc/qcom/Kconfig | 14 + sound/soc/qcom/Makefile | 2 + sound/soc/qcom/lpass.h | 1 + sound/soc/qcom/sc7280.c | 284 +++++++++++++++++++++ 5 files changed, 481 insertions(+) create mode 100644 Documentation/devicetree/bindings/sound/google,sc7280-herobrine.yaml create mode 100644 sound/soc/qcom/sc7280.c -- 2.7.4

2 4

[PATCH] ASoC: rt5640: Remove the sysclk and sysclk_src checking
by Oder Chiou 10 Feb '22

10 Feb '22

Remove the sysclk and sysclk_src checking in the function set_sysclk() to prevent the PLL power off. It is not getting re-programmed during subsequent runs after the first run (in BIAS_OFF stage). Signed-off-by: Oder Chiou <oder_chiou(a)realtek.com> --- sound/soc/codecs/rt5640.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/sound/soc/codecs/rt5640.c b/sound/soc/codecs/rt5640.c index e7a82565b905..30c2e7cb7ed2 100644 --- a/sound/soc/codecs/rt5640.c +++ b/sound/soc/codecs/rt5640.c @@ -1839,9 +1839,6 @@ static int rt5640_set_dai_sysclk(struct snd_soc_dai *dai, unsigned int reg_val = 0; unsigned int pll_bit = 0; - if (freq == rt5640->sysclk && clk_id == rt5640->sysclk_src) - return 0; - switch (clk_id) { case RT5640_SCLK_S_MCLK: reg_val |= RT5640_SCLK_SRC_MCLK; -- 2.35.1

2 1

[RESEND v8 0/3] Machine driver to support LPASS SC7280 sound card registration
by Srinivasa Rao Mandadapu 10 Feb '22

10 Feb '22

This patch set is to add support for SC7280 sound card registration and to add dt-bindings documentation file. Srinivasa Rao Mandadapu (3): ASoC: google: dt-bindings: Add sc7280-herobrine machine bindings ASoC: qcom: Add macro for lpass DAI id's max limit ASoC: qcom: SC7280: Add machine driver Changes Since V7: -- Create separate patch for dai id's macro. -- Remove unused dapm widget structure. -- Move to quicinc domain email id's. Changes Since V6: -- Remove redundant headers. -- Move max ports macro to lpass.h header. -- Arrange structure alignment. -- Fix indentation errors. -- Update module license. Changes Since V5: -- Add required properties to dt-bindings Changes Since V4: -- Add COMPILE_TEST flag in sc7280 configuration. -- Remove redundant startup and shutdown callbacks of snd_soc_ops. -- Fix typo errors. Changes Since V3: -- Change audio jack playpause key value. Changes Since V2: -- updated required field in bindings -- updated Return type check with proper enum in sc7280.c -- Updated Header name and Typos in sc7280.c Changes Since V1: -- Indentation changes and typo. .../bindings/sound/google,sc7280-herobrine.yaml | 171 +++++++++++++ sound/soc/qcom/Kconfig | 14 + sound/soc/qcom/Makefile | 2 + sound/soc/qcom/lpass.h | 1 + sound/soc/qcom/sc7280.c | 284 +++++++++++++++++++++ 5 files changed, 472 insertions(+) create mode 100644 Documentation/devicetree/bindings/sound/google,sc7280-herobrine.yaml create mode 100644 sound/soc/qcom/sc7280.c -- 2.7.4

3 6

[PATCH] soundwire: Replace acpi_bus_get_device()
by Rafael J. Wysocki 10 Feb '22

10 Feb '22

From: Rafael J. Wysocki <rafael.j.wysocki(a)intel.com> Replace acpi_bus_get_device() that is going to be dropped with acpi_fetch_acpi_dev(). No intentional functional impact. Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki(a)intel.com> --- drivers/soundwire/intel_init.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) Index: linux-pm/drivers/soundwire/intel_init.c =================================================================== --- linux-pm.orig/drivers/soundwire/intel_init.c +++ linux-pm/drivers/soundwire/intel_init.c @@ -180,7 +180,8 @@ static struct sdw_intel_ctx if (!res) return NULL; - if (acpi_bus_get_device(res->handle, &adev)) + adev = acpi_fetch_acpi_dev(res->handle); + if (!adev) return NULL; if (!res->count) @@ -294,13 +295,13 @@ err: static int sdw_intel_startup_controller(struct sdw_intel_ctx *ctx) { - struct acpi_device *adev; + struct acpi_device *adev = acpi_fetch_acpi_dev(ctx->handle); struct sdw_intel_link_dev *ldev; u32 caps; u32 link_mask; int i; - if (acpi_bus_get_device(ctx->handle, &adev)) + if (!adev) return -EINVAL; /* Check SNDWLCAP.LCOUNT */

2 1

[PATCH] soundwire: bus: add dev_warn() messages to track UNATTACHED devices
by Bard Liao 10 Feb '22

10 Feb '22

From: Pierre-Louis Bossart <pierre-louis.bossart(a)linux.intel.com> In rare cases, some devices seem to lose sync and never re-attach on the bus. This seems to happen only when there are more than one device per link, which suggests either an electrical issue, a race condition or a state machine issue. Add two dev_warn() messages to identify the sequence by which the devices become UNATTACHED. BugLink: https://github.com/thesofproject/linux/issues/3063 BugLink: https://github.com/thesofproject/linux/issues/3325 Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart(a)linux.intel.com> Reviewed-by: Rander Wang <rander.wang(a)intel.com> Signed-off-by: Bard Liao <yung-chuan.liao(a)linux.intel.com> --- drivers/soundwire/bus.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/drivers/soundwire/bus.c b/drivers/soundwire/bus.c index 67369e941d0d..354d3f89366f 100644 --- a/drivers/soundwire/bus.c +++ b/drivers/soundwire/bus.c @@ -1749,8 +1749,11 @@ int sdw_handle_slave_status(struct sdw_bus *bus, continue; if (status[i] == SDW_SLAVE_UNATTACHED && - slave->status != SDW_SLAVE_UNATTACHED) + slave->status != SDW_SLAVE_UNATTACHED) { + dev_warn(&slave->dev, "Slave %d state check1: UNATTACHED, status was %d\n", + i, slave->status); sdw_modify_slave_status(slave, SDW_SLAVE_UNATTACHED); + } } if (status[0] == SDW_SLAVE_ATTACHED) { @@ -1785,6 +1788,9 @@ int sdw_handle_slave_status(struct sdw_bus *bus, if (slave->status == SDW_SLAVE_UNATTACHED) break; + dev_warn(&slave->dev, "Slave %d state check2: UNATTACHED, status was %d\n", + i, slave->status); + sdw_modify_slave_status(slave, SDW_SLAVE_UNATTACHED); break; -- 2.17.1

2 1

[PATCH] soundwire: intel: fix wrong register name in intel_shim_wake
by Bard Liao 10 Feb '22

10 Feb '22

From: Libin Yang <libin.yang(a)intel.com> When clearing the sdw wakests status, we should use SDW_SHIM_WAKESTS. Fixes: 4a17c441c7cb ("soundwire: intel: revisit SHIM programming sequences.") Signed-off-by: Libin Yang <libin.yang(a)intel.com> Reviewed-by: Pierre-Louis Bossart <pierre-louis.bossart(a)linux.intel.com> Reviewed-by: Rander Wang <rander.wang(a)intel.com> Signed-off-by: Bard Liao <yung-chuan.liao(a)linux.intel.com> --- drivers/soundwire/intel.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/soundwire/intel.c b/drivers/soundwire/intel.c index 122f7a29d8ca..63101f1ba271 100644 --- a/drivers/soundwire/intel.c +++ b/drivers/soundwire/intel.c @@ -448,8 +448,8 @@ static void intel_shim_wake(struct sdw_intel *sdw, bool wake_enable) /* Clear wake status */ wake_sts = intel_readw(shim, SDW_SHIM_WAKESTS); - wake_sts |= (SDW_SHIM_WAKEEN_ENABLE << link_id); - intel_writew(shim, SDW_SHIM_WAKESTS_STATUS, wake_sts); + wake_sts |= (SDW_SHIM_WAKESTS_STATUS << link_id); + intel_writew(shim, SDW_SHIM_WAKESTS, wake_sts); } mutex_unlock(sdw->link_res->shim_lock); } -- 2.17.1

2 1

[PATCH] ASoC: qcom: Actually clear DMA interrupt register for HDMI
by Stephen Boyd 10 Feb '22

10 Feb '22

In commit da0363f7bfd3 ("ASoC: qcom: Fix for DMA interrupt clear reg overwriting") we changed regmap_write() to regmap_update_bits() so that we can avoid overwriting bits that we didn't intend to modify. Unfortunately this change breaks the case where a register is writable but not readable, which is exactly how the HDMI irq clear register is designed (grep around LPASS_HDMITX_APP_IRQCLEAR_REG to see how it's write only). That's because regmap_update_bits() tries to read the register from the hardware and if it isn't readable it looks in the regmap cache to see what was written there last time to compare against what we want to write there. Eventually, we're unable to modify this register at all because the bits that we're trying to set are already set in the cache. This is doubly bad for the irq clear register because you have to write the bit to clear an interrupt. Given the irq is level triggered, we see an interrupt storm upon plugging in an HDMI cable and starting audio playback. The irq storm is so great that performance degrades significantly, leading to CPU soft lockups. Fix it by using regmap_write_bits() so that we really do write the bits in the clear register that we want to. This brings the number of irqs handled by lpass_dma_interrupt_handler() down from ~150k/sec to ~10/sec. Fixes: da0363f7bfd3 ("ASoC: qcom: Fix for DMA interrupt clear reg overwriting") Cc: Srinivasa Rao Mandadapu <srivasam(a)codeaurora.org> Cc: Srinivas Kandagatla <srinivas.kandagatla(a)linaro.org> Signed-off-by: Stephen Boyd <swboyd(a)chromium.org> --- sound/soc/qcom/lpass-platform.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/sound/soc/qcom/lpass-platform.c b/sound/soc/qcom/lpass-platform.c index a59e9d20cb46..4b1773c1fb95 100644 --- a/sound/soc/qcom/lpass-platform.c +++ b/sound/soc/qcom/lpass-platform.c @@ -524,7 +524,7 @@ static int lpass_platform_pcmops_trigger(struct snd_soc_component *component, return -EINVAL; } - ret = regmap_update_bits(map, reg_irqclr, val_irqclr, val_irqclr); + ret = regmap_write_bits(map, reg_irqclr, val_irqclr, val_irqclr); if (ret) { dev_err(soc_runtime->dev, "error writing to irqclear reg: %d\n", ret); return ret; @@ -665,7 +665,7 @@ static irqreturn_t lpass_dma_interrupt_handler( return -EINVAL; } if (interrupts & LPAIF_IRQ_PER(chan)) { - rv = regmap_update_bits(map, reg, mask, (LPAIF_IRQ_PER(chan) | val)); + rv = regmap_write_bits(map, reg, mask, (LPAIF_IRQ_PER(chan) | val)); if (rv) { dev_err(soc_runtime->dev, "error writing to irqclear reg: %d\n", rv); @@ -676,7 +676,7 @@ static irqreturn_t lpass_dma_interrupt_handler( } if (interrupts & LPAIF_IRQ_XRUN(chan)) { - rv = regmap_update_bits(map, reg, mask, (LPAIF_IRQ_XRUN(chan) | val)); + rv = regmap_write_bits(map, reg, mask, (LPAIF_IRQ_XRUN(chan) | val)); if (rv) { dev_err(soc_runtime->dev, "error writing to irqclear reg: %d\n", rv); @@ -688,7 +688,7 @@ static irqreturn_t lpass_dma_interrupt_handler( } if (interrupts & LPAIF_IRQ_ERR(chan)) { - rv = regmap_update_bits(map, reg, mask, (LPAIF_IRQ_ERR(chan) | val)); + rv = regmap_write_bits(map, reg, mask, (LPAIF_IRQ_ERR(chan) | val)); if (rv) { dev_err(soc_runtime->dev, "error writing to irqclear reg: %d\n", rv); base-commit: dfd42facf1e4ada021b939b4e19c935dcdd55566 -- https://chromeos.dev

2 1

[PATCH 1/2] ASoC: bindings: fsl-asoc-card: Add compatible for tlv320aic31xx codec
by Apertis package maintainers 10 Feb '22

10 Feb '22

From: Ariel D'Alessandro <ariel.dalessandro(a)collabora.com> Commit 8c9b9cfb7724 ("ASoC: fsl-asoc-card: Support fsl,imx-audio-tlv320aic31xx codec")' added support for tlv320aic31xx codec to fsl-asoc-card, but missed the related device-tree compatible string documentation. Fix this. Signed-off-by: Ariel D'Alessandro <ariel.dalessandro(a)collabora.com> --- Documentation/devicetree/bindings/sound/fsl-asoc-card.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Documentation/devicetree/bindings/sound/fsl-asoc-card.txt b/Documentation/devicetree/bindings/sound/fsl-asoc-card.txt index b219626a5403..8b4f4015cfe4 100644 --- a/Documentation/devicetree/bindings/sound/fsl-asoc-card.txt +++ b/Documentation/devicetree/bindings/sound/fsl-asoc-card.txt @@ -40,6 +40,8 @@ The compatible list for this generic sound card currently: "fsl,imx-audio-tlv320aic32x4" + "fsl,imx-audio-tlv320aic31xx" + "fsl,imx-audio-si476x" "fsl,imx-audio-wm8958" -- 2.34.1

3 4

[PATCH] ALSA: ca0106: Rename register macro names
by Takashi Iwai 10 Feb '22

10 Feb '22

ca0106 driver code uses too generic names for its register definitions such as PTR, DATA, IPR, etc, which may eventually conflict with other code. This patch renames (some of) those register definitions with CA0106_ prefix to avoid the conflicts. Signed-off-by: Takashi Iwai <tiwai(a)suse.de> --- sound/pci/ca0106/ca0106.h | 18 ++++----- sound/pci/ca0106/ca0106_main.c | 70 ++++++++++++++++----------------- sound/pci/ca0106/ca0106_mixer.c | 16 ++++---- 3 files changed, 52 insertions(+), 52 deletions(-) diff --git a/sound/pci/ca0106/ca0106.h b/sound/pci/ca0106/ca0106.h index f246e6094289..991b1c5d41d5 100644 --- a/sound/pci/ca0106/ca0106.h +++ b/sound/pci/ca0106/ca0106.h @@ -59,15 +59,15 @@ /* PCI function 0 registers, address = <val> + PCIBASE0 */ /************************************************************************************************/ -#define PTR 0x00 /* Indexed register set pointer register */ +#define CA0106_PTR 0x00 /* Indexed register set pointer register */ /* NOTE: The CHANNELNUM and ADDRESS words can */ /* be modified independently of each other. */ /* CNL[1:0], ADDR[27:16] */ -#define DATA 0x04 /* Indexed register set data register */ +#define CA0106_DATA 0x04 /* Indexed register set data register */ /* DATA[31:0] */ -#define IPR 0x08 /* Global interrupt pending register */ +#define CA0106_IPR 0x08 /* Global interrupt pending register */ /* Clear pending interrupts by writing a 1 to */ /* the relevant bits and zero to the other bits */ #define IPR_MIDI_RX_B 0x00020000 /* MIDI UART-B Receive buffer non-empty */ @@ -88,7 +88,7 @@ #define IPR_MIDI_TX_A 0x00000002 /* MIDI UART-A Transmit buffer empty */ #define IPR_PCI 0x00000001 /* PCI Bus error */ -#define INTE 0x0c /* Interrupt enable register */ +#define CA0106_INTE 0x0c /* Interrupt enable register */ #define INTE_MIDI_RX_B 0x00020000 /* MIDI UART-B Receive buffer non-empty */ #define INTE_MIDI_TX_B 0x00010000 /* MIDI UART-B Transmit buffer empty */ @@ -108,8 +108,8 @@ #define INTE_MIDI_TX_A 0x00000002 /* MIDI UART-A Transmit buffer empty */ #define INTE_PCI 0x00000001 /* PCI Bus error */ -#define UNKNOWN10 0x10 /* Unknown ??. Defaults to 0 */ -#define HCFG 0x14 /* Hardware config register */ +#define CA0106_UNKNOWN10 0x10 /* Unknown ??. Defaults to 0 */ +#define CA0106_HCFG 0x14 /* Hardware config register */ /* 0x1000 causes AC3 to fails. It adds a dither bit. */ #define HCFG_STAC 0x10000000 /* Special mode for STAC9460 Codec. */ @@ -133,7 +133,7 @@ #define HCFG_AUDIOENABLE 0x00000001 /* 0 = CODECs transmit zero-valued samples */ /* Should be set to 1 when the EMU10K1 is */ /* completely initialized. */ -#define GPIO 0x18 /* Defaults: 005f03a3-Analog, 005f02a2-SPDIF. */ +#define CA0106_GPIO 0x18 /* Defaults: 005f03a3-Analog, 005f02a2-SPDIF. */ /* Here pins 0,1,2,3,4,,6 are output. 5,7 are input */ /* For the Audigy LS, pin 0 (or bit 8) controls the SPDIF/Analog jack. */ /* SB Live 24bit: @@ -152,9 +152,9 @@ * GPO [15:8] Default 0x9. (Default to SPDIF jack enabled for SPDIF) * GPO Enable [23:16] Default 0x0f. Setting a bit to 1, causes the pin to be an output pin. */ -#define AC97DATA 0x1c /* AC97 register set data register (16 bit) */ +#define CA0106_AC97DATA 0x1c /* AC97 register set data register (16 bit) */ -#define AC97ADDRESS 0x1e /* AC97 register set address register (8 bit) */ +#define CA0106_AC97ADDRESS 0x1e /* AC97 register set address register (8 bit) */ /********************************************************************************************************/ /* CA0106 pointer-offset register set, accessed through the PTR and DATA registers */ diff --git a/sound/pci/ca0106/ca0106_main.c b/sound/pci/ca0106/ca0106_main.c index 36fb150b72fb..8577f9fa5ea6 100644 --- a/sound/pci/ca0106/ca0106_main.c +++ b/sound/pci/ca0106/ca0106_main.c @@ -338,8 +338,8 @@ unsigned int snd_ca0106_ptr_read(struct snd_ca0106 * emu, regptr = (reg << 16) | chn; spin_lock_irqsave(&emu->emu_lock, flags); - outl(regptr, emu->port + PTR); - val = inl(emu->port + DATA); + outl(regptr, emu->port + CA0106_PTR); + val = inl(emu->port + CA0106_DATA); spin_unlock_irqrestore(&emu->emu_lock, flags); return val; } @@ -355,8 +355,8 @@ void snd_ca0106_ptr_write(struct snd_ca0106 *emu, regptr = (reg << 16) | chn; spin_lock_irqsave(&emu->emu_lock, flags); - outl(regptr, emu->port + PTR); - outl(data, emu->port + DATA); + outl(regptr, emu->port + CA0106_PTR); + outl(data, emu->port + CA0106_DATA); spin_unlock_irqrestore(&emu->emu_lock, flags); } @@ -455,8 +455,8 @@ static void snd_ca0106_intr_enable(struct snd_ca0106 *emu, unsigned int intrenb) unsigned int intr_enable; spin_lock_irqsave(&emu->emu_lock, flags); - intr_enable = inl(emu->port + INTE) | intrenb; - outl(intr_enable, emu->port + INTE); + intr_enable = inl(emu->port + CA0106_INTE) | intrenb; + outl(intr_enable, emu->port + CA0106_INTE); spin_unlock_irqrestore(&emu->emu_lock, flags); } @@ -466,8 +466,8 @@ static void snd_ca0106_intr_disable(struct snd_ca0106 *emu, unsigned int intrenb unsigned int intr_enable; spin_lock_irqsave(&emu->emu_lock, flags); - intr_enable = inl(emu->port + INTE) & ~intrenb; - outl(intr_enable, emu->port + INTE); + intr_enable = inl(emu->port + CA0106_INTE) & ~intrenb; + outl(intr_enable, emu->port + CA0106_INTE); spin_unlock_irqrestore(&emu->emu_lock, flags); } @@ -786,9 +786,9 @@ static int snd_ca0106_pcm_prepare_playback(struct snd_pcm_substream *substream) hcfg_set = 0; break; } - hcfg = inl(emu->port + HCFG) ; + hcfg = inl(emu->port + CA0106_HCFG) ; hcfg = (hcfg & ~hcfg_mask) | hcfg_set; - outl(hcfg, emu->port + HCFG); + outl(hcfg, emu->port + CA0106_HCFG); reg40 = snd_ca0106_ptr_read(emu, 0x40, 0); reg40 = (reg40 & ~reg40_mask) | reg40_set; snd_ca0106_ptr_write(emu, 0x40, 0, reg40); @@ -888,9 +888,9 @@ static int snd_ca0106_pcm_prepare_capture(struct snd_pcm_substream *substream) hcfg_set = 0; break; } - hcfg = inl(emu->port + HCFG) ; + hcfg = inl(emu->port + CA0106_HCFG) ; hcfg = (hcfg & ~hcfg_mask) | hcfg_set; - outl(hcfg, emu->port + HCFG); + outl(hcfg, emu->port + CA0106_HCFG); reg71 = snd_ca0106_ptr_read(emu, 0x71, 0); reg71 = (reg71 & ~reg71_mask) | reg71_set; snd_ca0106_ptr_write(emu, 0x71, 0, reg71); @@ -1142,8 +1142,8 @@ static unsigned short snd_ca0106_ac97_read(struct snd_ac97 *ac97, unsigned short val; spin_lock_irqsave(&emu->emu_lock, flags); - outb(reg, emu->port + AC97ADDRESS); - val = inw(emu->port + AC97DATA); + outb(reg, emu->port + CA0106_AC97ADDRESS); + val = inw(emu->port + CA0106_AC97DATA); spin_unlock_irqrestore(&emu->emu_lock, flags); return val; } @@ -1155,8 +1155,8 @@ static void snd_ca0106_ac97_write(struct snd_ac97 *ac97, unsigned long flags; spin_lock_irqsave(&emu->emu_lock, flags); - outb(reg, emu->port + AC97ADDRESS); - outw(val, emu->port + AC97DATA); + outb(reg, emu->port + CA0106_AC97ADDRESS); + outw(val, emu->port + CA0106_AC97DATA); spin_unlock_irqrestore(&emu->emu_lock, flags); } @@ -1200,7 +1200,7 @@ static irqreturn_t snd_ca0106_interrupt(int irq, void *dev_id) unsigned int stat76; struct snd_ca0106_channel *pchannel; - status = inl(chip->port + IPR); + status = inl(chip->port + CA0106_IPR); if (! status) return IRQ_NONE; @@ -1255,7 +1255,7 @@ static irqreturn_t snd_ca0106_interrupt(int irq, void *dev_id) } // acknowledge the interrupt if necessary - outl(status, chip->port+IPR); + outl(status, chip->port + CA0106_IPR); return IRQ_HANDLED; } @@ -1383,7 +1383,7 @@ static void ca0106_init_chip(struct snd_ca0106 *chip, int resume) int ch; unsigned int def_bits; - outl(0, chip->port + INTE); + outl(0, chip->port + CA0106_INTE); /* * Init to 0x02109204 : @@ -1420,8 +1420,8 @@ static void ca0106_init_chip(struct snd_ca0106 *chip, int resume) snd_ca0106_ptr_write(chip, CAPTURE_MUTE, 0, 0x00fc0000); /* Write 0x8000 to AC97_REC_GAIN to mute it. */ - outb(AC97_REC_GAIN, chip->port + AC97ADDRESS); - outw(0x8000, chip->port + AC97DATA); + outb(AC97_REC_GAIN, chip->port + CA0106_AC97ADDRESS); + outw(0x8000, chip->port + CA0106_AC97DATA); #if 0 /* FIXME: what are these? */ snd_ca0106_ptr_write(chip, SPCS0, 0, 0x2108006); snd_ca0106_ptr_write(chip, 0x42, 0, 0x2108006); @@ -1495,30 +1495,30 @@ static void ca0106_init_chip(struct snd_ca0106 *chip, int resume) /* FIXME: Still need to find out what the other GPIO bits do. * E.g. For digital spdif out. */ - outl(0x0, chip->port+GPIO); - /* outl(0x00f0e000, chip->port+GPIO); */ /* Analog */ - outl(0x005f5301, chip->port+GPIO); /* Analog */ + outl(0x0, chip->port + CA0106_GPIO); + /* outl(0x00f0e000, chip->port + CA0106_GPIO); */ /* Analog */ + outl(0x005f5301, chip->port + CA0106_GPIO); /* Analog */ } else if (chip->details->gpio_type == 1) { /* The SB0410 and SB0413 use GPIO differently. */ /* FIXME: Still need to find out what the other GPIO bits do. * E.g. For digital spdif out. */ - outl(0x0, chip->port+GPIO); - /* outl(0x00f0e000, chip->port+GPIO); */ /* Analog */ - outl(0x005f5301, chip->port+GPIO); /* Analog */ + outl(0x0, chip->port + CA0106_GPIO); + /* outl(0x00f0e000, chip->port + CA0106_GPIO); */ /* Analog */ + outl(0x005f5301, chip->port + CA0106_GPIO); /* Analog */ } else { - outl(0x0, chip->port+GPIO); - outl(0x005f03a3, chip->port+GPIO); /* Analog */ - /* outl(0x005f02a2, chip->port+GPIO); */ /* SPDIF */ + outl(0x0, chip->port + CA0106_GPIO); + outl(0x005f03a3, chip->port + CA0106_GPIO); /* Analog */ + /* outl(0x005f02a2, chip->port + CA0106_GPIO); */ /* SPDIF */ } snd_ca0106_intr_enable(chip, 0x105); /* Win2000 uses 0x1e0 */ /* outl(HCFG_LOCKSOUNDCACHE|HCFG_AUDIOENABLE, chip->port+HCFG); */ /* 0x1000 causes AC3 to fails. Maybe it effects 24 bit output. */ - /* outl(0x00001409, chip->port+HCFG); */ - /* outl(0x00000009, chip->port+HCFG); */ + /* outl(0x00001409, chip->port + CA0106_HCFG); */ + /* outl(0x00000009, chip->port + CA0106_HCFG); */ /* AC97 2.0, Enable outputs. */ - outl(HCFG_AC97 | HCFG_AUDIOENABLE, chip->port+HCFG); + outl(HCFG_AC97 | HCFG_AUDIOENABLE, chip->port + CA0106_HCFG); if (chip->details->i2c_adc == 1) { /* The SB0410 and SB0413 use I2C to control ADC. */ @@ -1560,12 +1560,12 @@ static void ca0106_stop_chip(struct snd_ca0106 *chip) { /* disable interrupts */ snd_ca0106_ptr_write(chip, BASIC_INTERRUPT, 0, 0); - outl(0, chip->port + INTE); + outl(0, chip->port + CA0106_INTE); snd_ca0106_ptr_write(chip, EXTENDED_INT_MASK, 0, 0); udelay(1000); /* disable audio */ /* outl(HCFG_LOCKSOUNDCACHE, chip->port + HCFG); */ - outl(0, chip->port + HCFG); + outl(0, chip->port + CA0106_HCFG); /* FIXME: We need to stop and DMA transfers here. * But as I am not sure how yet, we cannot from the dma pages. * So we can fix: snd-malloc: Memory leak? pages not freed = 8 diff --git a/sound/pci/ca0106/ca0106_mixer.c b/sound/pci/ca0106/ca0106_mixer.c index c852c6a75b91..05f56015ddd8 100644 --- a/sound/pci/ca0106/ca0106_mixer.c +++ b/sound/pci/ca0106/ca0106_mixer.c @@ -70,8 +70,8 @@ static void ca0106_spdif_enable(struct snd_ca0106 *emu) snd_ca0106_ptr_write(emu, SPDIF_SELECT2, 0, 0x0b000000); val = snd_ca0106_ptr_read(emu, CAPTURE_CONTROL, 0) & ~0x1000; snd_ca0106_ptr_write(emu, CAPTURE_CONTROL, 0, val); - val = inl(emu->port + GPIO) & ~0x101; - outl(val, emu->port + GPIO); + val = inl(emu->port + CA0106_GPIO) & ~0x101; + outl(val, emu->port + CA0106_GPIO); } else { /* Analog */ @@ -79,8 +79,8 @@ static void ca0106_spdif_enable(struct snd_ca0106 *emu) snd_ca0106_ptr_write(emu, SPDIF_SELECT2, 0, 0x000f0000); val = snd_ca0106_ptr_read(emu, CAPTURE_CONTROL, 0) | 0x1000; snd_ca0106_ptr_write(emu, CAPTURE_CONTROL, 0, val); - val = inl(emu->port + GPIO) | 0x101; - outl(val, emu->port + GPIO); + val = inl(emu->port + CA0106_GPIO) | 0x101; + outl(val, emu->port + CA0106_GPIO); } } @@ -119,14 +119,14 @@ static void ca0106_set_capture_mic_line_in(struct snd_ca0106 *emu) if (emu->capture_mic_line_in) { /* snd_ca0106_i2c_write(emu, ADC_MUX, 0); */ /* Mute input */ - tmp = inl(emu->port+GPIO) & ~0x400; + tmp = inl(emu->port + CA0106_GPIO) & ~0x400; tmp = tmp | 0x400; - outl(tmp, emu->port+GPIO); + outl(tmp, emu->port + CA0106_GPIO); /* snd_ca0106_i2c_write(emu, ADC_MUX, ADC_MUX_MIC); */ } else { /* snd_ca0106_i2c_write(emu, ADC_MUX, 0); */ /* Mute input */ - tmp = inl(emu->port+GPIO) & ~0x400; - outl(tmp, emu->port+GPIO); + tmp = inl(emu->port + CA0106_GPIO) & ~0x400; + outl(tmp, emu->port + CA0106_GPIO); /* snd_ca0106_i2c_write(emu, ADC_MUX, ADC_MUX_LINEIN); */ } } -- 2.31.1

1 0

[PATCH 0/2] ALSA: memalloc: Fixes for sync check and SG helper
by Takashi Iwai 10 Feb '22

10 Feb '22

The recent changes and additions in ALSA core memalloc helpers had incorrect usages of dma_need_sync() and the order of SG page invalidation. This patch corrects those. Takashi === Takashi Iwai (2): ALSA: memalloc: Fix dma_need_sync() checks ALSA: memalloc: invalidate SG pages before sync sound/core/memalloc.c | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) -- 2.31.1

1 2

[bug report] ASoC: SOF: compr: Add compress ops implementation
by Dan Carpenter 10 Feb '22

10 Feb '22

Hello Daniel Baluta, This is a semi-automatic email about new static checker warnings. The patch 6324cf901e14: "ASoC: SOF: compr: Add compress ops implementation" from Jan 20, 2022, leads to the following Smatch complaint: sound/soc/sof/compress.c:54 snd_sof_compr_fragment_elapsed() warn: variable dereferenced before check 'cstream' (see line 48) sound/soc/sof/compress.c 47 { 48 struct snd_soc_pcm_runtime *rtd = cstream->private_data; 49 struct snd_compr_runtime *crtd = cstream->runtime; ^^^^^^^^^^^^^^^^ The patch adds a new dereference 50 struct snd_soc_component *component; 51 struct snd_compr_tstamp *tstamp; 52 struct snd_sof_pcm *spcm; 53 54 if (!cstream) ^^^^^^^^ The old code assumed "cstream" could be NULL 55 return; 56 regards, dan carpenter

1 0

[PATCH AUTOSEL 5.16 01/42] ASoC: mediatek: fix unmet dependency on GPIOLIB for SND_SOC_DMIC
by Sasha Levin 09 Feb '22

09 Feb '22

From: Julian Braha <julianbraha(a)gmail.com> [ Upstream commit 579b2c8f72d974f27d85bbd53846f34675ee3b01 ] When SND_SOC_MT8195_MT6359_RT1011_RT5682 is selected, and GPIOLIB is not selected, Kbuild gives the following warning: WARNING: unmet direct dependencies detected for SND_SOC_DMIC Depends on [n]: SOUND [=y] && !UML && SND [=y] && SND_SOC [=y] && GPIOLIB [=n] Selected by [y]: - SND_SOC_MT8195_MT6359_RT1011_RT5682 [=y] && SOUND [=y] && !UML && SND [=y] && SND_SOC [=y] && I2C [=y] && SND_SOC_MT8195 [=y] && MTK_PMIC_WRAP [=y] This is because SND_SOC_MT8195_MT6359_RT1011_RT5682 selects SND_SOC_DMIC without selecting or depending on GPIOLIB, depsite SND_SOC_DMIC depending on GPIOLIB. This unmet dependency bug was detected by Kismet, a static analysis tool for Kconfig. Please advise if this is not the appropriate solution. Signed-off-by: Julian Braha <julianbraha(a)gmail.com> Reviewed-by: Tzung-Bi Shih <tzungbi(a)google.com> Link: https://lore.kernel.org/r/20220117050324.68371-1-julianbraha@gmail.com Signed-off-by: Mark Brown <broonie(a)kernel.org> Signed-off-by: Sasha Levin <sashal(a)kernel.org> --- sound/soc/mediatek/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/soc/mediatek/Kconfig b/sound/soc/mediatek/Kconfig index 3b1ddea26a9ef..76f191ec7bf84 100644 --- a/sound/soc/mediatek/Kconfig +++ b/sound/soc/mediatek/Kconfig @@ -215,7 +215,7 @@ config SND_SOC_MT8195_MT6359_RT1019_RT5682 config SND_SOC_MT8195_MT6359_RT1011_RT5682 tristate "ASoC Audio driver for MT8195 with MT6359 RT1011 RT5682 codec" - depends on I2C + depends on I2C && GPIOLIB depends on SND_SOC_MT8195 && MTK_PMIC_WRAP select SND_SOC_MT6359 select SND_SOC_RT1011 -- 2.34.1

1 0

[PATCH v6] ASoC: dt-bindings: davinci-mcasp: convert McASP bindings to yaml schema
by Jayesh Choudhary 09 Feb '22

09 Feb '22

Convert the bindings for McASP controllers for TI SoCs from txt to YAML schema. Adds additional properties 'clocks', 'clock-names', 'power-domains', '#sound-dai-cells' and 'port' which were missing from the txt file. Removes properties 'sram-size-playback' and 'sram-size-capture' since they are not used. Adds 'dmas' and 'dma-names' in the example which were missing from the txt file. Changes 'interrupts' and 'interrupt-names' from optional to required properties. Changes 'op-modes', 'serial-dir' to optional properties as they are not needed if the McASP is used only as GPIO. Changes 'tdm-slots' to required property only for I2S operation mode. Adds the yaml file in the 'MAINTAINERS' under the heading 'TEXAS INSTRUMENTS ASoC DRIVERS' Signed-off-by: Jayesh Choudhary <j-choudhary(a)ti.com> Reviewed-by: Rob Herring <robh(a)kernel.org> Acked-by: Peter Ujfalusi <peter.ujfalusi(a)gmail.com> --- Changelog: v6: - adds 'reviewed-by' and 'acked-by' from v5 patch v5: - changes the commit message - changes description for 'reg', 'op-mode', 'tx-num-evt', 'rx-num-evt' and 'interrupts' - adds minimum and maximum for 'tdm-slots' - removes default from 'serial-dir' - removes maxItems from 'tdm-slots', 'tx-num-evt', 'rx-num-evt' and 'auxclk-fs-ratio' as they are of type uint32 - adds 'tdm-slots' as conditionally required property for I2S mode of operation v4: - changes the commit message - adds type and description to relevant properties - changes maxItems for 'serial-dir' - removes properties 'sram-size-playback' and 'sram-size-capture' as they are not used - removes 'function-gpios' - removes 'num-serializer' - marks 'tdm-slots', 'op-mode' and 'serial-dir' as optional properties - adds the yaml file in MAINTAINERS v3: - remove maxItems from 'clock-names' v2: - changes the commit message - modifies the properties 'clocks', 'clock-names', 'dma-names', 'dmas', 'interrupts' and 'interrupt-names' according to the arm SOCs - adds 'ports' and 'num-serializer' as node properties .../bindings/sound/davinci-mcasp-audio.txt | 86 -------- .../bindings/sound/davinci-mcasp-audio.yaml | 201 ++++++++++++++++++ MAINTAINERS | 1 + 3 files changed, 202 insertions(+), 86 deletions(-) delete mode 100644 Documentation/devicetree/bindings/sound/davinci-mcasp-audio.txt create mode 100644 Documentation/devicetree/bindings/sound/davinci-mcasp-audio.yaml diff --git a/Documentation/devicetree/bindings/sound/davinci-mcasp-audio.txt b/Documentation/devicetree/bindings/sound/davinci-mcasp-audio.txt deleted file mode 100644 index bd863bd69501..000000000000 --- a/Documentation/devicetree/bindings/sound/davinci-mcasp-audio.txt +++ /dev/null @@ -1,86 +0,0 @@ -Texas Instruments McASP controller - -Required properties: -- compatible : - "ti,dm646x-mcasp-audio" : for DM646x platforms - "ti,da830-mcasp-audio" : for both DA830 & DA850 platforms - "ti,am33xx-mcasp-audio" : for AM33xx platforms (AM33xx, AM43xx, TI81xx) - "ti,dra7-mcasp-audio" : for DRA7xx platforms - "ti,omap4-mcasp-audio" : for OMAP4 - -- reg : Should contain reg specifiers for the entries in the reg-names property. -- reg-names : Should contain: - * "mpu" for the main registers (required). For compatibility with - existing software, it is recommended this is the first entry. - * "dat" for separate data port register access (optional). -- op-mode : I2S/DIT ops mode. 0 for I2S mode. 1 for DIT mode used for S/PDIF, - IEC60958-1, and AES-3 formats. -- tdm-slots : Slots for TDM operation. Indicates number of channels transmitted - or received over one serializer. -- serial-dir : A list of serializer configuration. Each entry is a number - indication for serializer pin direction. - (0 - INACTIVE, 1 - TX, 2 - RX) -- dmas: two element list of DMA controller phandles and DMA request line - ordered pairs. -- dma-names: identifier string for each DMA request line in the dmas property. - These strings correspond 1:1 with the ordered pairs in dmas. The dma - identifiers must be "rx" and "tx". - -Optional properties: - -- ti,hwmods : Must be "mcasp<n>", n is controller instance starting 0 -- tx-num-evt : FIFO levels. -- rx-num-evt : FIFO levels. -- dismod : Specify the drive on TX pin during inactive slots - 0 : 3-state - 2 : logic low - 3 : logic high - Defaults to 'logic low' when the property is not present -- sram-size-playback : size of sram to be allocated during playback -- sram-size-capture : size of sram to be allocated during capture -- interrupts : Interrupt numbers for McASP -- interrupt-names : Known interrupt names are "tx" and "rx" -- pinctrl-0: Should specify pin control group used for this controller. -- pinctrl-names: Should contain only one value - "default", for more details - please refer to pinctrl-bindings.txt -- fck_parent : Should contain a valid clock name which will be used as parent - for the McASP fck -- auxclk-fs-ratio: When McASP is bus master indicates the ratio between AUCLK - and FS rate if applicable: - AUCLK rate = auxclk-fs-ratio * FS rate - -Optional GPIO support: -If any McASP pin need to be used as GPIO then the McASP node must have: -... - gpio-controller - #gpio-cells = <2>; -... - -When requesting a GPIO, the first parameter is the PIN index in McASP_P* -registers. -For example to request the AXR2 pin of mcasp8: -function-gpios = <&mcasp8 2 0>; - -Or to request the ACLKR pin of mcasp8: -function-gpios = <&mcasp8 29 0>; - -For generic gpio information, please refer to bindings/gpio/gpio.txt - -Example: - -mcasp0: mcasp0@1d00000 { - compatible = "ti,da830-mcasp-audio"; - reg = <0x100000 0x3000>; - reg-names "mpu"; - interrupts = <82>, <83>; - interrupt-names = "tx", "rx"; - op-mode = <0>; /* MCASP_IIS_MODE */ - tdm-slots = <2>; - serial-dir = < - 0 0 0 0 /* 0: INACTIVE, 1: TX, 2: RX */ - 0 0 0 0 - 0 0 0 1 - 2 0 0 0 >; - tx-num-evt = <1>; - rx-num-evt = <1>; -}; diff --git a/Documentation/devicetree/bindings/sound/davinci-mcasp-audio.yaml b/Documentation/devicetree/bindings/sound/davinci-mcasp-audio.yaml new file mode 100644 index 000000000000..f46c66bc6b2d --- /dev/null +++ b/Documentation/devicetree/bindings/sound/davinci-mcasp-audio.yaml @@ -0,0 +1,201 @@ +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/sound/davinci-mcasp-audio.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: McASP Controller for TI SoCs + +maintainers: + - Jayesh Choudhary <j-choudhary(a)ti.com> + +properties: + compatible: + enum: + - ti,dm646x-mcasp-audio + - ti,da830-mcasp-audio + - ti,am33xx-mcasp-audio + - ti,dra7-mcasp-audio + - ti,omap4-mcasp-audio + + reg: + minItems: 1 + items: + - description: CFG registers + - description: data registers + + reg-names: + minItems: 1 + items: + - const: mpu + - const: dat + + op-mode: + $ref: /schemas/types.yaml#/definitions/uint32 + description: 0 - I2S or 1 - DIT operation mode + enum: + - 0 + - 1 + + tdm-slots: + $ref: /schemas/types.yaml#/definitions/uint32 + description: + number of channels over one serializer + the property is ignored in DIT mode + minimum: 2 + maximum: 32 + + serial-dir: + description: + A list of serializer configuration + Entry is indication for serializer pin direction + 0 - Inactive, 1 - TX, 2 - RX + All AXR pins should be present in the array even if inactive + $ref: /schemas/types.yaml#/definitions/uint32-array + minItems: 1 + maxItems: 25 + items: + minimum: 0 + maximum: 2 + + dmas: + minItems: 1 + items: + - description: transmission DMA channel + - description: reception DMA channel + + dma-names: + minItems: 1 + items: + - const: tx + - const: rx + + ti,hwmods: + $ref: /schemas/types.yaml#/definitions/string + description: Name of hwmod associated with McASP + maxItems: 1 + deprecated: true + + tx-num-evt: + $ref: /schemas/types.yaml#/definitions/uint32 + description: + configures WFIFO threshold + 0 disables the FIFO use + if property is missing, then also FIFO use is disabled + + rx-num-evt: + $ref: /schemas/types.yaml#/definitions/uint32 + description: + configures RFIFO threshold + 0 disables the FIFO use + if property is missing, then also FIFO use is disabled + + dismod: + $ref: /schemas/types.yaml#/definitions/uint32 + description: + specify the drive on TX pin during inactive time slots + 0 - 3-state, 2 - logic low, 3 - logic high + enum: + - 0 + - 2 + - 3 + default: 2 + + interrupts: + anyOf: + - minItems: 1 + items: + - description: TX interrupt + - description: RX interrupt + - items: + - description: common/combined interrupt + + interrupt-names: + oneOf: + - minItems: 1 + items: + - const: tx + - const: rx + - const: common + + fck_parent: + $ref: /schemas/types.yaml#/definitions/string + description: parent clock name for McASP fck + maxItems: 1 + + auxclk-fs-ratio: + $ref: /schemas/types.yaml#/definitions/uint32 + description: ratio of AUCLK and FS rate if applicable + + gpio-controller: true + + "#gpio-cells": + const: 2 + + clocks: + minItems: 1 + items: + - description: functional clock + - description: module specific optional ahclkx clock + - description: module specific optional ahclkr clock + + clock-names: + minItems: 1 + items: + - const: fck + - const: ahclkx + - const: ahclkr + + power-domains: + description: phandle to the corresponding power-domain + maxItems: 1 + + "#sound-dai-cells": + const: 0 + + port: + description: connection for when McASP is used via graph card + type: object + +required: + - compatible + - reg + - reg-names + - dmas + - dma-names + - interrupts + - interrupt-names + +allOf: + - if: + properties: + opmode: + enum: + - 0 + + then: + required: + - tdm-slots + +additionalProperties: false + +examples: + - | + mcasp0: mcasp0@1d00000 { + compatible = "ti,da830-mcasp-audio"; + reg = <0x100000 0x3000>; + reg-names = "mpu"; + interrupts = <82>, <83>; + interrupt-names = "tx", "rx"; + op-mode = <0>; /* MCASP_IIS_MODE */ + tdm-slots = <2>; + dmas = <&main_udmap 0xc400>, <&main_udmap 0x4400>; + dma-names = "tx", "rx"; + serial-dir = < + 0 0 0 0 /* 0: INACTIVE, 1: TX, 2: RX */ + 0 0 0 0 + 0 0 0 1 + 2 0 0 0 >; + tx-num-evt = <1>; + rx-num-evt = <1>; + }; diff --git a/MAINTAINERS b/MAINTAINERS index 35ca7a4a65d8..d8f99c617ad5 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -19157,6 +19157,7 @@ TEXAS INSTRUMENTS ASoC DRIVERS M: Peter Ujfalusi <peter.ujfalusi(a)gmail.com> L: alsa-devel(a)alsa-project.org (moderated for non-subscribers) S: Maintained +F: Documentation/devicetree/bindings/sound/davinci-mcasp-audio.yaml F: sound/soc/ti/ TEXAS INSTRUMENTS' DAC7612 DAC DRIVER -- 2.17.1

2 1

[PATCH] ASoC: SOF: Intel: hdac_ext_stream: consistent prefixes for variables/members
by Peter Ujfalusi 09 Feb '22

09 Feb '22

From: Pierre-Louis Bossart <pierre-louis.bossart(a)linux.intel.com> The existing code maximizes confusion by using 'stream' and 'hstream' variables of different types, e.g: struct hdac_stream *stream; struct hdac_ext_stream *stream; struct hdac_stream *hstream; struct hdac_ext_stream *hstream; This confusion is partly inherited from legacy code but SOF contributors added their own creative spin, e.g. struct hdac_ext_stream *link_dev; struct hdac_ext_stream *dsp_stream; struct hdac_ext_stream hda_stream; and my personal favorite: stream = &hda_stream->hda_stream; This patch suggests a consistent naming across all Intel code related to HDAudio stream management. The convention is - by hierarchical order: struct sof_intel_hda_stream *hda_stream; struct hdac_ext_stream *hext_stream; struct hdac_stream *hstream; No functionality change - just renaming of variables/members. Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart(a)linux.intel.com> Reviewed-by: Kai Vehmanen <kai.vehmanen(a)linux.intel.com> Reviewed-by: Rander Wang <rander.wang(a)intel.com> Signed-off-by: Peter Ujfalusi <peter.ujfalusi(a)linux.intel.com> --- sound/soc/sof/intel/hda-dai.c | 92 +++++++++++------------ sound/soc/sof/intel/hda-dsp.c | 14 ++-- sound/soc/sof/intel/hda-ipc.c | 10 +-- sound/soc/sof/intel/hda-loader.c | 50 ++++++------- sound/soc/sof/intel/hda-pcm.c | 12 +-- sound/soc/sof/intel/hda-probes.c | 34 ++++----- sound/soc/sof/intel/hda-stream.c | 122 +++++++++++++++---------------- sound/soc/sof/intel/hda-trace.c | 6 +- sound/soc/sof/intel/hda.h | 17 +++-- 9 files changed, 179 insertions(+), 178 deletions(-) diff --git a/sound/soc/sof/intel/hda-dai.c b/sound/soc/sof/intel/hda-dai.c index 28a54145c150..af0c85e4e299 100644 --- a/sound/soc/sof/intel/hda-dai.c +++ b/sound/soc/sof/intel/hda-dai.c @@ -62,7 +62,7 @@ static struct hdac_ext_stream * const struct sof_intel_dsp_desc *chip; struct snd_sof_dev *sdev; struct hdac_ext_stream *res = NULL; - struct hdac_stream *stream = NULL; + struct hdac_stream *hstream = NULL; int stream_dir = substream->stream; @@ -72,39 +72,39 @@ static struct hdac_ext_stream * } spin_lock_irq(&bus->reg_lock); - list_for_each_entry(stream, &bus->stream_list, list) { - struct hdac_ext_stream *hstream = - stream_to_hdac_ext_stream(stream); - if (stream->direction != substream->stream) + list_for_each_entry(hstream, &bus->stream_list, list) { + struct hdac_ext_stream *hext_stream = + stream_to_hdac_ext_stream(hstream); + if (hstream->direction != substream->stream) continue; - hda_stream = hstream_to_sof_hda_stream(hstream); + hda_stream = hstream_to_sof_hda_stream(hext_stream); sdev = hda_stream->sdev; chip = get_chip_info(sdev->pdata); /* check if link is available */ - if (!hstream->link_locked) { + if (!hext_stream->link_locked) { /* * choose the first available link for platforms that do not have the * PROCEN_FMT_QUIRK set. */ if (!(chip->quirks & SOF_INTEL_PROCEN_FMT_QUIRK)) { - res = hstream; + res = hext_stream; break; } - if (stream->opened) { + if (hstream->opened) { /* * check if the stream tag matches the stream * tag of one of the connected FEs */ if (hda_check_fes(rtd, stream_dir, - stream->stream_tag)) { - res = hstream; + hstream->stream_tag)) { + res = hext_stream; break; } } else { - res = hstream; + res = hext_stream; /* * This must be a hostless stream. @@ -132,17 +132,17 @@ static struct hdac_ext_stream * return res; } -static int hda_link_dma_params(struct hdac_ext_stream *stream, +static int hda_link_dma_params(struct hdac_ext_stream *hext_stream, struct hda_pipe_params *params) { - struct hdac_stream *hstream = &stream->hstream; + struct hdac_stream *hstream = &hext_stream->hstream; unsigned char stream_tag = hstream->stream_tag; struct hdac_bus *bus = hstream->bus; struct hdac_ext_link *link; unsigned int format_val; - snd_hdac_ext_stream_decouple(bus, stream, true); - snd_hdac_ext_link_stream_reset(stream); + snd_hdac_ext_stream_decouple(bus, hext_stream, true); + snd_hdac_ext_link_stream_reset(hext_stream); format_val = snd_hdac_calc_stream_format(params->s_freq, params->ch, params->format, @@ -151,9 +151,9 @@ static int hda_link_dma_params(struct hdac_ext_stream *stream, dev_dbg(bus->dev, "format_val=%d, rate=%d, ch=%d, format=%d\n", format_val, params->s_freq, params->ch, params->format); - snd_hdac_ext_link_stream_setup(stream, format_val); + snd_hdac_ext_link_stream_setup(hext_stream, format_val); - if (stream->hstream.direction == SNDRV_PCM_STREAM_PLAYBACK) { + if (hext_stream->hstream.direction == SNDRV_PCM_STREAM_PLAYBACK) { list_for_each_entry(link, &bus->hlink_list, list) { if (link->index == params->link_index) snd_hdac_ext_link_set_stream_id(link, @@ -161,7 +161,7 @@ static int hda_link_dma_params(struct hdac_ext_stream *stream, } } - stream->link_prepared = 1; + hext_stream->link_prepared = 1; return 0; } @@ -218,7 +218,7 @@ static int hda_link_hw_params(struct snd_pcm_substream *substream, { struct hdac_stream *hstream = substream->runtime->private_data; struct hdac_bus *bus = hstream->bus; - struct hdac_ext_stream *link_dev; + struct hdac_ext_stream *hext_stream; struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); struct snd_soc_dai *codec_dai = asoc_rtd_to_codec(rtd, 0); struct sof_intel_hda_stream *hda_stream; @@ -229,18 +229,18 @@ static int hda_link_hw_params(struct snd_pcm_substream *substream, int ret; /* get stored dma data if resuming from system suspend */ - link_dev = snd_soc_dai_get_dma_data(dai, substream); - if (!link_dev) { - link_dev = hda_link_stream_assign(bus, substream); - if (!link_dev) + hext_stream = snd_soc_dai_get_dma_data(dai, substream); + if (!hext_stream) { + hext_stream = hda_link_stream_assign(bus, substream); + if (!hext_stream) return -EBUSY; - snd_soc_dai_set_dma_data(dai, substream, (void *)link_dev); + snd_soc_dai_set_dma_data(dai, substream, (void *)hext_stream); } - stream_tag = hdac_stream(link_dev)->stream_tag; + stream_tag = hdac_stream(hext_stream)->stream_tag; - hda_stream = hstream_to_sof_hda_stream(link_dev); + hda_stream = hstream_to_sof_hda_stream(hext_stream); if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) w = dai->playback_widget; @@ -257,7 +257,7 @@ static int hda_link_hw_params(struct snd_pcm_substream *substream, return -EINVAL; /* set the hdac_stream in the codec dai */ - snd_soc_dai_set_stream(codec_dai, hdac_stream(link_dev), substream->stream); + snd_soc_dai_set_stream(codec_dai, hdac_stream(hext_stream), substream->stream); p_params.s_fmt = snd_pcm_format_width(params_format(params)); p_params.ch = params_channels(params); @@ -271,20 +271,20 @@ static int hda_link_hw_params(struct snd_pcm_substream *substream, else p_params.link_bps = codec_dai->driver->capture.sig_bits; - return hda_link_dma_params(link_dev, &p_params); + return hda_link_dma_params(hext_stream, &p_params); } static int hda_link_pcm_prepare(struct snd_pcm_substream *substream, struct snd_soc_dai *dai) { - struct hdac_ext_stream *link_dev = + struct hdac_ext_stream *hext_stream = snd_soc_dai_get_dma_data(dai, substream); struct snd_sof_dev *sdev = snd_soc_component_get_drvdata(dai->component); struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); int stream = substream->stream; - if (link_dev->link_prepared) + if (hext_stream->link_prepared) return 0; dev_dbg(sdev->dev, "hda: prepare stream dir %d\n", substream->stream); @@ -326,7 +326,7 @@ static int hda_link_dai_config_pause_push_ipc(struct snd_soc_dapm_widget *w) static int hda_link_pcm_trigger(struct snd_pcm_substream *substream, int cmd, struct snd_soc_dai *dai) { - struct hdac_ext_stream *link_dev = + struct hdac_ext_stream *hext_stream = snd_soc_dai_get_dma_data(dai, substream); struct sof_intel_hda_stream *hda_stream; struct snd_soc_pcm_runtime *rtd; @@ -345,7 +345,7 @@ static int hda_link_pcm_trigger(struct snd_pcm_substream *substream, if (!link) return -EINVAL; - hda_stream = hstream_to_sof_hda_stream(link_dev); + hda_stream = hstream_to_sof_hda_stream(hext_stream); dev_dbg(dai->dev, "In %s cmd=%d\n", __func__, cmd); @@ -354,11 +354,11 @@ static int hda_link_pcm_trigger(struct snd_pcm_substream *substream, switch (cmd) { case SNDRV_PCM_TRIGGER_START: case SNDRV_PCM_TRIGGER_PAUSE_RELEASE: - snd_hdac_ext_link_stream_start(link_dev); + snd_hdac_ext_link_stream_start(hext_stream); break; case SNDRV_PCM_TRIGGER_SUSPEND: case SNDRV_PCM_TRIGGER_STOP: - snd_hdac_ext_link_stream_clear(link_dev); + snd_hdac_ext_link_stream_clear(hext_stream); /* * free DAI widget during stop/suspend to keep widget use_count's balanced. @@ -368,14 +368,14 @@ static int hda_link_pcm_trigger(struct snd_pcm_substream *substream, return ret; if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) { - stream_tag = hdac_stream(link_dev)->stream_tag; + stream_tag = hdac_stream(hext_stream)->stream_tag; snd_hdac_ext_link_clear_stream_id(link, stream_tag); } - link_dev->link_prepared = 0; + hext_stream->link_prepared = 0; break; case SNDRV_PCM_TRIGGER_PAUSE_PUSH: - snd_hdac_ext_link_stream_clear(link_dev); + snd_hdac_ext_link_stream_clear(hext_stream); ret = hda_link_dai_config_pause_push_ipc(w); if (ret < 0) @@ -396,22 +396,22 @@ static int hda_link_hw_free(struct snd_pcm_substream *substream, struct hdac_ext_link *link; struct hdac_stream *hstream; struct snd_soc_pcm_runtime *rtd; - struct hdac_ext_stream *link_dev; + struct hdac_ext_stream *hext_stream; struct snd_soc_dapm_widget *w; int ret; hstream = substream->runtime->private_data; bus = hstream->bus; rtd = asoc_substream_to_rtd(substream); - link_dev = snd_soc_dai_get_dma_data(dai, substream); + hext_stream = snd_soc_dai_get_dma_data(dai, substream); - if (!link_dev) { + if (!hext_stream) { dev_dbg(dai->dev, - "%s: link_dev is not assigned\n", __func__); + "%s: hext_stream is not assigned\n", __func__); return -EINVAL; } - hda_stream = hstream_to_sof_hda_stream(link_dev); + hda_stream = hstream_to_sof_hda_stream(hext_stream); if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) w = dai->playback_widget; @@ -428,13 +428,13 @@ static int hda_link_hw_free(struct snd_pcm_substream *substream, return -EINVAL; if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) { - stream_tag = hdac_stream(link_dev)->stream_tag; + stream_tag = hdac_stream(hext_stream)->stream_tag; snd_hdac_ext_link_clear_stream_id(link, stream_tag); } snd_soc_dai_set_dma_data(dai, substream, NULL); - snd_hdac_ext_stream_release(link_dev, HDAC_EXT_STREAM_TYPE_LINK); - link_dev->link_prepared = 0; + snd_hdac_ext_stream_release(hext_stream, HDAC_EXT_STREAM_TYPE_LINK); + hext_stream->link_prepared = 0; /* free the host DMA channel reserved by hostless streams */ hda_stream->host_reserved = 0; diff --git a/sound/soc/sof/intel/hda-dsp.c b/sound/soc/sof/intel/hda-dsp.c index 916a257ea96b..0fe522549c91 100644 --- a/sound/soc/sof/intel/hda-dsp.c +++ b/sound/soc/sof/intel/hda-dsp.c @@ -904,7 +904,7 @@ int hda_dsp_set_hw_params_upon_resume(struct snd_sof_dev *sdev) #if IS_ENABLED(CONFIG_SND_SOC_SOF_HDA) struct hdac_bus *bus = sof_to_bus(sdev); struct snd_soc_pcm_runtime *rtd; - struct hdac_ext_stream *stream; + struct hdac_ext_stream *hext_stream; struct hdac_ext_link *link; struct hdac_stream *s; const char *name; @@ -912,7 +912,7 @@ int hda_dsp_set_hw_params_upon_resume(struct snd_sof_dev *sdev) /* set internal flag for BE */ list_for_each_entry(s, &bus->stream_list, list) { - stream = stream_to_hdac_ext_stream(s); + hext_stream = stream_to_hdac_ext_stream(s); /* * clear stream. This should already be taken care for running @@ -920,20 +920,20 @@ int hda_dsp_set_hw_params_upon_resume(struct snd_sof_dev *sdev) * streams do not get suspended, so this needs to be done * explicitly during suspend. */ - if (stream->link_substream) { - rtd = asoc_substream_to_rtd(stream->link_substream); + if (hext_stream->link_substream) { + rtd = asoc_substream_to_rtd(hext_stream->link_substream); name = asoc_rtd_to_codec(rtd, 0)->component->name; link = snd_hdac_ext_bus_get_link(bus, name); if (!link) return -EINVAL; - stream->link_prepared = 0; + hext_stream->link_prepared = 0; - if (hdac_stream(stream)->direction == + if (hdac_stream(hext_stream)->direction == SNDRV_PCM_STREAM_CAPTURE) continue; - stream_tag = hdac_stream(stream)->stream_tag; + stream_tag = hdac_stream(hext_stream)->stream_tag; snd_hdac_ext_link_clear_stream_id(link, stream_tag); } } diff --git a/sound/soc/sof/intel/hda-ipc.c b/sound/soc/sof/intel/hda-ipc.c index f0cf8019d72d..a8c452144168 100644 --- a/sound/soc/sof/intel/hda-ipc.c +++ b/sound/soc/sof/intel/hda-ipc.c @@ -255,13 +255,13 @@ int hda_ipc_msg_data(struct snd_sof_dev *sdev, hda_stream = container_of(hstream, struct sof_intel_hda_stream, - hda_stream.hstream); + hext_stream.hstream); /* The stream might already be closed */ if (!hstream) return -ESTRPIPE; - sof_mailbox_read(sdev, hda_stream->stream.posn_offset, p, sz); + sof_mailbox_read(sdev, hda_stream->sof_intel_stream.posn_offset, p, sz); } return 0; @@ -277,17 +277,17 @@ int hda_ipc_pcm_params(struct snd_sof_dev *sdev, size_t posn_offset = reply->posn_offset; hda_stream = container_of(hstream, struct sof_intel_hda_stream, - hda_stream.hstream); + hext_stream.hstream); /* check for unaligned offset or overflow */ if (posn_offset > sdev->stream_box.size || posn_offset % sizeof(struct sof_ipc_stream_posn) != 0) return -EINVAL; - hda_stream->stream.posn_offset = sdev->stream_box.offset + posn_offset; + hda_stream->sof_intel_stream.posn_offset = sdev->stream_box.offset + posn_offset; dev_dbg(sdev->dev, "pcm: stream dir %d, posn mailbox offset is %zu", - substream->stream, hda_stream->stream.posn_offset); + substream->stream, hda_stream->sof_intel_stream.posn_offset); return 0; } diff --git a/sound/soc/sof/intel/hda-loader.c b/sound/soc/sof/intel/hda-loader.c index 6af3325b7e40..3c0d7cbdf174 100644 --- a/sound/soc/sof/intel/hda-loader.c +++ b/sound/soc/sof/intel/hda-loader.c @@ -47,18 +47,18 @@ static struct hdac_ext_stream *cl_stream_prepare(struct snd_sof_dev *sdev, unsig unsigned int size, struct snd_dma_buffer *dmab, int direction) { - struct hdac_ext_stream *dsp_stream; + struct hdac_ext_stream *hext_stream; struct hdac_stream *hstream; struct pci_dev *pci = to_pci_dev(sdev->dev); int ret; - dsp_stream = hda_dsp_stream_get(sdev, direction, 0); + hext_stream = hda_dsp_stream_get(sdev, direction, 0); - if (!dsp_stream) { + if (!hext_stream) { dev_err(sdev->dev, "error: no stream available\n"); return ERR_PTR(-ENODEV); } - hstream = &dsp_stream->hstream; + hstream = &hext_stream->hstream; hstream->substream = NULL; /* allocate DMA buffer */ @@ -73,21 +73,21 @@ static struct hdac_ext_stream *cl_stream_prepare(struct snd_sof_dev *sdev, unsig hstream->bufsize = size; if (direction == SNDRV_PCM_STREAM_CAPTURE) { - ret = hda_dsp_iccmax_stream_hw_params(sdev, dsp_stream, dmab, NULL); + ret = hda_dsp_iccmax_stream_hw_params(sdev, hext_stream, dmab, NULL); if (ret < 0) { dev_err(sdev->dev, "error: iccmax stream prepare failed: %d\n", ret); goto error; } } else { - ret = hda_dsp_stream_hw_params(sdev, dsp_stream, dmab, NULL); + ret = hda_dsp_stream_hw_params(sdev, hext_stream, dmab, NULL); if (ret < 0) { dev_err(sdev->dev, "error: hdac prepare failed: %d\n", ret); goto error; } - hda_dsp_stream_spib_config(sdev, dsp_stream, HDA_DSP_SPIB_ENABLE, size); + hda_dsp_stream_spib_config(sdev, hext_stream, HDA_DSP_SPIB_ENABLE, size); } - return dsp_stream; + return hext_stream; error: hda_dsp_stream_put(sdev, direction, hstream->stream_tag); @@ -209,9 +209,9 @@ static int cl_dsp_init(struct snd_sof_dev *sdev, int stream_tag) } static int cl_trigger(struct snd_sof_dev *sdev, - struct hdac_ext_stream *stream, int cmd) + struct hdac_ext_stream *hext_stream, int cmd) { - struct hdac_stream *hstream = &stream->hstream; + struct hdac_stream *hstream = &hext_stream->hstream; int sd_offset = SOF_STREAM_SD_OFFSET(hstream); /* code loader is special case that reuses stream ops */ @@ -231,19 +231,19 @@ static int cl_trigger(struct snd_sof_dev *sdev, hstream->running = true; return 0; default: - return hda_dsp_stream_trigger(sdev, stream, cmd); + return hda_dsp_stream_trigger(sdev, hext_stream, cmd); } } static int cl_cleanup(struct snd_sof_dev *sdev, struct snd_dma_buffer *dmab, - struct hdac_ext_stream *stream) + struct hdac_ext_stream *hext_stream) { - struct hdac_stream *hstream = &stream->hstream; + struct hdac_stream *hstream = &hext_stream->hstream; int sd_offset = SOF_STREAM_SD_OFFSET(hstream); int ret = 0; if (hstream->direction == SNDRV_PCM_STREAM_PLAYBACK) - ret = hda_dsp_stream_spib_config(sdev, stream, HDA_DSP_SPIB_DISABLE, 0); + ret = hda_dsp_stream_spib_config(sdev, hext_stream, HDA_DSP_SPIB_DISABLE, 0); else snd_sof_dsp_update_bits(sdev, HDA_DSP_HDA_BAR, sd_offset, SOF_HDA_SD_CTL_DMA_START, 0); @@ -267,12 +267,12 @@ static int cl_cleanup(struct snd_sof_dev *sdev, struct snd_dma_buffer *dmab, return ret; } -static int cl_copy_fw(struct snd_sof_dev *sdev, struct hdac_ext_stream *stream) +static int cl_copy_fw(struct snd_sof_dev *sdev, struct hdac_ext_stream *hext_stream) { unsigned int reg; int ret, status; - ret = cl_trigger(sdev, stream, SNDRV_PCM_TRIGGER_START); + ret = cl_trigger(sdev, hext_stream, SNDRV_PCM_TRIGGER_START); if (ret < 0) { dev_err(sdev->dev, "error: DMA trigger start failed\n"); return ret; @@ -296,7 +296,7 @@ static int cl_copy_fw(struct snd_sof_dev *sdev, struct hdac_ext_stream *stream) __func__); } - ret = cl_trigger(sdev, stream, SNDRV_PCM_TRIGGER_STOP); + ret = cl_trigger(sdev, hext_stream, SNDRV_PCM_TRIGGER_STOP); if (ret < 0) { dev_err(sdev->dev, "error: DMA trigger stop failed\n"); if (!status) @@ -392,7 +392,7 @@ int hda_dsp_cl_boot_firmware(struct snd_sof_dev *sdev) struct snd_sof_pdata *plat_data = sdev->pdata; const struct sof_dev_desc *desc = plat_data->desc; const struct sof_intel_dsp_desc *chip_info; - struct hdac_ext_stream *stream; + struct hdac_ext_stream *hext_stream; struct firmware stripped_firmware; int ret, ret1, i; @@ -417,11 +417,11 @@ int hda_dsp_cl_boot_firmware(struct snd_sof_dev *sdev) init_waitqueue_head(&sdev->boot_wait); /* prepare DMA for code loader stream */ - stream = cl_stream_prepare(sdev, HDA_CL_STREAM_FORMAT, stripped_firmware.size, - &sdev->dmab, SNDRV_PCM_STREAM_PLAYBACK); - if (IS_ERR(stream)) { + hext_stream = cl_stream_prepare(sdev, HDA_CL_STREAM_FORMAT, stripped_firmware.size, + &sdev->dmab, SNDRV_PCM_STREAM_PLAYBACK); + if (IS_ERR(hext_stream)) { dev_err(sdev->dev, "error: dma prepare for fw loading failed\n"); - return PTR_ERR(stream); + return PTR_ERR(hext_stream); } memcpy(sdev->dmab.area, stripped_firmware.data, @@ -433,7 +433,7 @@ int hda_dsp_cl_boot_firmware(struct snd_sof_dev *sdev) "Attempting iteration %d of Core En/ROM load...\n", i); hda->boot_iteration = i + 1; - ret = cl_dsp_init(sdev, stream->hstream.stream_tag); + ret = cl_dsp_init(sdev, hext_stream->hstream.stream_tag); /* don't retry anymore if successful */ if (!ret) @@ -472,7 +472,7 @@ int hda_dsp_cl_boot_firmware(struct snd_sof_dev *sdev) * Continue with code loading and firmware boot */ hda->boot_iteration = HDA_FW_BOOT_ATTEMPTS; - ret = cl_copy_fw(sdev, stream); + ret = cl_copy_fw(sdev, hext_stream); if (!ret) dev_dbg(sdev->dev, "Firmware download successful, booting...\n"); else @@ -485,7 +485,7 @@ int hda_dsp_cl_boot_firmware(struct snd_sof_dev *sdev) * This should be done even if firmware loading fails. * If the cleanup also fails, we return the initial error */ - ret1 = cl_cleanup(sdev, &sdev->dmab, stream); + ret1 = cl_cleanup(sdev, &sdev->dmab, hext_stream); if (ret1 < 0) { dev_err(sdev->dev, "error: Code loader DSP cleanup failed\n"); diff --git a/sound/soc/sof/intel/hda-pcm.c b/sound/soc/sof/intel/hda-pcm.c index d78aa5d8552d..eec83ca557a1 100644 --- a/sound/soc/sof/intel/hda-pcm.c +++ b/sound/soc/sof/intel/hda-pcm.c @@ -96,7 +96,7 @@ int hda_dsp_pcm_hw_params(struct snd_sof_dev *sdev, struct sof_ipc_stream_params *ipc_params) { struct hdac_stream *hstream = substream->runtime->private_data; - struct hdac_ext_stream *stream = stream_to_hdac_ext_stream(hstream); + struct hdac_ext_stream *hext_stream = stream_to_hdac_ext_stream(hstream); struct sof_intel_hda_dev *hda = sdev->pdata->hw_pdata; struct snd_dma_buffer *dmab; struct sof_ipc_fw_version *v = &sdev->fw_ready.version; @@ -118,7 +118,7 @@ int hda_dsp_pcm_hw_params(struct snd_sof_dev *sdev, (params->info & SNDRV_PCM_INFO_NO_PERIOD_WAKEUP) && (params->flags & SNDRV_PCM_HW_PARAMS_NO_PERIOD_WAKEUP); - ret = hda_dsp_stream_hw_params(sdev, stream, dmab, params); + ret = hda_dsp_stream_hw_params(sdev, hext_stream, dmab, params); if (ret < 0) { dev_err(sdev->dev, "error: hdac prepare failed: %d\n", ret); return ret; @@ -126,9 +126,9 @@ int hda_dsp_pcm_hw_params(struct snd_sof_dev *sdev, /* enable SPIB when rewinds are disabled */ if (hda_disable_rewinds) - hda_dsp_stream_spib_config(sdev, stream, HDA_DSP_SPIB_ENABLE, 0); + hda_dsp_stream_spib_config(sdev, hext_stream, HDA_DSP_SPIB_ENABLE, 0); else - hda_dsp_stream_spib_config(sdev, stream, HDA_DSP_SPIB_DISABLE, 0); + hda_dsp_stream_spib_config(sdev, hext_stream, HDA_DSP_SPIB_DISABLE, 0); /* update no_stream_position flag for ipc params */ if (hda && hda->no_ipc_position) { @@ -174,9 +174,9 @@ int hda_dsp_pcm_trigger(struct snd_sof_dev *sdev, struct snd_pcm_substream *substream, int cmd) { struct hdac_stream *hstream = substream->runtime->private_data; - struct hdac_ext_stream *stream = stream_to_hdac_ext_stream(hstream); + struct hdac_ext_stream *hext_stream = stream_to_hdac_ext_stream(hstream); - return hda_dsp_stream_trigger(sdev, stream, cmd); + return hda_dsp_stream_trigger(sdev, hext_stream, cmd); } snd_pcm_uframes_t hda_dsp_pcm_pointer(struct snd_sof_dev *sdev, diff --git a/sound/soc/sof/intel/hda-probes.c b/sound/soc/sof/intel/hda-probes.c index fe2f3f7d236b..35e548da3609 100644 --- a/sound/soc/sof/intel/hda-probes.c +++ b/sound/soc/sof/intel/hda-probes.c @@ -23,34 +23,34 @@ int hda_probe_compr_assign(struct snd_sof_dev *sdev, struct snd_compr_stream *cstream, struct snd_soc_dai *dai) { - struct hdac_ext_stream *stream; + struct hdac_ext_stream *hext_stream; - stream = hda_dsp_stream_get(sdev, cstream->direction, 0); - if (!stream) + hext_stream = hda_dsp_stream_get(sdev, cstream->direction, 0); + if (!hext_stream) return -EBUSY; - hdac_stream(stream)->curr_pos = 0; - hdac_stream(stream)->cstream = cstream; - cstream->runtime->private_data = stream; + hdac_stream(hext_stream)->curr_pos = 0; + hdac_stream(hext_stream)->cstream = cstream; + cstream->runtime->private_data = hext_stream; - return hdac_stream(stream)->stream_tag; + return hdac_stream(hext_stream)->stream_tag; } int hda_probe_compr_free(struct snd_sof_dev *sdev, struct snd_compr_stream *cstream, struct snd_soc_dai *dai) { - struct hdac_ext_stream *stream = hda_compr_get_stream(cstream); + struct hdac_ext_stream *hext_stream = hda_compr_get_stream(cstream); int ret; ret = hda_dsp_stream_put(sdev, cstream->direction, - hdac_stream(stream)->stream_tag); + hdac_stream(hext_stream)->stream_tag); if (ret < 0) { dev_dbg(sdev->dev, "stream put failed: %d\n", ret); return ret; } - hdac_stream(stream)->cstream = NULL; + hdac_stream(hext_stream)->cstream = NULL; cstream->runtime->private_data = NULL; return 0; @@ -61,8 +61,8 @@ int hda_probe_compr_set_params(struct snd_sof_dev *sdev, struct snd_compr_params *params, struct snd_soc_dai *dai) { - struct hdac_ext_stream *stream = hda_compr_get_stream(cstream); - struct hdac_stream *hstream = hdac_stream(stream); + struct hdac_ext_stream *hext_stream = hda_compr_get_stream(cstream); + struct hdac_stream *hstream = hdac_stream(hext_stream); struct snd_dma_buffer *dmab; u32 bits, rate; int bps, ret; @@ -80,7 +80,7 @@ int hda_probe_compr_set_params(struct snd_sof_dev *sdev, hstream->period_bytes = cstream->runtime->fragment_size; hstream->no_period_wakeup = 0; - ret = hda_dsp_stream_hw_params(sdev, stream, dmab, NULL); + ret = hda_dsp_stream_hw_params(sdev, hext_stream, dmab, NULL); if (ret < 0) { dev_err(sdev->dev, "error: hdac prepare failed: %d\n", ret); return ret; @@ -93,9 +93,9 @@ int hda_probe_compr_trigger(struct snd_sof_dev *sdev, struct snd_compr_stream *cstream, int cmd, struct snd_soc_dai *dai) { - struct hdac_ext_stream *stream = hda_compr_get_stream(cstream); + struct hdac_ext_stream *hext_stream = hda_compr_get_stream(cstream); - return hda_dsp_stream_trigger(sdev, stream, cmd); + return hda_dsp_stream_trigger(sdev, hext_stream, cmd); } int hda_probe_compr_pointer(struct snd_sof_dev *sdev, @@ -103,11 +103,11 @@ int hda_probe_compr_pointer(struct snd_sof_dev *sdev, struct snd_compr_tstamp *tstamp, struct snd_soc_dai *dai) { - struct hdac_ext_stream *stream = hda_compr_get_stream(cstream); + struct hdac_ext_stream *hext_stream = hda_compr_get_stream(cstream); struct snd_soc_pcm_stream *pstream; pstream = &dai->driver->capture; - tstamp->copied_total = hdac_stream(stream)->curr_pos; + tstamp->copied_total = hdac_stream(hext_stream)->curr_pos; tstamp->sampling_rate = snd_pcm_rate_bit_to_rate(pstream->rates); return 0; diff --git a/sound/soc/sof/intel/hda-stream.c b/sound/soc/sof/intel/hda-stream.c index ba60807fbd8f..daeb64c495e4 100644 --- a/sound/soc/sof/intel/hda-stream.c +++ b/sound/soc/sof/intel/hda-stream.c @@ -57,7 +57,7 @@ static char *hda_hstream_dbg_get_stream_info_str(struct hdac_stream *hstream) */ static int hda_setup_bdle(struct snd_sof_dev *sdev, struct snd_dma_buffer *dmab, - struct hdac_stream *stream, + struct hdac_stream *hstream, struct sof_intel_dsp_bdl **bdlp, int offset, int size, int ioc) { @@ -68,7 +68,7 @@ static int hda_setup_bdle(struct snd_sof_dev *sdev, dma_addr_t addr; int chunk; - if (stream->frags >= HDA_DSP_MAX_BDL_ENTRIES) { + if (hstream->frags >= HDA_DSP_MAX_BDL_ENTRIES) { dev_err(sdev->dev, "error: stream frags exceeded\n"); return -EINVAL; } @@ -91,11 +91,11 @@ static int hda_setup_bdle(struct snd_sof_dev *sdev, size -= chunk; bdl->ioc = (size || !ioc) ? 0 : cpu_to_le32(0x01); bdl++; - stream->frags++; + hstream->frags++; offset += chunk; dev_vdbg(sdev->dev, "bdl, frags:%d, chunk size:0x%x;\n", - stream->frags, chunk); + hstream->frags, chunk); } *bdlp = bdl; @@ -108,47 +108,47 @@ static int hda_setup_bdle(struct snd_sof_dev *sdev, */ int hda_dsp_stream_setup_bdl(struct snd_sof_dev *sdev, struct snd_dma_buffer *dmab, - struct hdac_stream *stream) + struct hdac_stream *hstream) { struct sof_intel_hda_dev *hda = sdev->pdata->hw_pdata; struct sof_intel_dsp_bdl *bdl; int i, offset, period_bytes, periods; int remain, ioc; - period_bytes = stream->period_bytes; + period_bytes = hstream->period_bytes; dev_dbg(sdev->dev, "%s: period_bytes:0x%x\n", __func__, period_bytes); if (!period_bytes) - period_bytes = stream->bufsize; + period_bytes = hstream->bufsize; - periods = stream->bufsize / period_bytes; + periods = hstream->bufsize / period_bytes; dev_dbg(sdev->dev, "%s: periods:%d\n", __func__, periods); - remain = stream->bufsize % period_bytes; + remain = hstream->bufsize % period_bytes; if (remain) periods++; /* program the initial BDL entries */ - bdl = (struct sof_intel_dsp_bdl *)stream->bdl.area; + bdl = (struct sof_intel_dsp_bdl *)hstream->bdl.area; offset = 0; - stream->frags = 0; + hstream->frags = 0; /* * set IOC if don't use position IPC * and period_wakeup needed. */ ioc = hda->no_ipc_position ? - !stream->no_period_wakeup : 0; + !hstream->no_period_wakeup : 0; for (i = 0; i < periods; i++) { if (i == (periods - 1) && remain) /* set the last small entry */ offset = hda_setup_bdle(sdev, dmab, - stream, &bdl, offset, + hstream, &bdl, offset, remain, 0); else offset = hda_setup_bdle(sdev, dmab, - stream, &bdl, offset, + hstream, &bdl, offset, period_bytes, ioc); } @@ -156,10 +156,10 @@ int hda_dsp_stream_setup_bdl(struct snd_sof_dev *sdev, } int hda_dsp_stream_spib_config(struct snd_sof_dev *sdev, - struct hdac_ext_stream *stream, + struct hdac_ext_stream *hext_stream, int enable, u32 size) { - struct hdac_stream *hstream = &stream->hstream; + struct hdac_stream *hstream = &hext_stream->hstream; u32 mask; if (!sdev->bar[HDA_DSP_SPIB_BAR]) { @@ -175,7 +175,7 @@ int hda_dsp_stream_spib_config(struct snd_sof_dev *sdev, enable << hstream->index); /* set the SPIB value */ - sof_io_write(sdev, stream->spib_addr, size); + sof_io_write(sdev, hext_stream->spib_addr, size); return 0; } @@ -186,7 +186,7 @@ hda_dsp_stream_get(struct snd_sof_dev *sdev, int direction, u32 flags) { struct hdac_bus *bus = sof_to_bus(sdev); struct sof_intel_hda_stream *hda_stream; - struct hdac_ext_stream *stream = NULL; + struct hdac_ext_stream *hext_stream = NULL; struct hdac_stream *s; spin_lock_irq(&bus->reg_lock); @@ -194,10 +194,10 @@ hda_dsp_stream_get(struct snd_sof_dev *sdev, int direction, u32 flags) /* get an unused stream */ list_for_each_entry(s, &bus->stream_list, list) { if (s->direction == direction && !s->opened) { - stream = stream_to_hdac_ext_stream(s); - hda_stream = container_of(stream, + hext_stream = stream_to_hdac_ext_stream(s); + hda_stream = container_of(hext_stream, struct sof_intel_hda_stream, - hda_stream); + hext_stream); /* check if the host DMA channel is reserved */ if (hda_stream->host_reserved) continue; @@ -210,11 +210,11 @@ hda_dsp_stream_get(struct snd_sof_dev *sdev, int direction, u32 flags) spin_unlock_irq(&bus->reg_lock); /* stream found ? */ - if (!stream) { + if (!hext_stream) { dev_err(sdev->dev, "error: no free %s streams\n", direction == SNDRV_PCM_STREAM_PLAYBACK ? "playback" : "capture"); - return stream; + return hext_stream; } hda_stream->flags = flags; @@ -229,7 +229,7 @@ hda_dsp_stream_get(struct snd_sof_dev *sdev, int direction, u32 flags) HDA_VS_INTEL_EM2, HDA_VS_INTEL_EM2_L1SEN, 0); - return stream; + return hext_stream; } /* free a stream */ @@ -237,7 +237,7 @@ int hda_dsp_stream_put(struct snd_sof_dev *sdev, int direction, int stream_tag) { struct hdac_bus *bus = sof_to_bus(sdev); struct sof_intel_hda_stream *hda_stream; - struct hdac_ext_stream *stream; + struct hdac_ext_stream *hext_stream; struct hdac_stream *s; bool dmi_l1_enable = true; bool found = false; @@ -249,8 +249,8 @@ int hda_dsp_stream_put(struct snd_sof_dev *sdev, int direction, int stream_tag) * that are DMI L1 incompatible. */ list_for_each_entry(s, &bus->stream_list, list) { - stream = stream_to_hdac_ext_stream(s); - hda_stream = container_of(stream, struct sof_intel_hda_stream, hda_stream); + hext_stream = stream_to_hdac_ext_stream(s); + hda_stream = container_of(hext_stream, struct sof_intel_hda_stream, hext_stream); if (!s->opened) continue; @@ -319,9 +319,9 @@ static int hda_dsp_stream_reset(struct snd_sof_dev *sdev, struct hdac_stream *hs } int hda_dsp_stream_trigger(struct snd_sof_dev *sdev, - struct hdac_ext_stream *stream, int cmd) + struct hdac_ext_stream *hext_stream, int cmd) { - struct hdac_stream *hstream = &stream->hstream; + struct hdac_stream *hstream = &hext_stream->hstream; int sd_offset = SOF_STREAM_SD_OFFSET(hstream); u32 dma_start = SOF_HDA_SD_CTL_DMA_START; int ret = 0; @@ -396,17 +396,17 @@ int hda_dsp_stream_trigger(struct snd_sof_dev *sdev, } /* minimal recommended programming for ICCMAX stream */ -int hda_dsp_iccmax_stream_hw_params(struct snd_sof_dev *sdev, struct hdac_ext_stream *stream, +int hda_dsp_iccmax_stream_hw_params(struct snd_sof_dev *sdev, struct hdac_ext_stream *hext_stream, struct snd_dma_buffer *dmab, struct snd_pcm_hw_params *params) { struct hdac_bus *bus = sof_to_bus(sdev); - struct hdac_stream *hstream = &stream->hstream; + struct hdac_stream *hstream = &hext_stream->hstream; int sd_offset = SOF_STREAM_SD_OFFSET(hstream); int ret; u32 mask = 0x1 << hstream->index; - if (!stream) { + if (!hext_stream) { dev_err(sdev->dev, "error: no stream available\n"); return -ENODEV; } @@ -467,20 +467,20 @@ int hda_dsp_iccmax_stream_hw_params(struct snd_sof_dev *sdev, struct hdac_ext_st * and normal stream. */ int hda_dsp_stream_hw_params(struct snd_sof_dev *sdev, - struct hdac_ext_stream *stream, + struct hdac_ext_stream *hext_stream, struct snd_dma_buffer *dmab, struct snd_pcm_hw_params *params) { const struct sof_intel_dsp_desc *chip = get_chip_info(sdev->pdata); struct hdac_bus *bus = sof_to_bus(sdev); - struct hdac_stream *hstream = &stream->hstream; + struct hdac_stream *hstream = &hext_stream->hstream; int sd_offset = SOF_STREAM_SD_OFFSET(hstream); int ret; u32 dma_start = SOF_HDA_SD_CTL_DMA_START; u32 mask; u32 run; - if (!stream) { + if (!hext_stream) { dev_err(sdev->dev, "error: no stream available\n"); return -ENODEV; } @@ -659,28 +659,28 @@ int hda_dsp_stream_hw_params(struct snd_sof_dev *sdev, int hda_dsp_stream_hw_free(struct snd_sof_dev *sdev, struct snd_pcm_substream *substream) { - struct hdac_stream *stream = substream->runtime->private_data; - struct hdac_ext_stream *link_dev = container_of(stream, - struct hdac_ext_stream, - hstream); + struct hdac_stream *hstream = substream->runtime->private_data; + struct hdac_ext_stream *hext_stream = container_of(hstream, + struct hdac_ext_stream, + hstream); struct hdac_bus *bus = sof_to_bus(sdev); - u32 mask = 0x1 << stream->index; + u32 mask = 0x1 << hstream->index; int ret; - ret = hda_dsp_stream_reset(sdev, stream); + ret = hda_dsp_stream_reset(sdev, hstream); if (ret < 0) return ret; spin_lock_irq(&bus->reg_lock); /* couple host and link DMA if link DMA channel is idle */ - if (!link_dev->link_locked) + if (!hext_stream->link_locked) snd_sof_dsp_update_bits(sdev, HDA_DSP_PP_BAR, SOF_HDA_REG_PP_PPCTL, mask, 0); spin_unlock_irq(&bus->reg_lock); - hda_dsp_stream_spib_config(sdev, link_dev, HDA_DSP_SPIB_DISABLE, 0); + hda_dsp_stream_spib_config(sdev, hext_stream, HDA_DSP_SPIB_DISABLE, 0); - stream->substream = NULL; + hstream->substream = NULL; return 0; } @@ -808,7 +808,7 @@ irqreturn_t hda_dsp_stream_threaded_handler(int irq, void *context) int hda_dsp_stream_init(struct snd_sof_dev *sdev) { struct hdac_bus *bus = sof_to_bus(sdev); - struct hdac_ext_stream *stream; + struct hdac_ext_stream *hext_stream; struct hdac_stream *hstream; struct pci_dev *pci = to_pci_dev(sdev->dev); struct sof_intel_hda_dev *sof_hda = bus_to_sof_hda(bus); @@ -872,27 +872,27 @@ int hda_dsp_stream_init(struct snd_sof_dev *sdev) hda_stream->sdev = sdev; - stream = &hda_stream->hda_stream; + hext_stream = &hda_stream->hext_stream; - stream->pphc_addr = sdev->bar[HDA_DSP_PP_BAR] + + hext_stream->pphc_addr = sdev->bar[HDA_DSP_PP_BAR] + SOF_HDA_PPHC_BASE + SOF_HDA_PPHC_INTERVAL * i; - stream->pplc_addr = sdev->bar[HDA_DSP_PP_BAR] + + hext_stream->pplc_addr = sdev->bar[HDA_DSP_PP_BAR] + SOF_HDA_PPLC_BASE + SOF_HDA_PPLC_MULTI * num_total + SOF_HDA_PPLC_INTERVAL * i; /* do we support SPIB */ if (sdev->bar[HDA_DSP_SPIB_BAR]) { - stream->spib_addr = sdev->bar[HDA_DSP_SPIB_BAR] + + hext_stream->spib_addr = sdev->bar[HDA_DSP_SPIB_BAR] + SOF_HDA_SPIB_BASE + SOF_HDA_SPIB_INTERVAL * i + SOF_HDA_SPIB_SPIB; - stream->fifo_addr = sdev->bar[HDA_DSP_SPIB_BAR] + + hext_stream->fifo_addr = sdev->bar[HDA_DSP_SPIB_BAR] + SOF_HDA_SPIB_BASE + SOF_HDA_SPIB_INTERVAL * i + SOF_HDA_SPIB_MAXFIFO; } - hstream = &stream->hstream; + hstream = &hext_stream->hstream; hstream->bus = bus; hstream->sd_int_sta_mask = 1 << i; hstream->index = i; @@ -927,28 +927,28 @@ int hda_dsp_stream_init(struct snd_sof_dev *sdev) hda_stream->sdev = sdev; - stream = &hda_stream->hda_stream; + hext_stream = &hda_stream->hext_stream; /* we always have DSP support */ - stream->pphc_addr = sdev->bar[HDA_DSP_PP_BAR] + + hext_stream->pphc_addr = sdev->bar[HDA_DSP_PP_BAR] + SOF_HDA_PPHC_BASE + SOF_HDA_PPHC_INTERVAL * i; - stream->pplc_addr = sdev->bar[HDA_DSP_PP_BAR] + + hext_stream->pplc_addr = sdev->bar[HDA_DSP_PP_BAR] + SOF_HDA_PPLC_BASE + SOF_HDA_PPLC_MULTI * num_total + SOF_HDA_PPLC_INTERVAL * i; /* do we support SPIB */ if (sdev->bar[HDA_DSP_SPIB_BAR]) { - stream->spib_addr = sdev->bar[HDA_DSP_SPIB_BAR] + + hext_stream->spib_addr = sdev->bar[HDA_DSP_SPIB_BAR] + SOF_HDA_SPIB_BASE + SOF_HDA_SPIB_INTERVAL * i + SOF_HDA_SPIB_SPIB; - stream->fifo_addr = sdev->bar[HDA_DSP_SPIB_BAR] + + hext_stream->fifo_addr = sdev->bar[HDA_DSP_SPIB_BAR] + SOF_HDA_SPIB_BASE + SOF_HDA_SPIB_INTERVAL * i + SOF_HDA_SPIB_MAXFIFO; } - hstream = &stream->hstream; + hstream = &hext_stream->hstream; hstream->bus = bus; hstream->sd_int_sta_mask = 1 << i; hstream->index = i; @@ -983,7 +983,7 @@ void hda_dsp_stream_free(struct snd_sof_dev *sdev) { struct hdac_bus *bus = sof_to_bus(sdev); struct hdac_stream *s, *_s; - struct hdac_ext_stream *stream; + struct hdac_ext_stream *hext_stream; struct sof_intel_hda_stream *hda_stream; /* free position buffer */ @@ -1003,9 +1003,9 @@ void hda_dsp_stream_free(struct snd_sof_dev *sdev) if (s->bdl.area) snd_dma_free_pages(&s->bdl); list_del(&s->list); - stream = stream_to_hdac_ext_stream(s); - hda_stream = container_of(stream, struct sof_intel_hda_stream, - hda_stream); + hext_stream = stream_to_hdac_ext_stream(s); + hda_stream = container_of(hext_stream, struct sof_intel_hda_stream, + hext_stream); devm_kfree(sdev->dev, hda_stream); } } diff --git a/sound/soc/sof/intel/hda-trace.c b/sound/soc/sof/intel/hda-trace.c index 1791ec045a54..755ef1d835e0 100644 --- a/sound/soc/sof/intel/hda-trace.c +++ b/sound/soc/sof/intel/hda-trace.c @@ -22,14 +22,14 @@ static int hda_dsp_trace_prepare(struct snd_sof_dev *sdev, struct snd_dma_buffer *dmab) { struct sof_intel_hda_dev *hda = sdev->pdata->hw_pdata; - struct hdac_ext_stream *stream = hda->dtrace_stream; - struct hdac_stream *hstream = &stream->hstream; + struct hdac_ext_stream *hext_stream = hda->dtrace_stream; + struct hdac_stream *hstream = &hext_stream->hstream; int ret; hstream->period_bytes = 0;/* initialize period_bytes */ hstream->bufsize = dmab->bytes; - ret = hda_dsp_stream_hw_params(sdev, stream, dmab, NULL); + ret = hda_dsp_stream_hw_params(sdev, hext_stream, dmab, NULL); if (ret < 0) dev_err(sdev->dev, "error: hdac prepare failed: %d\n", ret); diff --git a/sound/soc/sof/intel/hda.h b/sound/soc/sof/intel/hda.h index 2390561906dd..324418582044 100644 --- a/sound/soc/sof/intel/hda.h +++ b/sound/soc/sof/intel/hda.h @@ -471,14 +471,14 @@ static inline struct hda_bus *sof_to_hbus(struct snd_sof_dev *s) struct sof_intel_hda_stream { struct snd_sof_dev *sdev; - struct hdac_ext_stream hda_stream; - struct sof_intel_stream stream; + struct hdac_ext_stream hext_stream; + struct sof_intel_stream sof_intel_stream; int host_reserved; /* reserve host DMA channel */ u32 flags; }; #define hstream_to_sof_hda_stream(hstream) \ - container_of(hstream, struct sof_intel_hda_stream, hda_stream) + container_of(hstream, struct sof_intel_hda_stream, hext_stream) #define bus_to_sof_hda(bus) \ container_of(bus, struct sof_intel_hda_dev, hbus.core) @@ -545,18 +545,19 @@ int hda_dsp_pcm_ack(struct snd_sof_dev *sdev, struct snd_pcm_substream *substrea int hda_dsp_stream_init(struct snd_sof_dev *sdev); void hda_dsp_stream_free(struct snd_sof_dev *sdev); int hda_dsp_stream_hw_params(struct snd_sof_dev *sdev, - struct hdac_ext_stream *stream, + struct hdac_ext_stream *hext_stream, struct snd_dma_buffer *dmab, struct snd_pcm_hw_params *params); -int hda_dsp_iccmax_stream_hw_params(struct snd_sof_dev *sdev, struct hdac_ext_stream *stream, +int hda_dsp_iccmax_stream_hw_params(struct snd_sof_dev *sdev, + struct hdac_ext_stream *hext_stream, struct snd_dma_buffer *dmab, struct snd_pcm_hw_params *params); int hda_dsp_stream_trigger(struct snd_sof_dev *sdev, - struct hdac_ext_stream *stream, int cmd); + struct hdac_ext_stream *hext_stream, int cmd); irqreturn_t hda_dsp_stream_threaded_handler(int irq, void *context); int hda_dsp_stream_setup_bdl(struct snd_sof_dev *sdev, struct snd_dma_buffer *dmab, - struct hdac_stream *stream); + struct hdac_stream *hstream); bool hda_dsp_check_ipc_irq(struct snd_sof_dev *sdev); bool hda_dsp_check_stream_irq(struct snd_sof_dev *sdev); @@ -564,7 +565,7 @@ struct hdac_ext_stream * hda_dsp_stream_get(struct snd_sof_dev *sdev, int direction, u32 flags); int hda_dsp_stream_put(struct snd_sof_dev *sdev, int direction, int stream_tag); int hda_dsp_stream_spib_config(struct snd_sof_dev *sdev, - struct hdac_ext_stream *stream, + struct hdac_ext_stream *hext_stream, int enable, u32 size); int hda_ipc_msg_data(struct snd_sof_dev *sdev, -- 2.35.1

2 1

[PATCH] MAINTAINERS: update cros_ec_codec maintainers
by Tzung-Bi Shih 09 Feb '22

09 Feb '22

Updates cros_ec_codec maintainers. Signed-off-by: Tzung-Bi Shih <tzungbi(a)google.com> --- .../devicetree/bindings/sound/google,cros-ec-codec.yaml | 1 + MAINTAINERS | 1 + 2 files changed, 2 insertions(+) diff --git a/Documentation/devicetree/bindings/sound/google,cros-ec-codec.yaml b/Documentation/devicetree/bindings/sound/google,cros-ec-codec.yaml index 77adbebed824..c3e9f3485449 100644 --- a/Documentation/devicetree/bindings/sound/google,cros-ec-codec.yaml +++ b/Documentation/devicetree/bindings/sound/google,cros-ec-codec.yaml @@ -8,6 +8,7 @@ title: Audio codec controlled by ChromeOS EC maintainers: - Cheng-Yi Chiang <cychiang(a)chromium.org> + - Tzung-Bi Shih <tzungbi(a)google.com> description: | Google's ChromeOS EC codec is a digital mic codec provided by the diff --git a/MAINTAINERS b/MAINTAINERS index 568152aa9973..a1f4fd15e770 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -4573,6 +4573,7 @@ F: drivers/platform/chrome/ CHROMEOS EC CODEC DRIVER M: Cheng-Yi Chiang <cychiang(a)chromium.org> +M: Tzung-Bi Shih <tzungbi(a)google.com> R: Guenter Roeck <groeck(a)chromium.org> L: chrome-platform(a)lists.linux.dev S: Maintained -- 2.35.0.263.gb82422642f-goog

4 3

[PATCH] ALSA: hda: Fix driver index handling at re-binding
by Takashi Iwai 09 Feb '22

09 Feb '22

HD-audio driver handles the multiple instances and keeps the static index that is incremented at each probe. This becomes a problem when user tries to re-bind the device via sysfs multiple times; as the device index isn't cleared unlike rmmod case, it points to the next element at re-binding, and eventually later you can't probe any more when it reaches to SNDRV_CARDS_MAX (usually 32). This patch is an attempt to improve the handling at rebinding. Instead of a static device index, now we keep a bitmap and assigns to the first zero bit position. At the driver remove, in return, the bitmap slot is cleared again, so that it'll be available for the next probe. Reported-by: Alexander Sergeyev <sergeev917(a)gmail.com> Signed-off-by: Takashi Iwai <tiwai(a)suse.de> --- sound/pci/hda/hda_intel.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c index 4b0338c4c543..a2922233e85f 100644 --- a/sound/pci/hda/hda_intel.c +++ b/sound/pci/hda/hda_intel.c @@ -2064,14 +2064,16 @@ static const struct hda_controller_ops pci_hda_ops = { .position_check = azx_position_check, }; +static DECLARE_BITMAP(probed_devs, SNDRV_CARDS); + static int azx_probe(struct pci_dev *pci, const struct pci_device_id *pci_id) { - static int dev; struct snd_card *card; struct hda_intel *hda; struct azx *chip; bool schedule_probe; + int dev; int err; if (pci_match_id(driver_denylist, pci)) { @@ -2079,10 +2081,11 @@ static int azx_probe(struct pci_dev *pci, return -ENODEV; } + dev = find_first_zero_bit(probed_devs, SNDRV_CARDS); if (dev >= SNDRV_CARDS) return -ENODEV; if (!enable[dev]) { - dev++; + set_bit(dev, probed_devs); return -ENOENT; } @@ -2149,7 +2152,7 @@ static int azx_probe(struct pci_dev *pci, if (schedule_probe) schedule_delayed_work(&hda->probe_work, 0); - dev++; + set_bit(dev, probed_devs); if (chip->disabled) complete_all(&hda->probe_wait); return 0; @@ -2372,6 +2375,7 @@ static void azx_remove(struct pci_dev *pci) cancel_delayed_work_sync(&hda->probe_work); device_lock(&pci->dev); + clear_bit(chip->dev_index, probed_devs); pci_set_drvdata(pci, NULL); snd_card_free(card); } -- 2.34.1

1 0

[PATCH v1 0/6] Add Tegra234 HDA support
by Mohan Kumar 09 Feb '22

09 Feb '22

This series add the support for TEGRA234 HDA driver support Mohan Kumar (6): ALSA: hda/tegra: Add Tegra234 hda driver support ALSA: hda/tegra: Hardcode GCAP ISS value on T234 ALSA: hda/tegra: Update scratch reg. communication dt-bindings: Add HDA support for Tegra234 dt-bindings: Document Tegra234 HDA support arm64: tegra: Add hda dts node for Tegra234 .../bindings/sound/nvidia,tegra30-hda.yaml | 3 + .../nvidia/tegra234-p3737-0000+p3701-0000.dts | 6 + arch/arm64/boot/dts/nvidia/tegra234.dtsi | 18 +++ include/dt-bindings/clock/tegra234-clock.h | 4 + include/dt-bindings/memory/tegra234-mc.h | 6 + .../dt-bindings/power/tegra234-powergate.h | 9 ++ include/dt-bindings/reset/tegra234-reset.h | 2 + include/sound/hda_codec.h | 4 + sound/pci/hda/hda_tegra.c | 33 ++++- sound/pci/hda/patch_hdmi.c | 115 ++++++++++++++---- 10 files changed, 176 insertions(+), 24 deletions(-) create mode 100644 include/dt-bindings/power/tegra234-powergate.h -- 2.17.1

2 7

[PATCH 1/4] ALSA: hda/realtek: fix mute/micmute LEDs for HP 855 G8
by Jeremy Szu 08 Feb '22

08 Feb '22

The HP EliteBook 855 G8 Notebook PC is using ALC285 codec which needs ALC285_FIXUP_HP_MUTE_LED fixup to make it works. After applying the fixup, the mute/micmute LEDs work good. Signed-off-by: Jeremy Szu <jeremy.szu(a)canonical.com> --- sound/pci/hda/patch_realtek.c | 1 + 1 file changed, 1 insertion(+) diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c index 552e2cb73291..9d68f591c6bf 100644 --- a/sound/pci/hda/patch_realtek.c +++ b/sound/pci/hda/patch_realtek.c @@ -8291,6 +8291,7 @@ static const struct snd_pci_quirk alc269_fixup_tbl[] = { SND_PCI_QUIRK(0x103c, 0x87f7, "HP Spectre x360 14", ALC245_FIXUP_HP_X360_AMP), SND_PCI_QUIRK(0x103c, 0x8846, "HP EliteBook 850 G8 Notebook PC", ALC285_FIXUP_HP_GPIO_LED), SND_PCI_QUIRK(0x103c, 0x884c, "HP EliteBook 840 G8 Notebook PC", ALC285_FIXUP_HP_GPIO_LED), + SND_PCI_QUIRK(0x103c, 0x8896, "HP EliteBook 855 G8 Notebook PC", ALC285_FIXUP_HP_MUTE_LED), SND_PCI_QUIRK(0x103c, 0x8898, "HP EliteBook 845 G8 Notebook PC", ALC285_FIXUP_HP_LIMIT_INT_MIC_BOOST), SND_PCI_QUIRK(0x1043, 0x103e, "ASUS X540SA", ALC256_FIXUP_ASUS_MIC), SND_PCI_QUIRK(0x1043, 0x103f, "ASUS TX300", ALC282_FIXUP_ASUS_TX300), -- 2.31.1

3 32

[PATCH] ASoC: fsl_sai: Enable combine mode soft
by Sascha Hauer 08 Feb '22

08 Feb '22

The fsl_sai driver calculates the number of pins used and enables multiple channels if necessary. This means the SAI expects data in one FIFO per pin. The SDMA engine only services a single FIFO, so multi pin support doesn't work at all. This patch enables the software combine mode in chips that support it. With this the SAI presents only a single FIFO to the outside and distributes the data into the different FIFOs internally. Signed-off-by: Sascha Hauer <s.hauer(a)pengutronix.de> --- sound/soc/fsl/fsl_sai.c | 9 +++++++++ sound/soc/fsl/fsl_sai.h | 1 + 2 files changed, 10 insertions(+) diff --git a/sound/soc/fsl/fsl_sai.c b/sound/soc/fsl/fsl_sai.c index 10544fa27dc0..cab015d96889 100644 --- a/sound/soc/fsl/fsl_sai.c +++ b/sound/soc/fsl/fsl_sai.c @@ -517,6 +517,10 @@ static int fsl_sai_hw_params(struct snd_pcm_substream *substream, FSL_SAI_CR5_FBT_MASK, val_cr5); } + if (sai->soc_data->pins > 1) + regmap_update_bits(sai->regmap, FSL_SAI_xCR4(tx, ofs), + FSL_SAI_CR4_FCOMB_MASK, FSL_SAI_CR4_FCOMB_SOFT); + regmap_update_bits(sai->regmap, FSL_SAI_xCR3(tx, ofs), FSL_SAI_CR3_TRCE_MASK, FSL_SAI_CR3_TRCE((1 << pins) - 1)); @@ -1195,6 +1199,7 @@ static const struct fsl_sai_soc_data fsl_sai_vf610_data = { .use_imx_pcm = false, .use_edma = false, .fifo_depth = 32, + .pins = 1, .reg_offset = 0, .mclk0_is_mclk1 = false, .flags = 0, @@ -1204,6 +1209,7 @@ static const struct fsl_sai_soc_data fsl_sai_imx6sx_data = { .use_imx_pcm = true, .use_edma = false, .fifo_depth = 32, + .pins = 1, .reg_offset = 0, .mclk0_is_mclk1 = true, .flags = 0, @@ -1213,6 +1219,7 @@ static const struct fsl_sai_soc_data fsl_sai_imx7ulp_data = { .use_imx_pcm = true, .use_edma = false, .fifo_depth = 16, + .pins = 2, .reg_offset = 8, .mclk0_is_mclk1 = false, .flags = PMQOS_CPU_LATENCY, @@ -1222,6 +1229,7 @@ static const struct fsl_sai_soc_data fsl_sai_imx8mq_data = { .use_imx_pcm = true, .use_edma = false, .fifo_depth = 128, + .pins = 8, .reg_offset = 8, .mclk0_is_mclk1 = false, .flags = 0, @@ -1231,6 +1239,7 @@ static const struct fsl_sai_soc_data fsl_sai_imx8qm_data = { .use_imx_pcm = true, .use_edma = true, .fifo_depth = 64, + .pins = 1, .reg_offset = 0, .mclk0_is_mclk1 = false, .flags = 0, diff --git a/sound/soc/fsl/fsl_sai.h b/sound/soc/fsl/fsl_sai.h index 9aaf231bc024..410f6e6a9137 100644 --- a/sound/soc/fsl/fsl_sai.h +++ b/sound/soc/fsl/fsl_sai.h @@ -223,6 +223,7 @@ struct fsl_sai_soc_data { bool use_edma; bool mclk0_is_mclk1; unsigned int fifo_depth; + unsigned int pins; unsigned int reg_offset; unsigned int flags; }; -- 2.30.2

2 2

[PATCH v1 0/6] ASoC: Fix gpiolib dependencies
by Mark Brown 08 Feb '22

08 Feb '22

This series removes a bunch of spurious selects of gpiolib that were causing noise in randconfig build tests. Mark Brown (6): ASoC: dmic: Remove spurious gpiolib select ASoC: rt9120: Remove spurious gpiolib select ASoC: simple-amplifier: Remove spurious gpiolib select ASoC: max9759: Remove spurious gpiolib select ASoC: zl38060: Remove spurious gpiolib select ASoC: simple-mux: Depend on gpiolib rather than selecting it sound/soc/codecs/Kconfig | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) base-commit: e783362eb54cd99b2cac8b3a9aeac942e6f6ac07 -- 2.30.2

1 7

[PATCH v3] ASoC: SOF: compr: Add compress ops implementation
by Daniel Baluta 08 Feb '22

08 Feb '22

From: Daniel Baluta <daniel.baluta(a)nxp.com> Implement snd_compress_ops. There are a lot of similarities with PCM implementation. For now we use sof_ipc_pcm_params to transfer compress parameters to SOF firmware. This will be changed in the future once we either add new compress parameters to SOF or enhance existing sof_ipc_pcm_params structure to support all native compress params. Note that get_caps and get_codec_caps are missing and will be added later. This is because we need to find a way to advertise DSP capabilities depending on supported platforms. Signed-off-by: Daniel Baluta <daniel.baluta(a)nxp.com> --- Changes since v2: - dropped patch 2/2 because deciding on how to support get_caps and get_codec_caps needs some rework. - annotated commit message for 1/2 to mention about get_caps and get_codec_caps Changes since v1: (https://lore.kernel.org/lkml/20220113161341.371345-1-daniel.baluta@oss.nxp.…) - Addressed review from Cezary and Pierre - fixed layout of declaration blocks to be more consistent - avoid using rtd and runtime simultaneously inside a function (always used rtd and crtd) - check return code for create_page_table - completely remove sof_compr_stream and use snd_compr_tstmap instead to keep compress stream related info.· - add get_caps and get_codec_caps implementations (in patch 2)· sound/soc/sof/compress.c | 273 ++++++++++++++++++++++++++++++++++++++- 1 file changed, 271 insertions(+), 2 deletions(-) diff --git a/sound/soc/sof/compress.c b/sound/soc/sof/compress.c index 01ca85f0b87f..91a9c95929cd 100644 --- a/sound/soc/sof/compress.c +++ b/sound/soc/sof/compress.c @@ -10,6 +10,22 @@ #include "sof-audio.h" #include "sof-priv.h" +static void sof_set_transferred_bytes(struct snd_compr_tstamp *tstamp, + u64 host_pos, u64 buffer_size) +{ + u64 prev_pos; + unsigned int copied; + + div64_u64_rem(tstamp->copied_total, buffer_size, &prev_pos); + + if (host_pos < prev_pos) + copied = (buffer_size - prev_pos) + host_pos; + else + copied = host_pos - prev_pos; + + tstamp->copied_total += copied; +} + static void snd_sof_compr_fragment_elapsed_work(struct work_struct *work) { struct snd_sof_pcm_stream *sps = @@ -29,14 +45,16 @@ void snd_sof_compr_init_elapsed_work(struct work_struct *work) */ void snd_sof_compr_fragment_elapsed(struct snd_compr_stream *cstream) { + struct snd_soc_pcm_runtime *rtd = cstream->private_data; + struct snd_compr_runtime *crtd = cstream->runtime; struct snd_soc_component *component; - struct snd_soc_pcm_runtime *rtd; + struct snd_compr_tstamp *tstamp; struct snd_sof_pcm *spcm; if (!cstream) return; - rtd = cstream->private_data; + tstamp = crtd->private_data; component = snd_soc_rtdcom_lookup(rtd, SOF_AUDIO_PCM_DRV_NAME); spcm = snd_sof_find_spcm_dai(component, rtd); @@ -46,6 +64,257 @@ void snd_sof_compr_fragment_elapsed(struct snd_compr_stream *cstream) return; } + sof_set_transferred_bytes(tstamp, spcm->stream[cstream->direction].posn.host_posn, + crtd->buffer_size); + /* use the same workqueue-based solution as for PCM, cf. snd_sof_pcm_elapsed */ schedule_work(&spcm->stream[cstream->direction].period_elapsed_work); } + +static int create_page_table(struct snd_soc_component *component, + struct snd_compr_stream *cstream, + unsigned char *dma_area, size_t size) +{ + struct snd_dma_buffer *dmab = cstream->runtime->dma_buffer_p; + struct snd_soc_pcm_runtime *rtd = cstream->private_data; + int dir = cstream->direction; + struct snd_sof_pcm *spcm; + + spcm = snd_sof_find_spcm_dai(component, rtd); + if (!spcm) + return -EINVAL; + + return snd_sof_create_page_table(component->dev, dmab, + spcm->stream[dir].page_table.area, size); +} + +int sof_compr_open(struct snd_soc_component *component, + struct snd_compr_stream *cstream) +{ + struct snd_soc_pcm_runtime *rtd = cstream->private_data; + struct snd_compr_runtime *crtd = cstream->runtime; + struct snd_compr_tstamp *tstamp; + struct snd_sof_pcm *spcm; + int dir; + + tstamp = kzalloc(sizeof(*tstamp), GFP_KERNEL); + if (!tstamp) + return -ENOMEM; + + spcm = snd_sof_find_spcm_dai(component, rtd); + if (!spcm) { + kfree(tstamp); + return -EINVAL; + } + + dir = cstream->direction; + + if (spcm->stream[dir].cstream) { + kfree(tstamp); + return -EBUSY; + } + + spcm->stream[dir].cstream = cstream; + spcm->stream[dir].posn.host_posn = 0; + spcm->stream[dir].posn.dai_posn = 0; + spcm->prepared[dir] = false; + + crtd->private_data = tstamp; + + return 0; +} + +int sof_compr_free(struct snd_soc_component *component, + struct snd_compr_stream *cstream) +{ + struct snd_sof_dev *sdev = snd_soc_component_get_drvdata(component); + struct snd_compr_tstamp *tstamp = cstream->runtime->private_data; + struct snd_soc_pcm_runtime *rtd = cstream->private_data; + struct sof_ipc_stream stream; + struct sof_ipc_reply reply; + struct snd_sof_pcm *spcm; + int ret = 0; + + spcm = snd_sof_find_spcm_dai(component, rtd); + if (!spcm) + return -EINVAL; + + stream.hdr.size = sizeof(stream); + stream.hdr.cmd = SOF_IPC_GLB_STREAM_MSG | SOF_IPC_STREAM_PCM_FREE; + stream.comp_id = spcm->stream[cstream->direction].comp_id; + + if (spcm->prepared[cstream->direction]) { + ret = sof_ipc_tx_message(sdev->ipc, stream.hdr.cmd, + &stream, sizeof(stream), + &reply, sizeof(reply)); + if (!ret) + spcm->prepared[cstream->direction] = false; + } + + cancel_work_sync(&spcm->stream[cstream->direction].period_elapsed_work); + spcm->stream[cstream->direction].cstream = NULL; + kfree(tstamp); + + return ret; +} + +int sof_compr_set_params(struct snd_soc_component *component, + struct snd_compr_stream *cstream, struct snd_compr_params *params) +{ + struct snd_sof_dev *sdev = snd_soc_component_get_drvdata(component); + struct snd_soc_pcm_runtime *rtd = cstream->private_data; + struct snd_compr_runtime *crtd = cstream->runtime; + struct sof_ipc_pcm_params_reply ipc_params_reply; + struct snd_compr_tstamp *tstamp; + struct sof_ipc_pcm_params pcm; + struct snd_sof_pcm *spcm; + int ret; + + tstamp = crtd->private_data; + + spcm = snd_sof_find_spcm_dai(component, rtd); + + if (!spcm) + return -EINVAL; + + cstream->dma_buffer.dev.type = SNDRV_DMA_TYPE_DEV_SG; + cstream->dma_buffer.dev.dev = sdev->dev; + ret = snd_compr_malloc_pages(cstream, crtd->buffer_size); + if (ret < 0) + return ret; + + ret = create_page_table(component, cstream, crtd->dma_area, crtd->dma_bytes); + if (ret < 0) + return ret; + + memset(&pcm, 0, sizeof(pcm)); + + pcm.params.buffer.pages = PFN_UP(crtd->dma_bytes); + pcm.hdr.size = sizeof(pcm); + pcm.hdr.cmd = SOF_IPC_GLB_STREAM_MSG | SOF_IPC_STREAM_PCM_PARAMS; + + pcm.comp_id = spcm->stream[cstream->direction].comp_id; + pcm.params.hdr.size = sizeof(pcm.params); + pcm.params.buffer.phy_addr = spcm->stream[cstream->direction].page_table.addr; + pcm.params.buffer.size = crtd->dma_bytes; + pcm.params.direction = cstream->direction; + pcm.params.channels = params->codec.ch_out; + pcm.params.rate = params->codec.sample_rate; + pcm.params.buffer_fmt = SOF_IPC_BUFFER_INTERLEAVED; + pcm.params.frame_fmt = SOF_IPC_FRAME_S32_LE; + pcm.params.sample_container_bytes = + snd_pcm_format_physical_width(SNDRV_PCM_FORMAT_S32) >> 3; + pcm.params.host_period_bytes = params->buffer.fragment_size; + + ret = sof_ipc_tx_message(sdev->ipc, pcm.hdr.cmd, &pcm, sizeof(pcm), + &ipc_params_reply, sizeof(ipc_params_reply)); + if (ret < 0) { + dev_err(component->dev, "error ipc failed\n"); + return ret; + } + + tstamp->byte_offset = sdev->stream_box.offset + ipc_params_reply.posn_offset; + tstamp->sampling_rate = params->codec.sample_rate; + + spcm->prepared[cstream->direction] = true; + + return 0; +} + +int sof_compr_get_params(struct snd_soc_component *component, + struct snd_compr_stream *cstream, struct snd_codec *params) +{ + /* TODO: we don't query the supported codecs for now, if the + * application asks for an unsupported codec the set_params() will fail. + */ + return 0; +} + +int sof_compr_trigger(struct snd_soc_component *component, + struct snd_compr_stream *cstream, int cmd) +{ + struct snd_sof_dev *sdev = snd_soc_component_get_drvdata(component); + struct snd_soc_pcm_runtime *rtd = cstream->private_data; + struct sof_ipc_stream stream; + struct sof_ipc_reply reply; + struct snd_sof_pcm *spcm; + + spcm = snd_sof_find_spcm_dai(component, rtd); + if (!spcm) + return -EINVAL; + + stream.hdr.size = sizeof(stream); + stream.hdr.cmd = SOF_IPC_GLB_STREAM_MSG; + stream.comp_id = spcm->stream[cstream->direction].comp_id; + + switch (cmd) { + case SNDRV_PCM_TRIGGER_START: + stream.hdr.cmd |= SOF_IPC_STREAM_TRIG_START; + break; + case SNDRV_PCM_TRIGGER_STOP: + stream.hdr.cmd |= SOF_IPC_STREAM_TRIG_STOP; + break; + case SNDRV_PCM_TRIGGER_PAUSE_PUSH: + stream.hdr.cmd |= SOF_IPC_STREAM_TRIG_PAUSE; + break; + case SNDRV_PCM_TRIGGER_PAUSE_RELEASE: + stream.hdr.cmd |= SOF_IPC_STREAM_TRIG_RELEASE; + break; + default: + dev_err(component->dev, "error: unhandled trigger cmd %d\n", cmd); + break; + } + + return sof_ipc_tx_message(sdev->ipc, stream.hdr.cmd, + &stream, sizeof(stream), + &reply, sizeof(reply)); +} + +int sof_compr_copy(struct snd_soc_component *component, + struct snd_compr_stream *cstream, + char __user *buf, size_t count) +{ + struct snd_compr_runtime *rtd = cstream->runtime; + unsigned int offset, n; + void *ptr; + int ret; + + if (count > rtd->buffer_size) + count = rtd->buffer_size; + + div_u64_rem(rtd->total_bytes_available, rtd->buffer_size, &offset); + ptr = rtd->dma_area + offset; + n = rtd->buffer_size - offset; + + if (count < n) { + ret = copy_from_user(ptr, buf, count); + } else { + ret = copy_from_user(ptr, buf, n); + ret += copy_from_user(rtd->dma_area, buf + n, count - n); + } + + return count - ret; +} + +static int sof_compr_pointer(struct snd_soc_component *component, + struct snd_compr_stream *cstream, + struct snd_compr_tstamp *tstamp) +{ + struct snd_compr_tstamp *pstamp = cstream->runtime->private_data; + + tstamp->sampling_rate = pstamp->sampling_rate; + tstamp->copied_total = pstamp->copied_total; + + return 0; +} + +struct snd_compress_ops sof_compressed_ops = { + .open = sof_compr_open, + .free = sof_compr_free, + .set_params = sof_compr_set_params, + .get_params = sof_compr_get_params, + .trigger = sof_compr_trigger, + .pointer = sof_compr_pointer, + .copy = sof_compr_copy, +}; +EXPORT_SYMBOL(sof_compressed_ops); -- 2.27.0

2 1

[PATCH 0/2] ASoC: SOF: dma-trace: Change trace_init() ops parameter list
by Peter Ujfalusi 08 Feb '22

08 Feb '22

Hi, the DMA trace implementation on AMD platform assumes that the stream_tag pointer is pointing the stream_tag member of struct sof_ipc_dma_trace_params_ext, which is true at the moment, but it can not be guarantied and a change in the dtrace core can cause out of bound accesses for AMD. For this reason, change the API to pass the struct itself which will remove the assumption and makes it clear from both sides what is expected to be sent via the parameter list. This opens up a window to clean up the intel and AMD implementation at the same time. Regards, Peter --- Peter Ujfalusi (2): ASoC: SOF: intel: hda-trace: Pass the dma buffer pointer to hda_dsp_trace_prepare ASoC: SOF: dma-trace: Pass pointer to params_ext struct in trace_init() sound/soc/sof/amd/acp-trace.c | 38 ++++++++------------------------- sound/soc/sof/amd/acp.h | 3 ++- sound/soc/sof/intel/hda-trace.c | 17 ++++++++------- sound/soc/sof/intel/hda.h | 3 ++- sound/soc/sof/ops.h | 4 ++-- sound/soc/sof/sof-priv.h | 2 +- sound/soc/sof/trace.c | 2 +- 7 files changed, 26 insertions(+), 43 deletions(-) -- 2.35.0

2 3

[PATCH v5] ASoC: dt-bindings: davinci-mcasp: convert McASP bindings to yaml schema
by Jayesh Choudhary 08 Feb '22

08 Feb '22

Convert the bindings for McASP controllers for TI SOCs from txt to YAML schema. Adds additional properties 'clocks', 'clock-names', 'power-domains', '#sound-dai-cells' and 'port' which were missing from the txt file. Removes properties 'sram-size-playback' and 'sram-size-capture' since they are not used. Adds 'dmas' and 'dma-names' in the example which were missing from the txt file. Changes 'interrupts' and 'interrupt-names' from optional to required properties. Changes 'op-modes', 'serial-dir' to optional properties as they are not needed if the McASP is used only as GPIO. Changes 'tdm-slots' to required property only for I2S operation mode. Adds the yaml file in the 'MAINTAINERS' under the heading 'TEXAS INSTRUMENTS ASoC DRIVERS' Signed-off-by: Jayesh Choudhary <j-choudhary(a)ti.com> --- Changelog: v5: - changes the commit message - changes description for 'reg', 'op-mode', 'tx-num-evt', 'rx-num-evt' and 'interrupts' - adds minimum and maximum for 'tdm-slots' - removes default from 'serial-dir' - removes maxItems from 'tdm-slots', 'tx-num-evt', 'rx-num-evt' and 'auxclk-fs-ratio' as they are of type uint32 - adds 'tdm-slots' as conditionally required property for I2S mode of operation v4: - changes the commit message - adds type and description to relevant properties - changes maxItems for 'serial-dir' - removes properties 'sram-size-playback' and 'sram-size-capture' as they are not used - removes 'function-gpios' - removes 'num-serializer' - marks 'tdm-slots', 'op-mode' and 'serial-dir' as optional properties - adds the yaml file in MAINTAINERS v3: - remove maxItems from 'clock-names' v2: - changes the commit message - modifies the properties 'clocks', 'clock-names', 'dma-names', 'dmas', 'interrupts' and 'interrupt-names' according to the arm SOCs - adds 'ports' and 'num-serializer' as node properties .../bindings/sound/davinci-mcasp-audio.txt | 86 -------- .../bindings/sound/davinci-mcasp-audio.yaml | 201 ++++++++++++++++++ MAINTAINERS | 1 + 3 files changed, 202 insertions(+), 86 deletions(-) delete mode 100644 Documentation/devicetree/bindings/sound/davinci-mcasp-audio.txt create mode 100644 Documentation/devicetree/bindings/sound/davinci-mcasp-audio.yaml diff --git a/Documentation/devicetree/bindings/sound/davinci-mcasp-audio.txt b/Documentation/devicetree/bindings/sound/davinci-mcasp-audio.txt deleted file mode 100644 index bd863bd69501..000000000000 --- a/Documentation/devicetree/bindings/sound/davinci-mcasp-audio.txt +++ /dev/null @@ -1,86 +0,0 @@ -Texas Instruments McASP controller - -Required properties: -- compatible : - "ti,dm646x-mcasp-audio" : for DM646x platforms - "ti,da830-mcasp-audio" : for both DA830 & DA850 platforms - "ti,am33xx-mcasp-audio" : for AM33xx platforms (AM33xx, AM43xx, TI81xx) - "ti,dra7-mcasp-audio" : for DRA7xx platforms - "ti,omap4-mcasp-audio" : for OMAP4 - -- reg : Should contain reg specifiers for the entries in the reg-names property. -- reg-names : Should contain: - * "mpu" for the main registers (required). For compatibility with - existing software, it is recommended this is the first entry. - * "dat" for separate data port register access (optional). -- op-mode : I2S/DIT ops mode. 0 for I2S mode. 1 for DIT mode used for S/PDIF, - IEC60958-1, and AES-3 formats. -- tdm-slots : Slots for TDM operation. Indicates number of channels transmitted - or received over one serializer. -- serial-dir : A list of serializer configuration. Each entry is a number - indication for serializer pin direction. - (0 - INACTIVE, 1 - TX, 2 - RX) -- dmas: two element list of DMA controller phandles and DMA request line - ordered pairs. -- dma-names: identifier string for each DMA request line in the dmas property. - These strings correspond 1:1 with the ordered pairs in dmas. The dma - identifiers must be "rx" and "tx". - -Optional properties: - -- ti,hwmods : Must be "mcasp<n>", n is controller instance starting 0 -- tx-num-evt : FIFO levels. -- rx-num-evt : FIFO levels. -- dismod : Specify the drive on TX pin during inactive slots - 0 : 3-state - 2 : logic low - 3 : logic high - Defaults to 'logic low' when the property is not present -- sram-size-playback : size of sram to be allocated during playback -- sram-size-capture : size of sram to be allocated during capture -- interrupts : Interrupt numbers for McASP -- interrupt-names : Known interrupt names are "tx" and "rx" -- pinctrl-0: Should specify pin control group used for this controller. -- pinctrl-names: Should contain only one value - "default", for more details - please refer to pinctrl-bindings.txt -- fck_parent : Should contain a valid clock name which will be used as parent - for the McASP fck -- auxclk-fs-ratio: When McASP is bus master indicates the ratio between AUCLK - and FS rate if applicable: - AUCLK rate = auxclk-fs-ratio * FS rate - -Optional GPIO support: -If any McASP pin need to be used as GPIO then the McASP node must have: -... - gpio-controller - #gpio-cells = <2>; -... - -When requesting a GPIO, the first parameter is the PIN index in McASP_P* -registers. -For example to request the AXR2 pin of mcasp8: -function-gpios = <&mcasp8 2 0>; - -Or to request the ACLKR pin of mcasp8: -function-gpios = <&mcasp8 29 0>; - -For generic gpio information, please refer to bindings/gpio/gpio.txt - -Example: - -mcasp0: mcasp0@1d00000 { - compatible = "ti,da830-mcasp-audio"; - reg = <0x100000 0x3000>; - reg-names "mpu"; - interrupts = <82>, <83>; - interrupt-names = "tx", "rx"; - op-mode = <0>; /* MCASP_IIS_MODE */ - tdm-slots = <2>; - serial-dir = < - 0 0 0 0 /* 0: INACTIVE, 1: TX, 2: RX */ - 0 0 0 0 - 0 0 0 1 - 2 0 0 0 >; - tx-num-evt = <1>; - rx-num-evt = <1>; -}; diff --git a/Documentation/devicetree/bindings/sound/davinci-mcasp-audio.yaml b/Documentation/devicetree/bindings/sound/davinci-mcasp-audio.yaml new file mode 100644 index 000000000000..f46c66bc6b2d --- /dev/null +++ b/Documentation/devicetree/bindings/sound/davinci-mcasp-audio.yaml @@ -0,0 +1,201 @@ +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/sound/davinci-mcasp-audio.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: McASP Controller for TI SoCs + +maintainers: + - Jayesh Choudhary <j-choudhary(a)ti.com> + +properties: + compatible: + enum: + - ti,dm646x-mcasp-audio + - ti,da830-mcasp-audio + - ti,am33xx-mcasp-audio + - ti,dra7-mcasp-audio + - ti,omap4-mcasp-audio + + reg: + minItems: 1 + items: + - description: CFG registers + - description: data registers + + reg-names: + minItems: 1 + items: + - const: mpu + - const: dat + + op-mode: + $ref: /schemas/types.yaml#/definitions/uint32 + description: 0 - I2S or 1 - DIT operation mode + enum: + - 0 + - 1 + + tdm-slots: + $ref: /schemas/types.yaml#/definitions/uint32 + description: + number of channels over one serializer + the property is ignored in DIT mode + minimum: 2 + maximum: 32 + + serial-dir: + description: + A list of serializer configuration + Entry is indication for serializer pin direction + 0 - Inactive, 1 - TX, 2 - RX + All AXR pins should be present in the array even if inactive + $ref: /schemas/types.yaml#/definitions/uint32-array + minItems: 1 + maxItems: 25 + items: + minimum: 0 + maximum: 2 + + dmas: + minItems: 1 + items: + - description: transmission DMA channel + - description: reception DMA channel + + dma-names: + minItems: 1 + items: + - const: tx + - const: rx + + ti,hwmods: + $ref: /schemas/types.yaml#/definitions/string + description: Name of hwmod associated with McASP + maxItems: 1 + deprecated: true + + tx-num-evt: + $ref: /schemas/types.yaml#/definitions/uint32 + description: + configures WFIFO threshold + 0 disables the FIFO use + if property is missing, then also FIFO use is disabled + + rx-num-evt: + $ref: /schemas/types.yaml#/definitions/uint32 + description: + configures RFIFO threshold + 0 disables the FIFO use + if property is missing, then also FIFO use is disabled + + dismod: + $ref: /schemas/types.yaml#/definitions/uint32 + description: + specify the drive on TX pin during inactive time slots + 0 - 3-state, 2 - logic low, 3 - logic high + enum: + - 0 + - 2 + - 3 + default: 2 + + interrupts: + anyOf: + - minItems: 1 + items: + - description: TX interrupt + - description: RX interrupt + - items: + - description: common/combined interrupt + + interrupt-names: + oneOf: + - minItems: 1 + items: + - const: tx + - const: rx + - const: common + + fck_parent: + $ref: /schemas/types.yaml#/definitions/string + description: parent clock name for McASP fck + maxItems: 1 + + auxclk-fs-ratio: + $ref: /schemas/types.yaml#/definitions/uint32 + description: ratio of AUCLK and FS rate if applicable + + gpio-controller: true + + "#gpio-cells": + const: 2 + + clocks: + minItems: 1 + items: + - description: functional clock + - description: module specific optional ahclkx clock + - description: module specific optional ahclkr clock + + clock-names: + minItems: 1 + items: + - const: fck + - const: ahclkx + - const: ahclkr + + power-domains: + description: phandle to the corresponding power-domain + maxItems: 1 + + "#sound-dai-cells": + const: 0 + + port: + description: connection for when McASP is used via graph card + type: object + +required: + - compatible + - reg + - reg-names + - dmas + - dma-names + - interrupts + - interrupt-names + +allOf: + - if: + properties: + opmode: + enum: + - 0 + + then: + required: + - tdm-slots + +additionalProperties: false + +examples: + - | + mcasp0: mcasp0@1d00000 { + compatible = "ti,da830-mcasp-audio"; + reg = <0x100000 0x3000>; + reg-names = "mpu"; + interrupts = <82>, <83>; + interrupt-names = "tx", "rx"; + op-mode = <0>; /* MCASP_IIS_MODE */ + tdm-slots = <2>; + dmas = <&main_udmap 0xc400>, <&main_udmap 0x4400>; + dma-names = "tx", "rx"; + serial-dir = < + 0 0 0 0 /* 0: INACTIVE, 1: TX, 2: RX */ + 0 0 0 0 + 0 0 0 1 + 2 0 0 0 >; + tx-num-evt = <1>; + rx-num-evt = <1>; + }; diff --git a/MAINTAINERS b/MAINTAINERS index 5ea5655a29c3..ec6bde4efcae 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -18995,6 +18995,7 @@ TEXAS INSTRUMENTS ASoC DRIVERS M: Peter Ujfalusi <peter.ujfalusi(a)gmail.com> L: alsa-devel(a)alsa-project.org (moderated for non-subscribers) S: Maintained +F: Documentation/devicetree/bindings/sound/davinci-mcasp-audio.yaml F: sound/soc/ti/ TEXAS INSTRUMENTS' DAC7612 DAC DRIVER -- 2.17.1

3 8

[PATCH 1/3] ASoC: rt5682s: do not block workqueue if card is unbound
by Kai Vehmanen 08 Feb '22

08 Feb '22

The current rt5682s_jack_detect_handler() assumes the component and card will always show up and implements an infinite usleep loop waiting for them to show up. This does not hold true if a codec interrupt (or other event) occurs when the card is unbound. The codec driver's remove or shutdown functions cannot cancel the workqueue due to the wait loop. As a result, code can either end up blocking the workqueue, or hit a kernel oops when the card is freed. Fix the issue by rescheduling the jack detect handler in case the card is not ready. In case card never shows up, the shutdown/remove/suspend calls can now cancel the detect task. Signed-off-by: Kai Vehmanen <kai.vehmanen(a)linux.intel.com> Reviewed-by: Bard Liao <yung-chuan.liao(a)linux.intel.com> Reviewed-by: Ranjani Sridharan <ranjani.sridharan(a)linux.intel.com> Reviewed-by: Pierre-Louis Bossart <pierre-louis.bossart(a)linux.intel.com> Reviewed-by: Péter Ujfalusi <peter.ujfalusi(a)linux.intel.com> Reviewed-by: Shuming Fan <shumingf(a)realtek.com> --- sound/soc/codecs/rt5682s.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/sound/soc/codecs/rt5682s.c b/sound/soc/codecs/rt5682s.c index efa1016831dd..1e662d1be2b3 100644 --- a/sound/soc/codecs/rt5682s.c +++ b/sound/soc/codecs/rt5682s.c @@ -824,11 +824,13 @@ static void rt5682s_jack_detect_handler(struct work_struct *work) container_of(work, struct rt5682s_priv, jack_detect_work.work); int val, btn_type; - while (!rt5682s->component) - usleep_range(10000, 15000); - - while (!rt5682s->component->card->instantiated) - usleep_range(10000, 15000); + if (!rt5682s->component || !rt5682s->component->card || + !rt5682s->component->card->instantiated) { + /* card not yet ready, try later */ + mod_delayed_work(system_power_efficient_wq, + &rt5682s->jack_detect_work, msecs_to_jiffies(15)); + return; + } mutex_lock(&rt5682s->jdet_mutex); mutex_lock(&rt5682s->calibrate_mutex); base-commit: d466706b9d0dae4754a47c34fd5f4654ee54f609 -- 2.35.1

2 3

[PATCH v2] ASoC: tas2770: Insert post reset delay
by Martin Povišer 08 Feb '22

08 Feb '22

Per TAS2770 datasheet there must be a 1 ms delay from reset to first command. So insert delays into the driver where appropriate. Fixes: 1a476abc723e ("tas2770: add tas2770 smart PA kernel driver") Signed-off-by: Martin Povišer <povik+lin(a)cutebit.org> --- In previous submission of this patch some people got their copy encrypted. That was by accident, pardon that. I have changed my email provider since. v1: https://lore.kernel.org/alsa-devel/20220201234612.74401-1-povik+lin@protonm… sound/soc/codecs/tas2770.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/sound/soc/codecs/tas2770.c b/sound/soc/codecs/tas2770.c index b52c0861edc8..b397a2122dd4 100644 --- a/sound/soc/codecs/tas2770.c +++ b/sound/soc/codecs/tas2770.c @@ -38,10 +38,12 @@ static void tas2770_reset(struct tas2770_priv *tas2770) gpiod_set_value_cansleep(tas2770->reset_gpio, 0); msleep(20); gpiod_set_value_cansleep(tas2770->reset_gpio, 1); + usleep_range(1000, 2000); } snd_soc_component_write(tas2770->component, TAS2770_SW_RST, TAS2770_RST); + usleep_range(1000, 2000); } static int tas2770_set_bias_level(struct snd_soc_component *component, @@ -110,6 +112,7 @@ static int tas2770_codec_resume(struct snd_soc_component *component) if (tas2770->sdz_gpio) { gpiod_set_value_cansleep(tas2770->sdz_gpio, 1); + usleep_range(1000, 2000); } else { ret = snd_soc_component_update_bits(component, TAS2770_PWR_CTRL, TAS2770_PWR_CTRL_MASK, @@ -529,8 +532,10 @@ static int tas2770_codec_probe(struct snd_soc_component *component) tas2770->component = component; - if (tas2770->sdz_gpio) + if (tas2770->sdz_gpio) { gpiod_set_value_cansleep(tas2770->sdz_gpio, 1); + usleep_range(1000, 2000); + } tas2770_reset(tas2770); -- 2.33.0

2 1

Re: [PATCH 5/5] spi: make remove callback a void function
by Mark Brown 08 Feb '22

08 Feb '22

On Sun, Jan 23, 2022 at 06:52:01PM +0100, Uwe Kleine-König wrote: > The value returned by an spi driver's remove function is mostly ignored. > (Only an error message is printed if the value is non-zero that the > error is ignored.) > > So change the prototype of the remove function to return no value. This > way driver authors are not tempted to assume that passing an error to > the upper layer is a good idea. All drivers are adapted accordingly. > There is no intended change of behaviour, all callbacks were prepared to > return 0 before. I was going to apply this but it needs rebasing against current code unfortunately.

1 0

[PATCH v1] ASoC: nau8822: export right speaker inversion
by Francesco Dolcini 08 Feb '22

08 Feb '22

From: Max Krummenacher <max.krummenacher(a)toradex.com> This control inverts the signal fed to the right amplifier. This allows to connect one loudspeaker to the two speaker amplifiers in a bridge-tied load configuration getting higher output power. Signed-off-by: Max Krummenacher <max.krummenacher(a)toradex.com> Signed-off-by: Francesco Dolcini <francesco.dolcini(a)toradex.com> --- sound/soc/codecs/nau8822.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sound/soc/codecs/nau8822.c b/sound/soc/codecs/nau8822.c index 58123390c7a3..bf1155903421 100644 --- a/sound/soc/codecs/nau8822.c +++ b/sound/soc/codecs/nau8822.c @@ -351,6 +351,8 @@ static const struct snd_kcontrol_new nau8822_snd_controls[] = { NAU8822_REG_LHP_VOLUME, NAU8822_REG_RHP_VOLUME, 0, 63, 0, spk_tlv), + SOC_SINGLE("Speaker RInversion Switch", + NAU8822_REG_RIGHT_SPEAKER_CONTROL, 4, 1, 0), SOC_DOUBLE_R("Speaker ZC Switch", NAU8822_REG_LSPKOUT_VOLUME, NAU8822_REG_RSPKOUT_VOLUME, 7, 1, 0), -- 2.25.1

2 5

Re: Bug 215561 - snd-usb-audio:reset_resume error -22 after suspend (fwd from bugzilla)
by Thorsten Leemhuis 08 Feb '22

08 Feb '22

Hi, this is your Linux kernel regression tracker speaking. Top-posting for once, to make this easy accessible to everyone. Below issue is one of those those reports that seem to get stranded in bugzilla.kernel.org Greg, Jaroslav, Takashi, could one of you please take a look? The reporter submitted it as USB bug, but maybe that wasn't a wise choice. Ciao, Thorsten (wearing his 'the Linux kernel's regression tracker' hat) P.S.: As the Linux kernel's regression tracker I'm getting a lot of reports on my table. I can only look briefly into most of them and lack knowledge about most of the areas they concern. I thus unfortunately will sometimes get things wrong or miss something important. I hope that's not the case here; if you think it is, don't hesitate to tell me in a public reply, it's in everyone's interest to set the public record straight. #regzbot poke On 03.02.22 15:59, Thorsten Leemhuis wrote: > Hi, this is your Linux kernel regression tracker speaking. > > There is a regression in bugzilla.kernel.org I'd like to add to the > tracking: > > #regzbot introduced: v5.15..v5.16 > #regzbot from: antifermion(a)protonmail.com <antifermion(a)protonmail.com> > #regzbot title: snd: usb: snd-usb-audio:reset_resume error -22 after suspen > #regzbot link: https://bugzilla.kernel.org/show_bug.cgi?id=215561 > > Quote: > >> If I use the microphone, then suspend and wake up again, I get the error >> >> ``` >> snd-usb-audio 1-5:1.0: reset_resume error -22 >> ``` >> >> Aftewards, audio stops working completely. Both pipewire and pulseaudio (tried both; not at the same time) freeze. >> >> After running >> >> ``` >> rmmod -f snd_usb_audio >> ``` >> >> and replugging the microphone, audio works again. >> Here is the relevant log: >> >> ``` >> [ 157.791937] usbcore: deregistering interface driver snd-usb-audio >> [ 228.517855] usb 1-5: USB disconnect, device number 2 >> [ 236.464334] usb 1-5: new high-speed USB device number 3 using xhci_hcd >> [ 236.798863] usb 1-5: New USB device found, idVendor=0d8c, idProduct=0171, bcdDevice= 1.04 >> [ 236.798867] usb 1-5: New USB device strings: Mfr=3, Product=1, SerialNumber=0 >> [ 236.798869] usb 1-5: Product: USB 2.0 HD Audio >> [ 236.798871] usb 1-5: Manufacturer: C-Media Electronics Inc. >> [ 236.826966] input: C-Media Electronics Inc. USB 2.0 HD Audio Consumer Control as /devices/pci0000:00/0000:00:01.3/0000:02:00.0/usb1/1-5/1-5:1.3/0003:0D8C:0171.000B/input/input40 >> [ 236.878380] input: C-Media Electronics Inc. USB 2.0 HD Audio as /devices/pci0000:00/0000:00:01.3/0000:02:00.0/usb1/1-5/1-5:1.3/0003:0D8C:0171.000B/input/input41 >> [ 236.878447] hid-generic 0003:0D8C:0171.000B: input,hiddev96,hidraw2: USB HID v1.11 Device [C-Media Electronics Inc. USB 2.0 HD Audio] on usb-0000:02:00.0-5/input3 >> [ 242.306593] usbcore: registered new interface driver snd-usb-audio >> >> ``` >> >> I'm running Arch Linux (5.16.4.arch1-1). The linux-lts kernel (5.15.18-1) works fine. >> >> Other uses report the same error: https://bbs.archlinux.org/viewtopic.php?id=273469 > > Ciao, Thorsten (wearing his 'Linux kernel regression tracker' hat) > > P.S.: As a Linux kernel regression tracker I'm getting a lot of reports > on my table. I can only look briefly into most of them. Unfortunately > therefore I sometimes will get things wrong or miss something important. > I hope that's not the case here; if you think it is, don't hesitate to > tell me about it in a public reply, that's in everyone's interest. > > BTW, I have no personal interest in this issue, which is tracked using > regzbot, my Linux kernel regression tracking bot > (https://linux-regtracking.leemhuis.info/regzbot/). I'm only posting > this mail to get things rolling again and hence don't need to be CC on > all further activities wrt to this regression. > > --- > Additional information about regzbot: > > If you want to know more about regzbot, check out its web-interface, the > getting start guide, and/or the references documentation: > > https://linux-regtracking.leemhuis.info/regzbot/ > https://gitlab.com/knurd42/regzbot/-/blob/main/docs/getting_started.md > https://gitlab.com/knurd42/regzbot/-/blob/main/docs/reference.md > > The last two documents will explain how you can interact with regzbot > yourself if your want to. > > Hint for reporters: when reporting a regression it's in your interest to > tell #regzbot about it in the report, as that will ensure the regression > gets on the radar of regzbot and the regression tracker. That's in your > interest, as they will make sure the report won't fall through the > cracks unnoticed. > > Hint for developers: you normally don't need to care about regzbot once > it's involved. Fix the issue as you normally would, just remember to > include a 'Link:' tag to the report in the commit message, as explained > in Documentation/process/submitting-patches.rst > That aspect was recently was made more explicit in commit 1f57bd42b77c: > https://git.kernel.org/linus/1f57bd42b77c

1 0

[PATCH][next] kselftest: alsa: fix spelling mistake "desciptor" -> "descriptor"
by Colin Ian King 08 Feb '22

08 Feb '22

There are some spelling mistakes in some ksft messages. Fix them. Signed-off-by: Colin Ian King <colin.i.king(a)gmail.com> --- tools/testing/selftests/alsa/mixer-test.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/testing/selftests/alsa/mixer-test.c b/tools/testing/selftests/alsa/mixer-test.c index d0b788b8d287..eb2213540fe3 100644 --- a/tools/testing/selftests/alsa/mixer-test.c +++ b/tools/testing/selftests/alsa/mixer-test.c @@ -198,7 +198,7 @@ static void find_controls(void) err = snd_ctl_poll_descriptors_count(card_data->handle); if (err != 1) { - ksft_exit_fail_msg("Unexpected desciptor count %d for card %d\n", + ksft_exit_fail_msg("Unexpected descriptor count %d for card %d\n", err, card); } @@ -248,12 +248,12 @@ static int wait_for_event(struct ctl_data *ctl, int timeout) &(ctl->card->pollfd), 1, &revents); if (err < 0) { - ksft_print_msg("snd_ctl_poll_desciptors_revents() failed for %s: %d\n", + ksft_print_msg("snd_ctl_poll_descriptors_revents() failed for %s: %d\n", ctl->name, err); return err; } if (revents & POLLERR) { - ksft_print_msg("snd_ctl_poll_desciptors_revents() reported POLLERR for %s\n", + ksft_print_msg("snd_ctl_poll_descriptors_revents() reported POLLERR for %s\n", ctl->name); return -1; } -- 2.34.1

3 2

[PATCH] ALSA: usb-audio: remove redundant assignment to variable c
by Colin Ian King 07 Feb '22

07 Feb '22

The variable c is being initialized in an outer for-loop and also re-initialized inside an inner for-loop. The first initialization is redundant and can be removed. Signed-off-by: Colin Ian King <colin.i.king(a)gmail.com> --- sound/usb/mixer_s1810c.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/usb/mixer_s1810c.c b/sound/usb/mixer_s1810c.c index 0255089c9efb..fac4bbc6b275 100644 --- a/sound/usb/mixer_s1810c.c +++ b/sound/usb/mixer_s1810c.c @@ -221,7 +221,7 @@ static int snd_s1810c_init_mixer_maps(struct snd_usb_audio *chip) e = 0xbc; for (n = 0; n < 2; n++) { off = n * 18; - for (b = off, c = 0; b < 18 + off; b++) { + for (b = off; b < 18 + off; b++) { /* This channel to all outputs ? */ for (c = 0; c <= 8; c++) { snd_s1810c_send_ctl_packet(dev, a, b, c, 0, e); -- 2.34.1

2 1

[RFC 00/37] ASoC: Intel: AVS - Audio DSP for cAVS
by Cezary Rojewski 07 Feb '22

07 Feb '22

A continuation of cleanup work of Intel SST solutions found in sound/soc/intel/. With two major chapters released last year catpt [1] and removal of haswell solution [2], time has come for Skylake-driver. Througout 2019, 2020 and 2021 Skylake-driver has had many fixes applied and even attempts of refactors as seen in fundamental overhaul [3], IPC flow adjustments [4] and LARGE_CONFIG overhaul [5] series. Unfortunately, story repeats itself - problems are found within the core of a driver. Painting it with different colors does not change the fact that is it still a house of cards. As changes needed to address those issues would make Skylake solution incompatible with its previous revisions, a decision has been made to provide a new solution instead. In time it would deprecate and replace Skylake-driver. That solution has been called AVS - from AudioDSP architecture name: Audio-Voice-Speech. It is meant to provide support for the exact same range of platforms as its predecessor: SKL, KBL, AML and APL. Several functions found within HDAudio and ASoC framework have been exported and are re-used later by the avs-driver to prevent code being duplicated in this solution. All of these act as driver dependencies and are found at the beginning of the series to make it clear what's needed for avs-driver to compile. Note: this series is dependent upon NHLT-series [6] which was recently merged by Takashi to his for-next branch yet is unavailable on current broonie/for-next. Note: this series does not add fully functional driver as its size would get out of control. Focus is put on adding new code. A SND_SOC_INTEL_SKYLAKE_FAMILY=n dependency is added so no probing attempts are performed. Until all patches are merged, Skylake-driver remains the recommended option. Series which will later follow this one, focus on filling all the remaining functionality gaps and provide filesystems support. Also, a range of machine boards will be added to match range of configurations supported by the avs-driver. Once avs-driver and its collaterals are merged, skylake-driver deprecation and removal process begins, along with all other components that are connected to it e.g.: skylake-driver-only machine boards. As AudioDSP firmware which avs-driver communicates with supports a wide range of audio formats, module configurations and multi-pipeline streams, couple of new concepts are introduce to enable all those functionalities: - Path template and path variants - Runtime path - Conditional path - Granular sound cards (as opposed to 'super-cards') These are later better explained by their respective patches: 'Topology parsing', 'Path management', 'Conditional-path support' and 'Machine board registration'. A 'path' represents a DSP side of audio stream in runtime - is a logical container for pipelines which are themselves composed of modules - processing units. Due to high range of possible audio format combinations, there can be more variants of given path (and thus, its pipelines and modules) than total number of pipelines and module instances which firmware supports concurrently, all the instance IDs are allocated dynamically with help of IDA interface. 'Path templates' come from topology file and describe a pattern which is later used to actually create runtime 'path'. To support modern audio usecases such as WaveOnVoice and EchoReference, conditional paths concept came into existence. These work similarly to standard paths except are a consequence of other paths being created or deleted, rather then being created when userspace app opens specific FE for streaming. Their state machine is controlled by source and sink paths which created them in the first place. Granular machine boards is a contrast to 'super-card' idea which is currently widely used throughout Intel ASoC drivers. Major reasons are: complexity reduction (each board now focuses on a single, concrete device) and overall reduction of topology file size when entire configuration is taken into account. This has functional benefits too: one card failing won't prevent others from probing and being operative. Changes [internal] RFC v2 -> [public] RFC v1: - dropped any sysfs related changes from this series, moved to follow up one - dropped entire subscription-mechanism found in ipc.c. Handlers that are delegated to service certain firmware notifications are now called directly - fixed kernel doc for snd_soc_dapm_new_dai_widgets() as reported by ikp - prefixed snd_hda_codec_device_init() as suggested by Amadeo - improved comments for d0ix transitions for APL-based platforms as suggested by Pierre - a ton of spelling related fixes in most of the commit messages - fixed remaining warnings pointed by scan-build (variable assigned but not used) - replaced most of 'cAVS X.Y' expression usages with 'platform-based' equivalents as suggested by Pierre e.g.: cAVS 1.5 -> SKL-based Changes [internal] RFC v1 -> [internal] RFC v2: - fixed memleak caused by lack of kfree(vols) if memory allocation fails in avs_peakvol_create() as reported by Curtis - fixed missing 'i' iterator incrementation in avs_widget_ready() causing reference loss as reported by Curtis - replace hardcode: 0x40 usage with snd_hdac_calc_stream_format as suggested by Curtis. In consequence, readability for all code loading (CL) procedues has increased and such approach auto-documents the CL stream preparation - updated behavior of all index-fetching functions found in utils.c: avs_module_entry_index(), avs_module_id_entry_index() and follow ups: avs_get_module_entry(), avs_get_module_id_entry() to better conform to linux-kernel standard when no entry is found (return -ENOENT) rather than C++ standard (return -1, what in kernel case translated to -EPERM) as suggested by Curtis and Peter - several suggestions have been made regarding spacing, and so far, I've agreed and applied with all of them. None proposed seemed out of place or redundant - avs_path_stop() renamed to avs_path_pause() pipeline states are represented by RESET/PAUSED/RUNNING. avs_path_reset() and avs_path_run() were already there and avs_path_stop() just didn't look cohesive - added missing parsers for num_output_pin and num_input_pin which are required for custom modules such as WAVES or DSM - dropped 'priv_param_length' from custom module descriptor as this field is obsolete in firmware - parse_dictionary() has been split into parse_dictionary_header() and parse_dictionary_entries() to drop code duplication present in several parsing function which could not re-use entire parse_dictionary() - added avs_tplg_vendor_array_lookup_next() and avs_tplg_vendor_entry_next() to drop code duplicated present in several parsing functions. This change greatly impacted readability of all parsers - parsing helpers such avs_tplg_vendor_array_lookup() now return offset by updating specified in function argument list u32 *offset variable. This is to address problem when u32 offset would be greater than max int, which is the return type for these functions - AVS_DEFINE_PTR_PARSER() macro has been introduced to drop code duplication for all ptr-parsing users - all struct avs_path_module creators have had their declaration updated: function argument *owner ceased to exist as it could already be accessed by mod->owner - fixed the order of operation for conditional paths (e.g.: echo reference) so these are no longer controlled by "source" path and instead are impacted by state changes of source and sink paths both. Previously only source path e.g. playback sourcing echo reference would trigger RUNNING status for conditional path. Equivalent RUNNING on WoV path which is in this case sink path, would not do so, leading to order-of-operation problems. Behavior has been changed to: both source and sink need to be RUNNING for conditional path to be set to RUNNING too. PAUSED for either source or sink will cause PAUSED transition for conditional path. - to achieve the above, path states are now saved in 'state' i.e. new u32 field for struct avs_path - resigned from fw_filename field usage in favour of newly added tplg_filename for machine board descriptors as suggested by Pierre - platform descriptor fields have had their names update better reflect their purpose as suggested by Pierre - fixed comp_list missing locking when manipulated - all message senders now accept request as pointer as suggeseted by Peter - resigned of AZX_ usage for all ADSP-related registers, leaving them only for HOST memory space related operations - fixed disable path for core DSP operations: power/reset/stall as reported by Peter - safety when locking between received responses (reply vs notification) has been lowered as suggested by Pierre. Most usages are not performed in IRQ context and none is done in hard-IRQ one - s/master/main/ plus AVS_MAIN_CORE_MASK has replaced ->master_mask - several functions have had their logging updated - logs have been moved to lower level functions as suggested by Pierre - hdac_ext_stream usage has been streamlined to estream, hdac_streams are represented by hstream instead - hw_params() are resilient to scenarios when they are called mutliple times as reported by Pierre - avs_dsp_enable() now collapses if any of its steps fails as reported by Pierre and Peter - avs_module_ida_empty() now returns value of type bool as suggested by Bard [1]: https://www.spinics.net/lists/alsa-devel/msg116440.html [2]: https://www.spinics.net/lists/alsa-devel/msg116901.html [3]: https://www.spinics.net/lists/alsa-devel/msg94199.html [4]: https://www.spinics.net/lists/alsa-devel/msg92588.html [5]: https://lore.kernel.org/all/20190808181549.12521-1-cezary.rojewski@intel.co… [6]: https://lore.kernel.org/all/YaDq7L1Mu++3UBL7@sirena.org.uk/T/ Cezary Rojewski (37): ALSA: hda: Add snd_hdac_ext_bus_link_at() helper ALSA: hda: Update and expose snd_hda_codec_device_init() ALSA: hda: Update and expose codec register procedures ALSA: hda: Expose codec cleanup and power-save functions ALSA: hda: Add helper macros for DSP capable devices ASoC: Export DAI register and widget ctor and dctor functions ASoC: Intel: Introduce AVS driver ASoC: Intel: avs: Inter process communication ASoC: Intel: avs: Add code loading requests ASoC: Intel: avs: Add pipeline management requests ASoC: Intel: avs: Add module management requests ASoC: Intel: avs: Add power management requests ASoC: Intel: avs: Add ROM requests ASoC: Intel: avs: Add basefw runtime-parameter requests ASoC: Intel: avs: Firmware resources management utilities ASoC: Intel: avs: Declare module configuration types ASoC: Intel: avs: Dynamic firmware resources management ASoC: Intel: avs: Topology parsing ASoC: Intel: avs: Path management ASoC: Intel: avs: Conditional-path support ASoC: Intel: avs: General code loading flow ASoC: Intel: avs: Implement CLDMA transfer ASoC: Intel: avs: Code loading over CLDMA ASoC: Intel: avs: Code loading over HDA ASoC: Intel: avs: Generic soc component driver ASoC: Intel: avs: Generic PCM FE operations ASoC: Intel: avs: non-HDA PCM BE operations ASoC: Intel: avs: HDA PCM BE operations ASoC: Intel: avs: Coredump and recovery flow ASoC: Intel: avs: Prepare for firmware tracing ASoC: Intel: avs: D0ix power state support ASoC: Intel: avs: Event tracing ASoC: Intel: avs: Machine board registration ASoC: Intel: avs: PCI driver implementation ASoC: Intel: avs: Power management ASoC: Intel: avs: SKL-based platforms support ASoC: Intel: avs: APL-based platforms support .../ABI/testing/sysfs-bus-pci-devices-avs | 24 + include/sound/hda_codec.h | 11 +- include/sound/hdaudio.h | 2 + include/sound/hdaudio_ext.h | 50 + include/sound/soc-acpi.h | 2 + include/sound/soc-dapm.h | 1 + include/uapi/sound/intel/avs/tokens.h | 147 ++ sound/hda/ext/hdac_ext_controller.c | 31 +- sound/pci/hda/hda_codec.c | 93 +- sound/pci/hda/hda_local.h | 2 - sound/soc/codecs/hdac_hda.c | 2 +- sound/soc/intel/Kconfig | 19 + sound/soc/intel/Makefile | 1 + sound/soc/intel/avs/Makefile | 12 + sound/soc/intel/avs/apl.c | 244 +++ sound/soc/intel/avs/avs.h | 331 ++++ sound/soc/intel/avs/board_selection.c | 459 +++++ sound/soc/intel/avs/cldma.c | 328 ++++ sound/soc/intel/avs/cldma.h | 29 + sound/soc/intel/avs/core.c | 737 +++++++ sound/soc/intel/avs/dsp.c | 326 ++++ sound/soc/intel/avs/ipc.c | 612 ++++++ sound/soc/intel/avs/loader.c | 672 +++++++ sound/soc/intel/avs/messages.c | 674 +++++++ sound/soc/intel/avs/messages.h | 813 ++++++++ sound/soc/intel/avs/path.c | 1287 +++++++++++++ sound/soc/intel/avs/path.h | 85 + sound/soc/intel/avs/pcm.c | 1240 ++++++++++++ sound/soc/intel/avs/registers.h | 83 + sound/soc/intel/avs/skl.c | 127 ++ sound/soc/intel/avs/topology.c | 1700 +++++++++++++++++ sound/soc/intel/avs/topology.h | 207 ++ sound/soc/intel/avs/trace.c | 34 + sound/soc/intel/avs/trace.h | 158 ++ sound/soc/intel/avs/utils.c | 305 +++ sound/soc/soc-core.c | 1 + sound/soc/soc-dapm.c | 15 + 37 files changed, 10824 insertions(+), 40 deletions(-) create mode 100644 Documentation/ABI/testing/sysfs-bus-pci-devices-avs create mode 100644 include/uapi/sound/intel/avs/tokens.h create mode 100644 sound/soc/intel/avs/Makefile create mode 100644 sound/soc/intel/avs/apl.c create mode 100644 sound/soc/intel/avs/avs.h create mode 100644 sound/soc/intel/avs/board_selection.c create mode 100644 sound/soc/intel/avs/cldma.c create mode 100644 sound/soc/intel/avs/cldma.h create mode 100644 sound/soc/intel/avs/core.c create mode 100644 sound/soc/intel/avs/dsp.c create mode 100644 sound/soc/intel/avs/ipc.c create mode 100644 sound/soc/intel/avs/loader.c create mode 100644 sound/soc/intel/avs/messages.c create mode 100644 sound/soc/intel/avs/messages.h create mode 100644 sound/soc/intel/avs/path.c create mode 100644 sound/soc/intel/avs/path.h create mode 100644 sound/soc/intel/avs/pcm.c create mode 100644 sound/soc/intel/avs/registers.h create mode 100644 sound/soc/intel/avs/skl.c create mode 100644 sound/soc/intel/avs/topology.c create mode 100644 sound/soc/intel/avs/topology.h create mode 100644 sound/soc/intel/avs/trace.c create mode 100644 sound/soc/intel/avs/trace.h create mode 100644 sound/soc/intel/avs/utils.c -- 2.25.1

4 56

Add UCM for PinePhone
by GitHub pull_request - edited 07 Feb '22

07 Feb '22

alsa-project/alsa-ucm-conf pull request #134 was edited from tomfitzhenry: Fixes https://github.com/alsa-project/alsa-ucm-conf/issues/124. The DTS configuration has had a unique audio card name since 5.14: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/tree/arc… This UCM config is copied from https://gitlab.com/pine64-org/pine64-alsa-ucm/, which was developed by many developers ( https://gitlab.com/pine64-org/pine64-alsa-ucm/-/merge_requests/1 ) and is BSD-3-Clause licensed. I have tested that with this PR, the PinePhone has the expected HiFi and VoiceCall profiles.This testing found that the `File` directive in `SectionUseCase` needs to be absolute (for the symlink to work). I've fixed this in this PR: https://github.com/alsa-project/alsa-ucm-conf/pull/134/commits/5059e57a2197…. See also: * `alsa-info`: https://alsa-project.org/db/?f=5e331f5ef10bd167b3bd7640bfcf0e879100f80d * `pa-info`: [pa-info.txt](https://github.com/alsa-project/alsa-ucm-conf/files/8015083/pa… * https://gitlab.com/pine64-org/pine64-alsa-ucm/-/issues/3 Request URL : https://github.com/alsa-project/alsa-ucm-conf/pull/134 Patch URL : https://github.com/alsa-project/alsa-ucm-conf/pull/134.patch Repository URL: https://github.com/alsa-project/alsa-ucm-conf

1 0

Add UCM for PinePhone
by GitHub pull_request - edited 07 Feb '22

07 Feb '22

alsa-project/alsa-ucm-conf pull request #134 was edited from tomfitzhenry: Fixes https://github.com/alsa-project/alsa-ucm-conf/issues/124. The DTS configuration has had a unique audio card name since 5.14: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/tree/arc… This UCM config is copied from https://gitlab.com/pine64-org/pine64-alsa-ucm/, which is BSD-3-Clause licensed. I have tested that with this PR, the PinePhone has the expected HiFi and VoiceCall profiles.This testing found that the `File` directive in `SectionUseCase` needs to be absolute (for the symlink to work). I've fixed this in this PR: https://github.com/alsa-project/alsa-ucm-conf/pull/134/commits/5059e57a2197…. `alsa-info`: https://alsa-project.org/db/?f=5e331f5ef10bd167b3bd7640bfcf0e879100f80d `pa-info`: [pa-info.txt](https://github.com/alsa-project/alsa-ucm-conf/files/8015083/pa… See also: * https://gitlab.com/pine64-org/pine64-alsa-ucm/-/merge_requests/1 * https://gitlab.com/pine64-org/pine64-alsa-ucm/-/issues/3 Request URL : https://github.com/alsa-project/alsa-ucm-conf/pull/134 Patch URL : https://github.com/alsa-project/alsa-ucm-conf/pull/134.patch Repository URL: https://github.com/alsa-project/alsa-ucm-conf

1 0

Add UCM for PinePhone
by GitHub pull_request - edited 07 Feb '22

07 Feb '22

alsa-project/alsa-ucm-conf pull request #134 was edited from tomfitzhenry: Fixes https://github.com/alsa-project/alsa-ucm-conf/issues/124. The DTS configuration has had a unique audio card name since 5.14: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/tree/arc… This UCM config is copied from https://gitlab.com/pine64-org/pine64-alsa-ucm/, which is BSD-3-Clause licensed. I have tested that with this PR, the PinePhone has the expected HiFi and VoiceCall profiles.This testing found that the `File` directive in `SectionUseCase` needs to be absolute (for the symlink to work). I've fixed this in this PR: https://github.com/alsa-project/alsa-ucm-conf/pull/134/commits/5059e57a2197…. See also: * https://gitlab.com/pine64-org/pine64-alsa-ucm/-/merge_requests/1 * https://gitlab.com/pine64-org/pine64-alsa-ucm/-/issues/3 Request URL : https://github.com/alsa-project/alsa-ucm-conf/pull/134 Patch URL : https://github.com/alsa-project/alsa-ucm-conf/pull/134.patch Repository URL: https://github.com/alsa-project/alsa-ucm-conf

1 0

Add UCM for PinePhone
by GitHub pull_request - edited 07 Feb '22

07 Feb '22

alsa-project/alsa-ucm-conf pull request #134 was edited from tomfitzhenry: Fixes https://github.com/alsa-project/alsa-ucm-conf/issues/124. The DTS configuration has had a unique audio card name since 5.14: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/tree/arc… This UCM config is copied from https://gitlab.com/pine64-org/pine64-alsa-ucm/, which is BSD-3-Clause licensed. I have tested that with this PR, the PinePhone has the expected HiFi and VoiceCall profiles.This testing found that the `File` directive in `SectionUseCase` needs to be absolute (for the symlink to work). I've fixed this in https://github.com/alsa-project/alsa-ucm-conf/pull/134/commits/5059e57a2197…. See also: * https://gitlab.com/pine64-org/pine64-alsa-ucm/-/merge_requests/1 * https://gitlab.com/pine64-org/pine64-alsa-ucm/-/issues/3 Request URL : https://github.com/alsa-project/alsa-ucm-conf/pull/134 Patch URL : https://github.com/alsa-project/alsa-ucm-conf/pull/134.patch Repository URL: https://github.com/alsa-project/alsa-ucm-conf

1 0

Add UCM for PinePhone
by GitHub pull_request - edited 07 Feb '22

07 Feb '22

alsa-project/alsa-ucm-conf pull request #134 was edited from tomfitzhenry: Fixes https://github.com/alsa-project/alsa-ucm-conf/issues/124. The DTS configuration has had a unique audio card name since 5.14: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/tree/arc… This UCM config is copied from https://gitlab.com/pine64-org/pine64-alsa-ucm/, which is BSD-3-Clause licensed. This UCM has been tested via Pulseaudio's ALSA_CONFIG_UCM2 environment variable, but I've not yet tested that this UCM, when included in this package, is correctly recognised on a PinePhone as part of this Todo: * [x] Test that this UCM is correctly recognised on a PinePhone. **Done**. This testing found that the `File` directive in `SectionUseCase` needs to be absolute (for the symlink to work). I've fixed this in https://github.com/alsa-project/alsa-ucm-conf/pull/134/commits/5059e57a2197…. See also: * https://gitlab.com/pine64-org/pine64-alsa-ucm/-/merge_requests/1 * https://gitlab.com/pine64-org/pine64-alsa-ucm/-/issues/3 Request URL : https://github.com/alsa-project/alsa-ucm-conf/pull/134 Patch URL : https://github.com/alsa-project/alsa-ucm-conf/pull/134.patch Repository URL: https://github.com/alsa-project/alsa-ucm-conf

1 0

WIP: Add UCM for PinePhone
by GitHub pull_request - edited 07 Feb '22

07 Feb '22

alsa-project/alsa-ucm-conf pull request #134 was edited from tomfitzhenry: Fixes https://github.com/alsa-project/alsa-ucm-conf/issues/124. The DTS configuration has had a unique audio card name since 5.14: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/tree/arc… This UCM config is copied from https://gitlab.com/pine64-org/pine64-alsa-ucm/, which is BSD-3-Clause licensed. This UCM has been tested via Pulseaudio's ALSA_CONFIG_UCM2 environment variable, but I've not yet tested that this UCM, when included in this package, is correctly recognised on a PinePhone as part of this Todo: * [x] Test that this UCM is correctly recognised on a PinePhone. **Done**. This testing found that the `File` directive in `SectionUseCase` needs to be absolute (for the symlink to work). I've fixed this in https://github.com/alsa-project/alsa-ucm-conf/pull/134/commits/5059e57a2197…. See also: * https://gitlab.com/pine64-org/pine64-alsa-ucm/-/merge_requests/1 * https://gitlab.com/pine64-org/pine64-alsa-ucm/-/issues/3 Request URL : https://github.com/alsa-project/alsa-ucm-conf/pull/134 Patch URL : https://github.com/alsa-project/alsa-ucm-conf/pull/134.patch Repository URL: https://github.com/alsa-project/alsa-ucm-conf

1 0

WIP: Add UCM for PinePhone
by GitHub pull_request - edited 07 Feb '22

07 Feb '22

alsa-project/alsa-ucm-conf pull request #134 was edited from tomfitzhenry: Fixes https://github.com/alsa-project/alsa-ucm-conf/issues/124. The DTS configuration has had a unique audio card name since 5.14: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/tree/arc… This UCM config is copied from https://gitlab.com/pine64-org/pine64-alsa-ucm/, which is BSD-3-Clause licensed. This UCM has been tested via Pulseaudio's ALSA_CONFIG_UCM2 environment variable, but I've not yet tested that this UCM, when included in this package, is correctly recognised on a PinePhone as part of this Todo: * [x] Test that this UCM is correctly recognised on a PinePhone. Done. This testing found that the `File` directive in `SectionUseCase` needs to be absolute (for the symlink to work). I've fixed this in https://github.com/alsa-project/alsa-ucm-conf/pull/134/commits/5059e57a2197…. See also: * https://gitlab.com/pine64-org/pine64-alsa-ucm/-/merge_requests/1 * https://gitlab.com/pine64-org/pine64-alsa-ucm/-/issues/3 Request URL : https://github.com/alsa-project/alsa-ucm-conf/pull/134 Patch URL : https://github.com/alsa-project/alsa-ucm-conf/pull/134.patch Repository URL: https://github.com/alsa-project/alsa-ucm-conf

1 0

WIP: Add UCM for PinePhone
by GitHub pull_request - edited 07 Feb '22

07 Feb '22

alsa-project/alsa-ucm-conf pull request #134 was edited from tomfitzhenry: Fixes https://github.com/alsa-project/alsa-ucm-conf/issues/124. The DTS configuration has had a unique audio card name since 5.14: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/tree/arc… This UCM config is copied from https://gitlab.com/pine64-org/pine64-alsa-ucm/, which is BSD-3-Clause licensed. This UCM has been tested via Pulseaudio's ALSA_CONFIG_UCM2 environment variable, but I've not yet tested that this UCM, when included in this package, is correctly recognised on a PinePhone as part of this Todo: * [x] Test that this UCM is correctly recognised on a PinePhone. See also: * https://gitlab.com/pine64-org/pine64-alsa-ucm/-/merge_requests/1 * https://gitlab.com/pine64-org/pine64-alsa-ucm/-/issues/3 Request URL : https://github.com/alsa-project/alsa-ucm-conf/pull/134 Patch URL : https://github.com/alsa-project/alsa-ucm-conf/pull/134.patch Repository URL: https://github.com/alsa-project/alsa-ucm-conf

1 0

Alsa applies noise cancelling when not desired
by GitHub issues - opened 04 Feb '22

04 Feb '22

alsa-project/alsa-lib issue #211 was opened from Martmists-GH: In my [original issue](https://gitlab.freedesktop.org/pulseaudio/pulseaudio/-/issues/1306) on pulseaudio I was told it was an alsa issue. Issue URL : https://github.com/alsa-project/alsa-lib/issues/211 Repository URL: https://github.com/alsa-project/alsa-lib

1 0

`alsatplg` compile error `undefined source widget/stream` and `undefined sink widget/stream`
by GitHub issues - edited 04 Feb '22

04 Feb '22

alsa-project/alsa-utils issue #142 was edited from LazyGeniusMan: Hi, I'm trying to do enable HDA+DMIC in my Kabylake R laptop using a guide[^1]. It's said to compile hda-dsp in [alsa-topology-conf](https://github.com/alsa-project/alsa-topology-conf), but I got this error: ``` [lazygeniusman@archlinux hda-dsp]$ alsatplg -c skl_hda_dsp_generic-tplg.conf -o skl_hda_dsp_generic-tplg.bin ALSA lib dapm.c:247:(tplg_build_routes) undefined source widget/stream 'hda-dsp-analog-playback' ALSA lib dapm.c:247:(tplg_build_routes) undefined source widget/stream 'hda-dsp-digital-playback' ALSA lib dapm.c:247:(tplg_build_routes) undefined source widget/stream 'hda-dsp-alt-analog-playback' ALSA lib dapm.c:225:(tplg_build_routes) undefined sink widget/stream 'hda-dsp-audio-analog-capture' ALSA lib dapm.c:225:(tplg_build_routes) undefined sink widget/stream 'hda-dsp-audio-digital-capture' ALSA lib dapm.c:225:(tplg_build_routes) undefined sink widget/stream 'hda-dsp-audio-alt-analog-capture' ALSA lib dapm.c:247:(tplg_build_routes) undefined source widget/stream 'HDMI1 Playback' ALSA lib dapm.c:247:(tplg_build_routes) undefined source widget/stream 'HDMI2 Playback' ALSA lib dapm.c:247:(tplg_build_routes) undefined source widget/stream 'HDMI3 Playback' ALSA lib dapm.c:225:(tplg_build_routes) undefined sink widget/stream 'DMIC-Capture' ``` it's also have same error when I run `make firmware` in the repo root dir Could someone help me solve it? EDIT1: error -13 solved but the undefined source and sink error still there [^1]: https://gist.github.com/crojewsk/4e6382bfb0dbfaaf60513174211f29cb#topology Issue URL : https://github.com/alsa-project/alsa-utils/issues/142 Repository URL: https://github.com/alsa-project/alsa-utils

1 0

[PATCH v3 1/2] kselftest: alsa: Check for event generation when we write to controls
by Mark Brown 04 Feb '22

04 Feb '22

Add some coverage of event generation to mixer-test. Rather than doing a separate set of writes designed to trigger events we add a step to the existing write_and_verify() which checks to see if the value we read back from non-volatile controls matches the value before writing and that an event is or isn't generated as appropriate. The "tests" for events then simply check that no spurious or missing events were detected. This avoids needing further logic to generate appropriate values for each control type and maximises coverage. When checking for events we use a timeout of 0. This relies on the kernel generating any event prior to returning to userspace when setting a control. That is currently the case and it is difficult to see it changing, if it does the test will need to be updated. Using a delay of 0 means that we don't slow things down unduly when checking for no event or when events fail to be generated. We don't check behaviour for volatile controls since we can't tell what the behaviour is supposed to be for any given control. Signed-off-by: Mark Brown <broonie(a)kernel.org> Reviewed-by: Shuah Khan <skhan(a)linuxfoundation.org> Reviewed-by: Jaroslav Kysela <perex(a)perex.cz> --- v3: - Add a check for a removal event when monitoring for events, if one is seen then return an error. v2: - Get the numid from the API rather than using the control index. tools/testing/selftests/alsa/mixer-test.c | 154 +++++++++++++++++++++- 1 file changed, 151 insertions(+), 3 deletions(-) diff --git a/tools/testing/selftests/alsa/mixer-test.c b/tools/testing/selftests/alsa/mixer-test.c index 0e88f4f3d802..6edb7dca32af 100644 --- a/tools/testing/selftests/alsa/mixer-test.c +++ b/tools/testing/selftests/alsa/mixer-test.c @@ -3,7 +3,7 @@ // kselftest for the ALSA mixer API // // Original author: Mark Brown <broonie(a)kernel.org> -// Copyright (c) 2021 Arm Limited +// Copyright (c) 2021-2 Arm Limited // This test will iterate over all cards detected in the system, exercising // every mixer control it can find. This may conflict with other system @@ -27,11 +27,12 @@ #include "../kselftest.h" -#define TESTS_PER_CONTROL 4 +#define TESTS_PER_CONTROL 6 struct card_data { snd_ctl_t *handle; int card; + struct pollfd pollfd; int num_ctls; snd_ctl_elem_list_t *ctls; struct card_data *next; @@ -43,6 +44,8 @@ struct ctl_data { snd_ctl_elem_info_t *info; snd_ctl_elem_value_t *def_val; int elem; + int event_missing; + int event_spurious; struct card_data *card; struct ctl_data *next; }; @@ -149,6 +152,7 @@ void find_controls(void) if (!ctl_data) ksft_exit_fail_msg("Out of memory\n"); + memset(ctl_data, 0, sizeof(*ctl_data)); ctl_data->card = card_data; ctl_data->elem = ctl; ctl_data->name = snd_ctl_elem_list_get_name(card_data->ctls, @@ -184,6 +188,26 @@ void find_controls(void) ctl_list = ctl_data; } + /* Set up for events */ + err = snd_ctl_subscribe_events(card_data->handle, true); + if (err < 0) { + ksft_exit_fail_msg("snd_ctl_subscribe_events() failed for card %d: %d\n", + card, err); + } + + err = snd_ctl_poll_descriptors_count(card_data->handle); + if (err != 1) { + ksft_exit_fail_msg("Unexpected desciptor count %d for card %d\n", + err, card); + } + + err = snd_ctl_poll_descriptors(card_data->handle, + &card_data->pollfd, 1); + if (err != 1) { + ksft_exit_fail_msg("snd_ctl_poll_descriptors() failed for %d\n", + card, err); + } + next_card: if (snd_card_next(&card) < 0) { ksft_print_msg("snd_card_next"); @@ -194,6 +218,79 @@ void find_controls(void) snd_config_delete(config); } +/* + * Block for up to timeout ms for an event, returns a negative value + * on error, 0 for no event and 1 for an event. + */ +int wait_for_event(struct ctl_data *ctl, int timeout) +{ + unsigned short revents; + snd_ctl_event_t *event; + int count, err; + unsigned int mask = 0; + unsigned int ev_id; + + snd_ctl_event_alloca(&event); + + do { + err = poll(&(ctl->card->pollfd), 1, timeout); + if (err < 0) { + ksft_print_msg("poll() failed for %s: %s (%d)\n", + ctl->name, strerror(errno), errno); + return -1; + } + /* Timeout */ + if (err == 0) + return 0; + + err = snd_ctl_poll_descriptors_revents(ctl->card->handle, + &(ctl->card->pollfd), + 1, &revents); + if (err < 0) { + ksft_print_msg("snd_ctl_poll_desciptors_revents() failed for %s: %d\n", + ctl->name, err); + return err; + } + if (revents & POLLERR) { + ksft_print_msg("snd_ctl_poll_desciptors_revents() reported POLLERR for %s\n", + ctl->name); + return -1; + } + /* No read events */ + if (!(revents & POLLIN)) { + ksft_print_msg("No POLLIN\n"); + continue; + } + + err = snd_ctl_read(ctl->card->handle, event); + if (err < 0) { + ksft_print_msg("snd_ctl_read() failed for %s: %d\n", + ctl->name, err); + return err; + } + + if (snd_ctl_event_get_type(event) != SND_CTL_EVENT_ELEM) + continue; + + /* The ID returned from the event is 1 less than numid */ + mask = snd_ctl_event_elem_get_mask(event); + ev_id = snd_ctl_event_elem_get_numid(event); + if (ev_id != snd_ctl_elem_info_get_numid(ctl->info)) { + ksft_print_msg("Event for unexpected ctl %s\n", + snd_ctl_event_elem_get_name(event)); + continue; + } + + if ((mask & SND_CTL_EVENT_MASK_REMOVE) == SND_CTL_EVENT_MASK_REMOVE) { + ksft_print_msg("Removal event for %s\n", + ctl->name); + return -1; + } + } while ((mask & SND_CTL_EVENT_MASK_VALUE) != SND_CTL_EVENT_MASK_VALUE); + + return 1; +} + bool ctl_value_index_valid(struct ctl_data *ctl, snd_ctl_elem_value_t *val, int index) { @@ -428,7 +525,8 @@ int write_and_verify(struct ctl_data *ctl, { int err, i; bool error_expected, mismatch_shown; - snd_ctl_elem_value_t *read_val, *w_val; + snd_ctl_elem_value_t *initial_val, *read_val, *w_val; + snd_ctl_elem_value_alloca(&initial_val); snd_ctl_elem_value_alloca(&read_val); snd_ctl_elem_value_alloca(&w_val); @@ -446,6 +544,18 @@ int write_and_verify(struct ctl_data *ctl, snd_ctl_elem_value_copy(expected_val, write_val); } + /* Store the value before we write */ + if (snd_ctl_elem_info_is_readable(ctl->info)) { + snd_ctl_elem_value_set_id(initial_val, ctl->id); + + err = snd_ctl_elem_read(ctl->card->handle, initial_val); + if (err < 0) { + ksft_print_msg("snd_ctl_elem_read() failed: %s\n", + snd_strerror(err)); + return err; + } + } + /* * Do the write, if we have an expected value ignore the error * and carry on to validate the expected value. @@ -470,6 +580,30 @@ int write_and_verify(struct ctl_data *ctl, return err; } + /* + * Check for an event if the value changed, or confirm that + * there was none if it didn't. We rely on the kernel + * generating the notification before it returns from the + * write, this is currently true, should that ever change this + * will most likely break and need updating. + */ + if (!snd_ctl_elem_info_is_volatile(ctl->info)) { + err = wait_for_event(ctl, 0); + if (snd_ctl_elem_value_compare(initial_val, read_val)) { + if (err < 1) { + ksft_print_msg("No event generated for %s\n", + ctl->name); + ctl->event_missing++; + } + } else { + if (err != 0) { + ksft_print_msg("Spurious event generated for %s\n", + ctl->name); + ctl->event_spurious++; + } + } + } + /* * Use the libray to compare values, if there's a mismatch * carry on and try to provide a more useful diagnostic than @@ -898,6 +1032,18 @@ void test_ctl_write_invalid(struct ctl_data *ctl) ctl->card->card, ctl->elem); } +void test_ctl_event_missing(struct ctl_data *ctl) +{ + ksft_test_result(!ctl->event_missing, "event_missing.%d.%d\n", + ctl->card->card, ctl->elem); +} + +void test_ctl_event_spurious(struct ctl_data *ctl) +{ + ksft_test_result(!ctl->event_spurious, "event_spurious.%d.%d\n", + ctl->card->card, ctl->elem); +} + int main(void) { struct ctl_data *ctl; @@ -917,6 +1063,8 @@ int main(void) test_ctl_write_default(ctl); test_ctl_write_valid(ctl); test_ctl_write_invalid(ctl); + test_ctl_event_missing(ctl); + test_ctl_event_spurious(ctl); } ksft_exit_pass(); -- 2.30.2

2 3

Re: [syzbot] possible deadlock in snd_timer_interrupt (2)
by syzbot 04 Feb '22

04 Feb '22

syzbot has found a reproducer for the following issue on: HEAD commit: 1f2cfdd349b7 printk: Fix incorrect __user type in proc_doi.. git tree: upstream console output: https://syzkaller.appspot.com/x/log.txt?x=146fce24700000 kernel config: https://syzkaller.appspot.com/x/.config?x=b4a89edfcc8f7c74 dashboard link: https://syzkaller.appspot.com/bug?extid=1ee0910eca9c94f71f25 compiler: gcc (Debian 10.2.1-6) 10.2.1 20210110, GNU ld (GNU Binutils for Debian) 2.35.2 syz repro: https://syzkaller.appspot.com/x/repro.syz?x=1007e462700000 IMPORTANT: if you fix the issue, please add the following tag to the commit: Reported-by: syzbot+1ee0910eca9c94f71f25(a)syzkaller.appspotmail.com ======================================================== WARNING: possible irq lock inversion dependency detected 5.17.0-rc2-syzkaller-00071-g1f2cfdd349b7 #0 Not tainted -------------------------------------------------------- syz-executor.3/4250 just changed the state of lock: ffff88814a62e148 (&timer->lock){..-.}-{2:2}, at: snd_timer_interrupt.part.0+0x34/0xcf0 sound/core/timer.c:856 but this lock took another, SOFTIRQ-READ-unsafe lock in the past: (tasklist_lock){.+.+}-{2:2} and interrupts could create inverse lock ordering between them. other info that might help us debug this: Chain exists of: &timer->lock --> &new->fa_lock --> tasklist_lock Possible interrupt unsafe locking scenario: CPU0 CPU1 ---- ---- lock(tasklist_lock); local_irq_disable(); lock(&timer->lock); lock(&new->fa_lock); <Interrupt> lock(&timer->lock); *** DEADLOCK *** 2 locks held by syz-executor.3/4250: #0: ffff88807efef828 (&mm->mmap_lock#2){++++}-{3:3}, at: __might_fault+0xa1/0x170 mm/memory.c:5271 #1: ffffc90000dc0d70 ((&priv->tlist)){+.-.}-{0:0}, at: lockdep_copy_map include/linux/lockdep.h:35 [inline] #1: ffffc90000dc0d70 ((&priv->tlist)){+.-.}-{0:0}, at: call_timer_fn+0xd5/0x6b0 kernel/time/timer.c:1411 the shortest dependencies between 2nd lock and 1st lock: -> (tasklist_lock){.+.+}-{2:2} { HARDIRQ-ON-R at: lock_acquire kernel/locking/lockdep.c:5639 [inline] lock_acquire+0x1ab/0x510 kernel/locking/lockdep.c:5604 __raw_read_lock include/linux/rwlock_api_smp.h:150 [inline] _raw_read_lock+0x5b/0x70 kernel/locking/spinlock.c:228 do_wait+0x284/0xce0 kernel/exit.c:1518 kernel_wait+0x9c/0x150 kernel/exit.c:1708 call_usermodehelper_exec_sync kernel/umh.c:139 [inline] call_usermodehelper_exec_work+0xf5/0x180 kernel/umh.c:166 process_one_work+0x9ac/0x1650 kernel/workqueue.c:2307 worker_thread+0x657/0x1110 kernel/workqueue.c:2454 kthread+0x2e9/0x3a0 kernel/kthread.c:377 ret_from_fork+0x1f/0x30 arch/x86/entry/entry_64.S:295 SOFTIRQ-ON-R at: lock_acquire kernel/locking/lockdep.c:5639 [inline] lock_acquire+0x1ab/0x510 kernel/locking/lockdep.c:5604 __raw_read_lock include/linux/rwlock_api_smp.h:150 [inline] _raw_read_lock+0x5b/0x70 kernel/locking/spinlock.c:228 do_wait+0x284/0xce0 kernel/exit.c:1518 kernel_wait+0x9c/0x150 kernel/exit.c:1708 call_usermodehelper_exec_sync kernel/umh.c:139 [inline] call_usermodehelper_exec_work+0xf5/0x180 kernel/umh.c:166 process_one_work+0x9ac/0x1650 kernel/workqueue.c:2307 worker_thread+0x657/0x1110 kernel/workqueue.c:2454 kthread+0x2e9/0x3a0 kernel/kthread.c:377 ret_from_fork+0x1f/0x30 arch/x86/entry/entry_64.S:295 INITIAL USE at: lock_acquire kernel/locking/lockdep.c:5639 [inline] lock_acquire+0x1ab/0x510 kernel/locking/lockdep.c:5604 __raw_write_lock_irq include/linux/rwlock_api_smp.h:195 [inline] _raw_write_lock_irq+0x32/0x50 kernel/locking/spinlock.c:326 copy_process+0x47da/0x7300 kernel/fork.c:2284 kernel_clone+0xe7/0xab0 kernel/fork.c:2555 kernel_thread+0xb5/0xf0 kernel/fork.c:2607 rest_init+0x23/0x3e0 init/main.c:690 start_kernel+0x47a/0x49b init/main.c:1138 secondary_startup_64_no_verify+0xc3/0xcb INITIAL READ USE at: lock_acquire kernel/locking/lockdep.c:5639 [inline] lock_acquire+0x1ab/0x510 kernel/locking/lockdep.c:5604 __raw_read_lock include/linux/rwlock_api_smp.h:150 [inline] _raw_read_lock+0x5b/0x70 kernel/locking/spinlock.c:228 do_wait+0x284/0xce0 kernel/exit.c:1518 kernel_wait+0x9c/0x150 kernel/exit.c:1708 call_usermodehelper_exec_sync kernel/umh.c:139 [inline] call_usermodehelper_exec_work+0xf5/0x180 kernel/umh.c:166 process_one_work+0x9ac/0x1650 kernel/workqueue.c:2307 worker_thread+0x657/0x1110 kernel/workqueue.c:2454 kthread+0x2e9/0x3a0 kernel/kthread.c:377 ret_from_fork+0x1f/0x30 arch/x86/entry/entry_64.S:295 } ... key at: [<ffffffff8b80a098>] tasklist_lock+0x18/0x40 ... acquired at: __raw_read_lock include/linux/rwlock_api_smp.h:150 [inline] _raw_read_lock+0x5b/0x70 kernel/locking/spinlock.c:228 send_sigio+0xab/0x380 fs/fcntl.c:810 kill_fasync_rcu fs/fcntl.c:1021 [inline] kill_fasync fs/fcntl.c:1035 [inline] kill_fasync+0x1f8/0x470 fs/fcntl.c:1028 sock_wake_async+0xd2/0x160 net/socket.c:1372 sk_wake_async include/net/sock.h:2444 [inline] sk_wake_async include/net/sock.h:2440 [inline] sock_def_readable+0x349/0x4e0 net/core/sock.c:3149 unix_dgram_sendmsg+0xf30/0x1a10 net/unix/af_unix.c:2029 sock_sendmsg_nosec net/socket.c:705 [inline] sock_sendmsg+0xcf/0x120 net/socket.c:725 ____sys_sendmsg+0x331/0x810 net/socket.c:2413 ___sys_sendmsg+0xf3/0x170 net/socket.c:2467 __sys_sendmmsg+0x195/0x470 net/socket.c:2553 __do_sys_sendmmsg net/socket.c:2582 [inline] __se_sys_sendmmsg net/socket.c:2579 [inline] __x64_sys_sendmmsg+0x99/0x100 net/socket.c:2579 do_syscall_x64 arch/x86/entry/common.c:50 [inline] do_syscall_64+0x35/0xb0 arch/x86/entry/common.c:80 entry_SYSCALL_64_after_hwframe+0x44/0xae -> (&f->f_owner.lock){....}-{2:2} { INITIAL USE at: lock_acquire kernel/locking/lockdep.c:5639 [inline] lock_acquire+0x1ab/0x510 kernel/locking/lockdep.c:5604 __raw_write_lock_irq include/linux/rwlock_api_smp.h:195 [inline] _raw_write_lock_irq+0x32/0x50 kernel/locking/spinlock.c:326 f_modown+0x2a/0x390 fs/fcntl.c:91 __f_setown fs/fcntl.c:110 [inline] f_setown+0xd7/0x230 fs/fcntl.c:138 sock_ioctl+0x37e/0x640 net/socket.c:1182 vfs_ioctl fs/ioctl.c:51 [inline] __do_sys_ioctl fs/ioctl.c:874 [inline] __se_sys_ioctl fs/ioctl.c:860 [inline] __x64_sys_ioctl+0x193/0x200 fs/ioctl.c:860 do_syscall_x64 arch/x86/entry/common.c:50 [inline] do_syscall_64+0x35/0xb0 arch/x86/entry/common.c:80 entry_SYSCALL_64_after_hwframe+0x44/0xae INITIAL READ USE at: lock_acquire kernel/locking/lockdep.c:5639 [inline] lock_acquire+0x1ab/0x510 kernel/locking/lockdep.c:5604 __raw_read_lock_irqsave include/linux/rwlock_api_smp.h:160 [inline] _raw_read_lock_irqsave+0x70/0x90 kernel/locking/spinlock.c:236 send_sigio+0x24/0x380 fs/fcntl.c:796 kill_fasync_rcu fs/fcntl.c:1021 [inline] kill_fasync fs/fcntl.c:1035 [inline] kill_fasync+0x1f8/0x470 fs/fcntl.c:1028 snd_timer_user_ccallback+0x298/0x330 sound/core/timer.c:1386 snd_timer_notify1+0x11c/0x3b0 sound/core/timer.c:516 snd_timer_start1+0x4d4/0x800 sound/core/timer.c:578 snd_timer_start sound/core/timer.c:696 [inline] snd_timer_start sound/core/timer.c:689 [inline] snd_timer_user_start.isra.0+0x1e3/0x260 sound/core/timer.c:1984 __snd_timer_user_ioctl.isra.0+0xda8/0x2490 sound/core/timer.c:2107 snd_timer_user_ioctl+0x77/0xb0 sound/core/timer.c:2128 vfs_ioctl fs/ioctl.c:51 [inline] __do_sys_ioctl fs/ioctl.c:874 [inline] __se_sys_ioctl fs/ioctl.c:860 [inline] __x64_sys_ioctl+0x193/0x200 fs/ioctl.c:860 do_syscall_x64 arch/x86/entry/common.c:50 [inline] do_syscall_64+0x35/0xb0 arch/x86/entry/common.c:80 entry_SYSCALL_64_after_hwframe+0x44/0xae } ... key at: [<ffffffff9057ea40>] __key.5+0x0/0x40 ... acquired at: __raw_read_lock_irqsave include/linux/rwlock_api_smp.h:160 [inline] _raw_read_lock_irqsave+0x70/0x90 kernel/locking/spinlock.c:236 send_sigio+0x24/0x380 fs/fcntl.c:796 kill_fasync_rcu fs/fcntl.c:1021 [inline] kill_fasync fs/fcntl.c:1035 [inline] kill_fasync+0x1f8/0x470 fs/fcntl.c:1028 snd_timer_user_ccallback+0x298/0x330 sound/core/timer.c:1386 snd_timer_notify1+0x11c/0x3b0 sound/core/timer.c:516 snd_timer_start1+0x4d4/0x800 sound/core/timer.c:578 snd_timer_start sound/core/timer.c:696 [inline] snd_timer_start sound/core/timer.c:689 [inline] snd_timer_user_start.isra.0+0x1e3/0x260 sound/core/timer.c:1984 __snd_timer_user_ioctl.isra.0+0xda8/0x2490 sound/core/timer.c:2107 snd_timer_user_ioctl+0x77/0xb0 sound/core/timer.c:2128 vfs_ioctl fs/ioctl.c:51 [inline] __do_sys_ioctl fs/ioctl.c:874 [inline] __se_sys_ioctl fs/ioctl.c:860 [inline] __x64_sys_ioctl+0x193/0x200 fs/ioctl.c:860 do_syscall_x64 arch/x86/entry/common.c:50 [inline] do_syscall_64+0x35/0xb0 arch/x86/entry/common.c:80 entry_SYSCALL_64_after_hwframe+0x44/0xae -> (&new->fa_lock){....}-{2:2} { INITIAL USE at: lock_acquire kernel/locking/lockdep.c:5639 [inline] lock_acquire+0x1ab/0x510 kernel/locking/lockdep.c:5604 __raw_write_lock_irq include/linux/rwlock_api_smp.h:195 [inline] _raw_write_lock_irq+0x32/0x50 kernel/locking/spinlock.c:326 fasync_remove_entry+0xb6/0x1f0 fs/fcntl.c:891 fasync_helper+0x9e/0xb0 fs/fcntl.c:994 __fput+0x846/0x9f0 fs/file_table.c:308 task_work_run+0xdd/0x1a0 kernel/task_work.c:164 tracehook_notify_resume include/linux/tracehook.h:188 [inline] exit_to_user_mode_loop kernel/entry/common.c:175 [inline] exit_to_user_mode_prepare+0x27e/0x290 kernel/entry/common.c:207 __syscall_exit_to_user_mode_work kernel/entry/common.c:289 [inline] syscall_exit_to_user_mode+0x19/0x60 kernel/entry/common.c:300 do_syscall_64+0x42/0xb0 arch/x86/entry/common.c:86 entry_SYSCALL_64_after_hwframe+0x44/0xae INITIAL READ USE at: lock_acquire kernel/locking/lockdep.c:5639 [inline] lock_acquire+0x1ab/0x510 kernel/locking/lockdep.c:5604 __raw_read_lock_irqsave include/linux/rwlock_api_smp.h:160 [inline] _raw_read_lock_irqsave+0x70/0x90 kernel/locking/spinlock.c:236 kill_fasync_rcu fs/fcntl.c:1014 [inline] kill_fasync fs/fcntl.c:1035 [inline] kill_fasync+0x136/0x470 fs/fcntl.c:1028 snd_timer_user_ccallback+0x298/0x330 sound/core/timer.c:1386 snd_timer_notify1+0x11c/0x3b0 sound/core/timer.c:516 snd_timer_start1+0x4d4/0x800 sound/core/timer.c:578 snd_timer_start sound/core/timer.c:696 [inline] snd_timer_start sound/core/timer.c:689 [inline] snd_timer_user_start.isra.0+0x1e3/0x260 sound/core/timer.c:1984 __snd_timer_user_ioctl.isra.0+0xda8/0x2490 sound/core/timer.c:2107 snd_timer_user_ioctl+0x77/0xb0 sound/core/timer.c:2128 vfs_ioctl fs/ioctl.c:51 [inline] __do_sys_ioctl fs/ioctl.c:874 [inline] __se_sys_ioctl fs/ioctl.c:860 [inline] __x64_sys_ioctl+0x193/0x200 fs/ioctl.c:860 do_syscall_x64 arch/x86/entry/common.c:50 [inline] do_syscall_64+0x35/0xb0 arch/x86/entry/common.c:80 entry_SYSCALL_64_after_hwframe+0x44/0xae } ... key at: [<ffffffff9057f820>] __key.0+0x0/0x40 ... acquired at: __raw_read_lock_irqsave include/linux/rwlock_api_smp.h:160 [inline] _raw_read_lock_irqsave+0x70/0x90 kernel/locking/spinlock.c:236 kill_fasync_rcu fs/fcntl.c:1014 [inline] kill_fasync fs/fcntl.c:1035 [inline] kill_fasync+0x136/0x470 fs/fcntl.c:1028 snd_timer_user_ccallback+0x298/0x330 sound/core/timer.c:1386 snd_timer_notify1+0x11c/0x3b0 sound/core/timer.c:516 snd_timer_start1+0x4d4/0x800 sound/core/timer.c:578 snd_timer_start sound/core/timer.c:696 [inline] snd_timer_start sound/core/timer.c:689 [inline] snd_timer_user_start.isra.0+0x1e3/0x260 sound/core/timer.c:1984 __snd_timer_user_ioctl.isra.0+0xda8/0x2490 sound/core/timer.c:2107 snd_timer_user_ioctl+0x77/0xb0 sound/core/timer.c:2128 vfs_ioctl fs/ioctl.c:51 [inline] __do_sys_ioctl fs/ioctl.c:874 [inline] __se_sys_ioctl fs/ioctl.c:860 [inline] __x64_sys_ioctl+0x193/0x200 fs/ioctl.c:860 do_syscall_x64 arch/x86/entry/common.c:50 [inline] do_syscall_64+0x35/0xb0 arch/x86/entry/common.c:80 entry_SYSCALL_64_after_hwframe+0x44/0xae -> (&timer->lock){..-.}-{2:2} { IN-SOFTIRQ-W at: lock_acquire kernel/locking/lockdep.c:5639 [inline] lock_acquire+0x1ab/0x510 kernel/locking/lockdep.c:5604 __raw_spin_lock_irqsave include/linux/spinlock_api_smp.h:110 [inline] _raw_spin_lock_irqsave+0x39/0x50 kernel/locking/spinlock.c:162 snd_timer_interrupt.part.0+0x34/0xcf0 sound/core/timer.c:856 snd_timer_interrupt sound/core/timer.c:1154 [inline] snd_timer_s_function+0x14b/0x200 sound/core/timer.c:1154 call_timer_fn+0x1a5/0x6b0 kernel/time/timer.c:1421 expire_timers kernel/time/timer.c:1466 [inline] __run_timers.part.0+0x67c/0xa30 kernel/time/timer.c:1734 __run_timers kernel/time/timer.c:1715 [inline] run_timer_softirq+0xb3/0x1d0 kernel/time/timer.c:1747 __do_softirq+0x29b/0x9c2 kernel/softirq.c:558 invoke_softirq kernel/softirq.c:432 [inline] __irq_exit_rcu+0x123/0x180 kernel/softirq.c:637 irq_exit_rcu+0x5/0x20 kernel/softirq.c:649 sysvec_apic_timer_interrupt+0x93/0xc0 arch/x86/kernel/apic/apic.c:1097 asm_sysvec_apic_timer_interrupt+0x12/0x20 arch/x86/include/asm/idtentry.h:638 kasan_check_range+0x0/0x180 mm/kasan/generic.c:349 instrument_atomic_read include/linux/instrumented.h:71 [inline] test_bit include/asm-generic/bitops/instrumented-non-atomic.h:134 [inline] cpumask_test_cpu include/linux/cpumask.h:379 [inline] cpu_online include/linux/cpumask.h:921 [inline] trace_lock_release include/trace/events/lock.h:58 [inline] lock_release+0xa1/0x720 kernel/locking/lockdep.c:5650 __might_fault mm/memory.c:5272 [inline] __might_fault+0x142/0x170 mm/memory.c:5257 _copy_from_user+0x27/0x180 lib/usercopy.c:13 copy_from_user include/linux/uaccess.h:192 [inline] snd_seq_oss_write+0x38b/0x780 sound/core/seq/oss/seq_oss_rw.c:93 odev_write+0x55/0x90 sound/core/seq/oss/seq_oss.c:168 vfs_write+0x28e/0xae0 fs/read_write.c:588 ksys_write+0x12d/0x250 fs/read_write.c:643 do_syscall_x64 arch/x86/entry/common.c:50 [inline] do_syscall_64+0x35/0xb0 arch/x86/entry/common.c:80 entry_SYSCALL_64_after_hwframe+0x44/0xae INITIAL USE at: lock_acquire kernel/locking/lockdep.c:5639 [inline] lock_acquire+0x1ab/0x510 kernel/locking/lockdep.c:5604 __raw_spin_lock_irqsave include/linux/spinlock_api_smp.h:110 [inline] _raw_spin_lock_irqsave+0x39/0x50 kernel/locking/spinlock.c:162 snd_timer_resolution+0x55/0x100 sound/core/timer.c:489 snd_timer_user_params.isra.0+0x18e/0x8c0 sound/core/timer.c:1851 __snd_timer_user_ioctl.isra.0+0x1020/0x2490 sound/core/timer.c:2100 snd_timer_user_ioctl+0x77/0xb0 sound/core/timer.c:2128 vfs_ioctl fs/ioctl.c:51 [inline] __do_sys_ioctl fs/ioctl.c:874 [inline] __se_sys_ioctl fs/ioctl.c:860 [inline] __x64_sys_ioctl+0x193/0x200 fs/ioctl.c:860 do_syscall_x64 arch/x86/entry/common.c:50 [inline] do_syscall_64+0x35/0xb0 arch/x86/entry/common.c:80 entry_SYSCALL_64_after_hwframe+0x44/0xae } ... key at: [<ffffffff9087d3c0>] __key.12+0x0/0x40 ... acquired at: mark_usage kernel/locking/lockdep.c:4500 [inline] __lock_acquire+0x11d2/0x5470 kernel/locking/lockdep.c:4981 lock_acquire kernel/locking/lockdep.c:5639 [inline] lock_acquire+0x1ab/0x510 kernel/locking/lockdep.c:5604 __raw_spin_lock_irqsave include/linux/spinlock_api_smp.h:110 [inline] _raw_spin_lock_irqsave+0x39/0x50 kernel/locking/spinlock.c:162 snd_timer_interrupt.part.0+0x34/0xcf0 sound/core/timer.c:856 snd_timer_interrupt sound/core/timer.c:1154 [inline] snd_timer_s_function+0x14b/0x200 sound/core/timer.c:1154 call_timer_fn+0x1a5/0x6b0 kernel/time/timer.c:1421 expire_timers kernel/time/timer.c:1466 [inline] __run_timers.part.0+0x67c/0xa30 kernel/time/timer.c:1734 __run_timers kernel/time/timer.c:1715 [inline] run_timer_softirq+0xb3/0x1d0 kernel/time/timer.c:1747 __do_softirq+0x29b/0x9c2 kernel/softirq.c:558 invoke_softirq kernel/softirq.c:432 [inline] __irq_exit_rcu+0x123/0x180 kernel/softirq.c:637 irq_exit_rcu+0x5/0x20 kernel/softirq.c:649 sysvec_apic_timer_interrupt+0x93/0xc0 arch/x86/kernel/apic/apic.c:1097 asm_sysvec_apic_timer_interrupt+0x12/0x20 arch/x86/include/asm/idtentry.h:638 kasan_check_range+0x0/0x180 mm/kasan/generic.c:349 instrument_atomic_read include/linux/instrumented.h:71 [inline] test_bit include/asm-generic/bitops/instrumented-non-atomic.h:134 [inline] cpumask_test_cpu include/linux/cpumask.h:379 [inline] cpu_online include/linux/cpumask.h:921 [inline] trace_lock_release include/trace/events/lock.h:58 [inline] lock_release+0xa1/0x720 kernel/locking/lockdep.c:5650 __might_fault mm/memory.c:5272 [inline] __might_fault+0x142/0x170 mm/memory.c:5257 _copy_from_user+0x27/0x180 lib/usercopy.c:13 copy_from_user include/linux/uaccess.h:192 [inline] snd_seq_oss_write+0x38b/0x780 sound/core/seq/oss/seq_oss_rw.c:93 odev_write+0x55/0x90 sound/core/seq/oss/seq_oss.c:168 vfs_write+0x28e/0xae0 fs/read_write.c:588 ksys_write+0x12d/0x250 fs/read_write.c:643 do_syscall_x64 arch/x86/entry/common.c:50 [inline] do_syscall_64+0x35/0xb0 arch/x86/entry/common.c:80 entry_SYSCALL_64_after_hwframe+0x44/0xae stack backtrace: CPU: 1 PID: 4250 Comm: syz-executor.3 Not tainted 5.17.0-rc2-syzkaller-00071-g1f2cfdd349b7 #0 Hardware name: Google Google Compute Engine/Google Compute Engine, BIOS Google 01/01/2011 Call Trace: <IRQ> __dump_stack lib/dump_stack.c:88 [inline] dump_stack_lvl+0xcd/0x134 lib/dump_stack.c:106

1 0

[PATCH] ASoC: madera: Add dependencies on MFD
by Charles Keepax 03 Feb '22

03 Feb '22

The Madera CODECs use regmap_irq functions but nothing ensures that regmap_irq is built into the kernel. Add dependencies on the ASoC symbols for the relevant MFD component. There is no point in building the ASoC driver if the MFD doesn't support it and the MFD part contains the necessary dependencies to ensure everything is built into the kernel. Reported-by: Mark Brown <broonie(a)kernel.org> Signed-off-by: Charles Keepax <ckeepax(a)opensource.cirrus.com> --- sound/soc/codecs/Kconfig | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/sound/soc/codecs/Kconfig b/sound/soc/codecs/Kconfig index d6b8f5cb6ef8b..68ad04ab3349c 100644 --- a/sound/soc/codecs/Kconfig +++ b/sound/soc/codecs/Kconfig @@ -733,6 +733,7 @@ config SND_SOC_CS4349 config SND_SOC_CS47L15 tristate + depends on MFD_CS47L15 config SND_SOC_CS47L24 tristate @@ -740,15 +741,19 @@ config SND_SOC_CS47L24 config SND_SOC_CS47L35 tristate + depends on MFD_CS47L35 config SND_SOC_CS47L85 tristate + depends on MFD_CS47L85 config SND_SOC_CS47L90 tristate + depends on MFD_CS47L90 config SND_SOC_CS47L92 tristate + depends on MFD_CS47L92 # Cirrus Logic Quad-Channel ADC config SND_SOC_CS53L30 -- 2.11.0

2 1

[PATCH 0/3] ASoC: sun4i-i2s: Support for Allwinner R329 and D1 SoCs
by Samuel Holland 03 Feb '22

03 Feb '22

This series extends the sun4i-i2s binding and driver to support some newer versions of the hardware. Each instance of the hardwar now has multiple input/output pins, and channels can be muxed between them. Since so far the driver only supports a "default" linear channel map, the driver changes are minimal. Samuel Holland (3): ASoC: dt-bindings: sun4i-i2s: Add compatibles for R329 and D1 ASoC: sun4i-i2s: Update registers for more channels ASoC: sun4i-i2s: Add support for the R329/D1 variant .../sound/allwinner,sun4i-a10-i2s.yaml | 5 ++ sound/soc/sunxi/sun4i-i2s.c | 68 +++++++++++++++---- 2 files changed, 59 insertions(+), 14 deletions(-) -- 2.33.1

3 5

[PATCH] ASoC: samsung: Explicitly include gpiolib header
by Mark Brown 03 Feb '22

03 Feb '22

midas_wm811 uses gpiolib but relies on the header being implicitly included which can lead to build failures in some configurations, explicitly pull the header in to avoid problems. Signed-off-by: Mark Brown <broonie(a)kernel.org> --- sound/soc/samsung/midas_wm1811.c | 1 + 1 file changed, 1 insertion(+) diff --git a/sound/soc/samsung/midas_wm1811.c b/sound/soc/samsung/midas_wm1811.c index a2019535a0b1..5e9dc18687cc 100644 --- a/sound/soc/samsung/midas_wm1811.c +++ b/sound/soc/samsung/midas_wm1811.c @@ -6,6 +6,7 @@ // Copyright (C) 2020 Samsung Electronics Co., Ltd. #include <linux/clk.h> +#include <linux/gpio/consumer.h> #include <linux/mfd/wm8994/registers.h> #include <linux/module.h> #include <linux/of.h> -- 2.30.2

2 2

[PATCH] ASoC: amd: acp: Set gpio_spkr_en to None for max speaker amplifer in machine driver
by V sujith kumar Reddy 03 Feb '22

03 Feb '22

Maxim codec driver already enabling/disabling spk_en_gpio in form of sd_mode gpio hence remove such gpio access control from machine driver to avoid conflict Signed-off-by: V sujith kumar Reddy <vsujithkumar.reddy(a)amd.com> --- sound/soc/amd/acp/acp-mach.h | 1 - sound/soc/amd/acp/acp-sof-mach.c | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/sound/soc/amd/acp/acp-mach.h b/sound/soc/amd/acp/acp-mach.h index fd6299844ebe..c855f50d6b34 100644 --- a/sound/soc/amd/acp/acp-mach.h +++ b/sound/soc/amd/acp/acp-mach.h @@ -21,7 +21,6 @@ #include <linux/gpio/consumer.h> #define EN_SPKR_GPIO_GB 0x11F -#define EN_SPKR_GPIO_NK 0x146 #define EN_SPKR_GPIO_NONE -EINVAL enum be_id { diff --git a/sound/soc/amd/acp/acp-sof-mach.c b/sound/soc/amd/acp/acp-sof-mach.c index c1d9650fc222..3346677949e3 100644 --- a/sound/soc/amd/acp/acp-sof-mach.c +++ b/sound/soc/amd/acp/acp-sof-mach.c @@ -37,7 +37,7 @@ static struct acp_card_drvdata sof_rt5682_max_data = { .hs_codec_id = RT5682, .amp_codec_id = MAX98360A, .dmic_codec_id = DMIC, - .gpio_spkr_en = EN_SPKR_GPIO_NK, + .gpio_spkr_en = EN_SPKR_GPIO_NONE, }; static struct acp_card_drvdata sof_rt5682s_rt1019_data = { @@ -56,7 +56,7 @@ static struct acp_card_drvdata sof_rt5682s_max_data = { .hs_codec_id = RT5682S, .amp_codec_id = MAX98360A, .dmic_codec_id = DMIC, - .gpio_spkr_en = EN_SPKR_GPIO_NK, + .gpio_spkr_en = EN_SPKR_GPIO_NONE, }; static const struct snd_kcontrol_new acp_controls[] = { -- 2.25.1

3 4

[PATCH] ASoC: cs47l15: Ensure regmap_irq is built
by Mark Brown 03 Feb '22

03 Feb '22

The cs47l15 driver uses regmap_irq but does not ensure that it is built, causing build failures if nothing else being build requires the helpers. Add the appropriate select. Signed-off-by: Mark Brown <broonie(a)kernel.org> --- sound/soc/codecs/Kconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/sound/soc/codecs/Kconfig b/sound/soc/codecs/Kconfig index 2fd21004688c..69fd11b2b046 100644 --- a/sound/soc/codecs/Kconfig +++ b/sound/soc/codecs/Kconfig @@ -733,6 +733,7 @@ config SND_SOC_CS4349 config SND_SOC_CS47L15 tristate + select REGMAP_IRQ config SND_SOC_CS47L24 tristate -- 2.30.2

2 2

[PATCH] ASoC: wm8962: Allow switching between analog and digital inputs
by Charles Keepax 03 Feb '22

03 Feb '22

When the DMIC_ENA bit is set the analogue inputs are disconnected from the digital core of the chip, in favour of the digital microphones. Currently the driver will always enable DMIC_ENA whilst the GPIOs are configured for the DMIC function, this means the user can't currently use both the analog inputs and the digital inputs in one system. Add an additional DAPM mutex that allows switching between analog and digital inputs into the digital core. Reported-by: Martin Kepplinger <martin.kepplinger(a)puri.sm> Signed-off-by: Charles Keepax <ckeepax(a)opensource.cirrus.com> --- sound/soc/codecs/wm8962.c | 21 +++++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) diff --git a/sound/soc/codecs/wm8962.c b/sound/soc/codecs/wm8962.c index a5584ba962dcf..2c41d31956aa8 100644 --- a/sound/soc/codecs/wm8962.c +++ b/sound/soc/codecs/wm8962.c @@ -2049,6 +2049,13 @@ static SOC_ENUM_SINGLE_DECL(hpoutl_enum, static const struct snd_kcontrol_new hpoutl_mux = SOC_DAPM_ENUM("HPOUTL Mux", hpoutl_enum); +static const char * const input_mode_text[] = { "Analog", "Digital" }; + +static SOC_ENUM_SINGLE_VIRT_DECL(input_mode_enum, input_mode_text); + +static const struct snd_kcontrol_new input_mode_mux = + SOC_DAPM_ENUM("Input Mode", input_mode_enum); + static const struct snd_kcontrol_new inpgal[] = { SOC_DAPM_SINGLE("IN1L Switch", WM8962_LEFT_INPUT_PGA_CONTROL, 3, 1, 0), SOC_DAPM_SINGLE("IN2L Switch", WM8962_LEFT_INPUT_PGA_CONTROL, 2, 1, 0), @@ -2147,6 +2154,9 @@ SND_SOC_DAPM_MIXER("MIXINR", WM8962_PWR_MGMT_1, 4, 0, SND_SOC_DAPM_AIF_IN("DMIC_ENA", NULL, 0, WM8962_PWR_MGMT_1, 10, 0), +SND_SOC_DAPM_MUX("Input Mode L", SND_SOC_NOPM, 0, 0, &input_mode_mux), +SND_SOC_DAPM_MUX("Input Mode R", SND_SOC_NOPM, 0, 0, &input_mode_mux), + SND_SOC_DAPM_ADC("ADCL", "Capture", WM8962_PWR_MGMT_1, 3, 0), SND_SOC_DAPM_ADC("ADCR", "Capture", WM8962_PWR_MGMT_1, 2, 0), @@ -2226,16 +2236,19 @@ static const struct snd_soc_dapm_route wm8962_intercon[] = { { "DMIC_ENA", NULL, "DMICDAT" }, + { "Input Mode L", "Analog", "MIXINL" }, + { "Input Mode L", "Digital", "DMIC_ENA" }, + { "Input Mode R", "Analog", "MIXINR" }, + { "Input Mode R", "Digital", "DMIC_ENA" }, + { "ADCL", NULL, "SYSCLK" }, { "ADCL", NULL, "TOCLK" }, - { "ADCL", NULL, "MIXINL" }, - { "ADCL", NULL, "DMIC_ENA" }, + { "ADCL", NULL, "Input Mode L" }, { "ADCL", NULL, "DSP2" }, { "ADCR", NULL, "SYSCLK" }, { "ADCR", NULL, "TOCLK" }, - { "ADCR", NULL, "MIXINR" }, - { "ADCR", NULL, "DMIC_ENA" }, + { "ADCR", NULL, "Input Mode R" }, { "ADCR", NULL, "DSP2" }, { "STL", "Left", "ADCL" }, -- 2.11.0

3 2

`alsatplg` compile error `undefined source widget/stream` and `undefined sink widget/stream`
by GitHub issues - opened 03 Feb '22

03 Feb '22

alsa-project/alsa-utils issue #142 was opened from LazyGeniusMan: Hi, I'm trying to do enable HDA+DMIC in my Kabylake R laptop using a guide[^1]. It's said to compile hda-dsp in [alsa-topology-conf](https://github.com/alsa-project/alsa-topology-conf), but I got this error: ``` [lazygeniusman@archlinux hda-dsp]$ alsatplg -c skl_hda_dsp_generic-tplg.conf -o skl_hda_dsp_generic-tplg.bin ALSA lib dapm.c:247:(tplg_build_routes) undefined source widget/stream 'hda-dsp-analog-playback' ALSA lib dapm.c:247:(tplg_build_routes) undefined source widget/stream 'hda-dsp-digital-playback' ALSA lib dapm.c:247:(tplg_build_routes) undefined source widget/stream 'hda-dsp-alt-analog-playback' ALSA lib dapm.c:225:(tplg_build_routes) undefined sink widget/stream 'hda-dsp-audio-analog-capture' ALSA lib dapm.c:225:(tplg_build_routes) undefined sink widget/stream 'hda-dsp-audio-digital-capture' ALSA lib dapm.c:225:(tplg_build_routes) undefined sink widget/stream 'hda-dsp-audio-alt-analog-capture' ALSA lib dapm.c:247:(tplg_build_routes) undefined source widget/stream 'HDMI1 Playback' ALSA lib dapm.c:247:(tplg_build_routes) undefined source widget/stream 'HDMI2 Playback' ALSA lib dapm.c:247:(tplg_build_routes) undefined source widget/stream 'HDMI3 Playback' ALSA lib dapm.c:225:(tplg_build_routes) undefined sink widget/stream 'DMIC-Capture' Unable to open output file 'skl_hda_dsp_generic-tplg.bin.new': Unknown error -13 ``` it's also have same error when I run `make firmware` in the repo root dir Could someone help me solve it? [^1]: https://gist.github.com/crojewsk/4e6382bfb0dbfaaf60513174211f29cb#topology Issue URL : https://github.com/alsa-project/alsa-utils/issues/142 Repository URL: https://github.com/alsa-project/alsa-utils

1 0

[GIT PULL] Immutable branch with spi in i2c-multi-instantiate changes
by Hans de Goede 02 Feb '22

02 Feb '22

Hi Takashi, Rafael, As discussed here is a pull-req for an immutable branch with all the changes from the "[PATCH v6 0/9] Support Spi in i2c-multi-instantiate driver" series, including one ALSA change, in case you want to merge this to avoid conflicts. Regards, Hans The following changes since commit e783362eb54cd99b2cac8b3a9aeac942e6f6ac07: Linux 5.17-rc1 (2022-01-23 10:12:53 +0200) are available in the Git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86.git tags/platform-drivers-x86-serial-multi-instantiate-1 for you to fetch changes up to d9c01c530cc5e3b6d5bdfeae12c3d0f33fae7498: ACPI / scan: Create platform device for CS35L41 (2022-02-02 18:12:41 +0100) ---------------------------------------------------------------- This branch contains 5.17-rc1 + the SPI tree's spi-acpi-helpers tag + the other patches from the "[PATCH v6 0/9] Support Spi in i2c-multi-instantiate driver" series. ---------------------------------------------------------------- Lucas Tanure (4): platform/x86: i2c-multi-instantiate: Rename it for a generic serial driver name platform/x86: serial-multi-instantiate: Reorganize I2C functions ALSA: hda/realtek: Add support for HP Laptops ACPI / scan: Create platform device for CS35L41 Stefan Binding (5): spi: Make spi_alloc_device and spi_add_device public again spi: Create helper API to lookup ACPI info for spi device spi: Support selection of the index of the ACPI Spi Resource before alloc spi: Add API to count spi acpi resources platform/x86: serial-multi-instantiate: Add SPI support MAINTAINERS | 4 +- drivers/acpi/scan.c | 16 +- drivers/platform/x86/Kconfig | 12 +- drivers/platform/x86/Makefile | 2 +- drivers/platform/x86/i2c-multi-instantiate.c | 174 ------------ drivers/platform/x86/serial-multi-instantiate.c | 348 ++++++++++++++++++++++++ drivers/spi/spi.c | 137 ++++++++-- include/linux/spi/spi.h | 20 ++ sound/pci/hda/patch_realtek.c | 43 ++- 9 files changed, 550 insertions(+), 206 deletions(-) delete mode 100644 drivers/platform/x86/i2c-multi-instantiate.c create mode 100644 drivers/platform/x86/serial-multi-instantiate.c

1 0

How to add support for A_LAW pcm format to ALSA Loop driver ?
by Christophe Leroy 02 Feb '22

02 Feb '22

Hi, I see that the ALSA Loop driver supports only the following formats: .formats = (SNDRV_PCM_FMTBIT_S16_LE | SNDRV_PCM_FMTBIT_S16_BE | SNDRV_PCM_FMTBIT_S24_LE | SNDRV_PCM_FMTBIT_S24_BE | SNDRV_PCM_FMTBIT_S24_3LE | SNDRV_PCM_FMTBIT_S24_3BE | SNDRV_PCM_FMTBIT_S32_LE | SNDRV_PCM_FMTBIT_S32_BE | SNDRV_PCM_FMTBIT_FLOAT_LE | SNDRV_PCM_FMTBIT_FLOAT_BE), I'd like to have Loopback service with A_LAW format, I though it would just require to add SNDRV_PCM_FMTBIT_A_LAW to the format above as the Loopback driver just loops the samples. But it doesn't work, I still get only the following formats: ALSA ERROR hw_params: set (FORMAT) value = A_LAW : Invalid argument ACCESS: RW_INTERLEAVED FORMAT: S16_LE S16_BE S24_LE S32_LE S32_BE S24_3LE SUBFORMAT: STD SAMPLE_BITS: [16 32] FRAME_BITS: [16 1024] CHANNELS: [1 32] RATE: [8000 192000] PERIOD_TIME: (5 65536000] PERIOD_SIZE: [1 524288] PERIOD_BYTES: [2 67108864] PERIODS: [1 1024] BUFFER_TIME: (5 131072000] BUFFER_SIZE: [1 1048576] BUFFER_BYTES: [2 134217728] TICK_TIME: ALL ALSA lib pcm.c:8644:(snd_pcm_set_params) Sample format not available for CAPTURE: Invalid argument What am I missing, what needs to be added to the Loop driver to support A_LAW format ? Thanks for your help Christophe

1 0

[PATCH v6 0/9] Support Spi in i2c-multi-instantiate driver
by Stefan Binding 02 Feb '22

02 Feb '22

Add support for SPI bus in the i2c-multi-instantiate driver as upcoming laptops will need to multi instantiate SPI devices from a single device node, which has multiple SpiSerialBus entries at the ACPI table. With the new SPI support, i2c-multi-instantiate becomes bus-multi-instantiate and is moved to the ACPI folder. The intention is to support the SPI bus by re-using the current I2C multi instantiate, instead of creating a new SPI multi instantiate, to make it possible for peripherals that can be controlled by I2C or SPI to have the same HID at the ACPI table. The new driver (serial multi instantiate, smi) checks for the hard-coded bus type and returns -ENODEV in case of zero devices found for that bus. In the case of automatic bus detection, the driver will give preference to I2C. The expectation is for a device node in the ACPI table to have multiple I2cSerialBus only or multiple SpiSerialBus only, not a mix of both; and for the case where there are both entries in one device node, only the I2C ones would be probed. This new serial multi instantiate will be used in CS35L41 HDA new driver. Changes since V5: - comment, commit message and Kconfig description fixes - minor fixes in serial-multi-instantiate - use lowercase for SSIDs in patch_realtek.c Lucas Tanure (4): platform/x86: i2c-multi-instantiate: Rename it for a generic serial driver name platform/x86: serial-multi-instantiate: Reorganize I2C functions ALSA: hda/realtek: Add support for HP Laptops ACPI / scan: Create platform device for CS35L41 Stefan Binding (5): spi: Make spi_alloc_device and spi_add_device public again spi: Create helper API to lookup ACPI info for spi device spi: Support selection of the index of the ACPI Spi Resource before alloc spi: Add API to count spi acpi resources platform/x86: serial-multi-instantiate: Add SPI support MAINTAINERS | 4 +- drivers/acpi/scan.c | 16 +- drivers/platform/x86/Kconfig | 12 +- drivers/platform/x86/Makefile | 2 +- drivers/platform/x86/i2c-multi-instantiate.c | 174 --------- .../platform/x86/serial-multi-instantiate.c | 349 ++++++++++++++++++ drivers/spi/spi.c | 137 ++++++- include/linux/spi/spi.h | 20 + sound/pci/hda/patch_realtek.c | 43 ++- 9 files changed, 551 insertions(+), 206 deletions(-) delete mode 100644 drivers/platform/x86/i2c-multi-instantiate.c create mode 100644 drivers/platform/x86/serial-multi-instantiate.c -- 2.25.1

5 28

[PATCH v2 1/2] kselftest: alsa: Check for event generation when we write to controls
by Mark Brown 02 Feb '22

02 Feb '22

Add some coverage of event generation to mixer-test. Rather than doing a separate set of writes designed to trigger events we add a step to the existing write_and_verify() which checks to see if the value we read back from non-volatile controls matches the value before writing and that an event is or isn't generated as appropriate. The "tests" for events then simply check that no spurious or missing events were detected. This avoids needing further logic to generate appropriate values for each control type and maximises coverage. When checking for events we use a timeout of 0. This relies on the kernel generating any event prior to returning to userspace when setting a control. That is currently the case and it is difficult to see it changing, if it does the test will need to be updated. Using a delay of 0 means that we don't slow things down unduly when checking for no event or when events fail to be generated. We don't check behaviour for volatile controls since we can't tell what the behaviour is supposed to be for any given control. Signed-off-by: Mark Brown <broonie(a)kernel.org> Reviewed-by: Shuah Khan <skhan(a)linuxfoundation.org> --- v2: - Get the numid from the API rather than using the control index. tools/testing/selftests/alsa/mixer-test.c | 148 +++++++++++++++++++++- 1 file changed, 145 insertions(+), 3 deletions(-) diff --git a/tools/testing/selftests/alsa/mixer-test.c b/tools/testing/selftests/alsa/mixer-test.c index 0e88f4f3d802..79ffbca429ee 100644 --- a/tools/testing/selftests/alsa/mixer-test.c +++ b/tools/testing/selftests/alsa/mixer-test.c @@ -3,7 +3,7 @@ // kselftest for the ALSA mixer API // // Original author: Mark Brown <broonie(a)kernel.org> -// Copyright (c) 2021 Arm Limited +// Copyright (c) 2021-2 Arm Limited // This test will iterate over all cards detected in the system, exercising // every mixer control it can find. This may conflict with other system @@ -27,11 +27,12 @@ #include "../kselftest.h" -#define TESTS_PER_CONTROL 4 +#define TESTS_PER_CONTROL 6 struct card_data { snd_ctl_t *handle; int card; + struct pollfd pollfd; int num_ctls; snd_ctl_elem_list_t *ctls; struct card_data *next; @@ -43,6 +44,8 @@ struct ctl_data { snd_ctl_elem_info_t *info; snd_ctl_elem_value_t *def_val; int elem; + int event_missing; + int event_spurious; struct card_data *card; struct ctl_data *next; }; @@ -149,6 +152,7 @@ void find_controls(void) if (!ctl_data) ksft_exit_fail_msg("Out of memory\n"); + memset(ctl_data, 0, sizeof(*ctl_data)); ctl_data->card = card_data; ctl_data->elem = ctl; ctl_data->name = snd_ctl_elem_list_get_name(card_data->ctls, @@ -184,6 +188,26 @@ void find_controls(void) ctl_list = ctl_data; } + /* Set up for events */ + err = snd_ctl_subscribe_events(card_data->handle, true); + if (err < 0) { + ksft_exit_fail_msg("snd_ctl_subscribe_events() failed for card %d: %d\n", + card, err); + } + + err = snd_ctl_poll_descriptors_count(card_data->handle); + if (err != 1) { + ksft_exit_fail_msg("Unexpected desciptor count %d for card %d\n", + err, card); + } + + err = snd_ctl_poll_descriptors(card_data->handle, + &card_data->pollfd, 1); + if (err != 1) { + ksft_exit_fail_msg("snd_ctl_poll_descriptors() failed for %d\n", + card, err); + } + next_card: if (snd_card_next(&card) < 0) { ksft_print_msg("snd_card_next"); @@ -194,6 +218,73 @@ void find_controls(void) snd_config_delete(config); } +/* + * Block for up to timeout ms for an event, returns a negative value + * on error, 0 for no event and 1 for an event. + */ +int wait_for_event(struct ctl_data *ctl, int timeout) +{ + unsigned short revents; + snd_ctl_event_t *event; + int count, err; + unsigned int mask = 0; + unsigned int ev_id; + + snd_ctl_event_alloca(&event); + + do { + err = poll(&(ctl->card->pollfd), 1, timeout); + if (err < 0) { + ksft_print_msg("poll() failed for %s: %s (%d)\n", + ctl->name, strerror(errno), errno); + return -1; + } + /* Timeout */ + if (err == 0) + return 0; + + err = snd_ctl_poll_descriptors_revents(ctl->card->handle, + &(ctl->card->pollfd), + 1, &revents); + if (err < 0) { + ksft_print_msg("snd_ctl_poll_desciptors_revents() failed for %s: %d\n", + ctl->name, err); + return err; + } + if (revents & POLLERR) { + ksft_print_msg("snd_ctl_poll_desciptors_revents() reported POLLERR for %s\n", + ctl->name); + return -1; + } + /* No read events */ + if (!(revents & POLLIN)) { + ksft_print_msg("No POLLIN\n"); + continue; + } + + err = snd_ctl_read(ctl->card->handle, event); + if (err < 0) { + ksft_print_msg("snd_ctl_read() failed for %s: %d\n", + ctl->name, err); + return err; + } + + if (snd_ctl_event_get_type(event) != SND_CTL_EVENT_ELEM) + continue; + + /* The ID returned from the event is 1 less than numid */ + mask = snd_ctl_event_elem_get_mask(event); + ev_id = snd_ctl_event_elem_get_numid(event); + if (ev_id != snd_ctl_elem_info_get_numid(ctl->info)) { + ksft_print_msg("Event for unexpected ctl %s\n", + snd_ctl_event_elem_get_name(event)); + continue; + } + } while ((mask & SND_CTL_EVENT_MASK_VALUE) != SND_CTL_EVENT_MASK_VALUE); + + return 1; +} + bool ctl_value_index_valid(struct ctl_data *ctl, snd_ctl_elem_value_t *val, int index) { @@ -428,7 +519,8 @@ int write_and_verify(struct ctl_data *ctl, { int err, i; bool error_expected, mismatch_shown; - snd_ctl_elem_value_t *read_val, *w_val; + snd_ctl_elem_value_t *initial_val, *read_val, *w_val; + snd_ctl_elem_value_alloca(&initial_val); snd_ctl_elem_value_alloca(&read_val); snd_ctl_elem_value_alloca(&w_val); @@ -446,6 +538,18 @@ int write_and_verify(struct ctl_data *ctl, snd_ctl_elem_value_copy(expected_val, write_val); } + /* Store the value before we write */ + if (snd_ctl_elem_info_is_readable(ctl->info)) { + snd_ctl_elem_value_set_id(initial_val, ctl->id); + + err = snd_ctl_elem_read(ctl->card->handle, initial_val); + if (err < 0) { + ksft_print_msg("snd_ctl_elem_read() failed: %s\n", + snd_strerror(err)); + return err; + } + } + /* * Do the write, if we have an expected value ignore the error * and carry on to validate the expected value. @@ -470,6 +574,30 @@ int write_and_verify(struct ctl_data *ctl, return err; } + /* + * Check for an event if the value changed, or confirm that + * there was none if it didn't. We rely on the kernel + * generating the notification before it returns from the + * write, this is currently true, should that ever change this + * will most likely break and need updating. + */ + if (!snd_ctl_elem_info_is_volatile(ctl->info)) { + err = wait_for_event(ctl, 0); + if (snd_ctl_elem_value_compare(initial_val, read_val)) { + if (err < 1) { + ksft_print_msg("No event generated for %s\n", + ctl->name); + ctl->event_missing++; + } + } else { + if (err != 0) { + ksft_print_msg("Spurious event generated for %s\n", + ctl->name); + ctl->event_spurious++; + } + } + } + /* * Use the libray to compare values, if there's a mismatch * carry on and try to provide a more useful diagnostic than @@ -898,6 +1026,18 @@ void test_ctl_write_invalid(struct ctl_data *ctl) ctl->card->card, ctl->elem); } +void test_ctl_event_missing(struct ctl_data *ctl) +{ + ksft_test_result(!ctl->event_missing, "event_missing.%d.%d\n", + ctl->card->card, ctl->elem); +} + +void test_ctl_event_spurious(struct ctl_data *ctl) +{ + ksft_test_result(!ctl->event_spurious, "event_spurious.%d.%d\n", + ctl->card->card, ctl->elem); +} + int main(void) { struct ctl_data *ctl; @@ -917,6 +1057,8 @@ int main(void) test_ctl_write_default(ctl); test_ctl_write_valid(ctl); test_ctl_write_invalid(ctl); + test_ctl_event_missing(ctl); + test_ctl_event_spurious(ctl); } ksft_exit_pass(); -- 2.30.2

2 3

[PATCH] Revert "ASoC: amd: acp: Power on/off the speaker enable gpio pin based on DAPM callback."
by Curtis Malainey 02 Feb '22

02 Feb '22

This reverts commit 5c5f08f7fc0bee9a1bc3fbdcb7a21cfd0648ab14. This commit hard codes GPIO for max98357a drivers at a board specific level in the machine driver in the kernel itself. When used with a board that properly defines the GPIO pins in ACPI there is a resource contention over the GPIO pin and the card fails to probe. The amplifier driver has handled this pin lookup long before the this change landed and it the pin should continue to be owned by the amplifier as it is specific to that component. As a result this should be reverted. Signed-off-by: Curtis Malainey <cujomalainey(a)chromium.org> Cc: Rob Barnes <robbarnes(a)google.com> Cc: Eric Peers <epeers(a)google.com> --- sound/soc/amd/acp/Kconfig | 6 +++--- sound/soc/amd/acp/acp-legacy-mach.c | 19 +++---------------- sound/soc/amd/acp/acp-mach-common.c | 25 ------------------------- sound/soc/amd/acp/acp-mach.h | 10 +--------- sound/soc/amd/acp/acp-sof-mach.c | 21 +++------------------ 5 files changed, 10 insertions(+), 71 deletions(-) diff --git a/sound/soc/amd/acp/Kconfig b/sound/soc/amd/acp/Kconfig index d5838df3064b..154be5e70821 100644 --- a/sound/soc/amd/acp/Kconfig +++ b/sound/soc/amd/acp/Kconfig @@ -32,7 +32,7 @@ config SND_AMD_ASOC_RENOIR config SND_SOC_AMD_MACH_COMMON tristate - depends on X86 && PCI && I2C && GPIOLIB + depends on X86 && PCI && I2C select CLK_FIXED_FCH select SND_SOC_RT5682_I2C select SND_SOC_DMIC @@ -44,14 +44,14 @@ config SND_SOC_AMD_MACH_COMMON config SND_SOC_AMD_LEGACY_MACH tristate "AMD Legacy Machine Driver Support" - depends on X86 && PCI && I2C && GPIOLIB + depends on X86 && PCI && I2C select SND_SOC_AMD_MACH_COMMON help This option enables legacy sound card support for ACP audio. config SND_SOC_AMD_SOF_MACH tristate "AMD SOF Machine Driver Support" - depends on X86 && PCI && I2C && GPIOLIB + depends on X86 && PCI && I2C select SND_SOC_AMD_MACH_COMMON help This option enables SOF sound card support for ACP audio. diff --git a/sound/soc/amd/acp/acp-legacy-mach.c b/sound/soc/amd/acp/acp-legacy-mach.c index 0ad1cf41b308..de0f8024e2fb 100644 --- a/sound/soc/amd/acp/acp-legacy-mach.c +++ b/sound/soc/amd/acp/acp-legacy-mach.c @@ -27,7 +27,6 @@ static struct acp_card_drvdata rt5682_rt1019_data = { .hs_codec_id = RT5682, .amp_codec_id = RT1019, .dmic_codec_id = NONE, - .gpio_spkr_en = EN_SPKR_GPIO_GB, }; static const struct snd_kcontrol_new acp_controls[] = { @@ -42,16 +41,15 @@ static const struct snd_kcontrol_new acp_controls[] = { static const struct snd_soc_dapm_widget acp_widgets[] = { SND_SOC_DAPM_HP("Headphone Jack", NULL), SND_SOC_DAPM_MIC("Headset Mic", NULL), - SND_SOC_DAPM_SPK("Spk", event_spkr_handler), - SND_SOC_DAPM_SPK("Left Spk", event_spkr_handler), - SND_SOC_DAPM_SPK("Right Spk", event_spkr_handler), + SND_SOC_DAPM_SPK("Spk", NULL), + SND_SOC_DAPM_SPK("Left Spk", NULL), + SND_SOC_DAPM_SPK("Right Spk", NULL), }; static int acp_asoc_probe(struct platform_device *pdev) { struct snd_soc_card *card = NULL; struct device *dev = &pdev->dev; - unsigned int spkr_gpio; int ret; if (!pdev->id_entry) @@ -69,20 +67,9 @@ static int acp_asoc_probe(struct platform_device *pdev) card->controls = acp_controls; card->num_controls = ARRAY_SIZE(acp_controls); card->drvdata = (struct acp_card_drvdata *)pdev->id_entry->driver_data; - spkr_gpio = ((struct acp_card_drvdata *)(card->drvdata))->gpio_spkr_en; acp_legacy_dai_links_create(card); - if (gpio_is_valid(spkr_gpio)) { - ret = devm_gpio_request(dev, spkr_gpio, "spkren"); - if (ret) { - dev_err(dev, "(%s) gpio request failed: %d\n", - __func__, ret); - return ret; - } - gpio_direction_output(spkr_gpio, 0); - } - ret = devm_snd_soc_register_card(&pdev->dev, card); if (ret) { dev_err(&pdev->dev, diff --git a/sound/soc/amd/acp/acp-mach-common.c b/sound/soc/amd/acp/acp-mach-common.c index c9caade5cb74..7386e5bb61b5 100644 --- a/sound/soc/amd/acp/acp-mach-common.c +++ b/sound/soc/amd/acp/acp-mach-common.c @@ -71,31 +71,6 @@ static const struct snd_soc_dapm_route rt5682_map[] = { { "IN1P", NULL, "Headset Mic" }, }; -int event_spkr_handler(struct snd_soc_dapm_widget *w, - struct snd_kcontrol *k, int event) -{ - struct snd_soc_dapm_context *dapm = w->dapm; - struct snd_soc_card *card = dapm->card; - struct acp_card_drvdata *drvdata = snd_soc_card_get_drvdata(card); - - if (!gpio_is_valid(drvdata->gpio_spkr_en)) - return 0; - - switch (event) { - case SND_SOC_DAPM_POST_PMU: - gpio_set_value(drvdata->gpio_spkr_en, 1); - break; - case SND_SOC_DAPM_PRE_PMD: - gpio_set_value(drvdata->gpio_spkr_en, 0); - break; - default: - dev_warn(card->dev, "%s invalid setting\n", __func__); - break; - } - return 0; -} -EXPORT_SYMBOL_NS_GPL(event_spkr_handler, SND_SOC_AMD_MACH); - /* Define card ops for RT5682 CODEC */ static int acp_card_rt5682_init(struct snd_soc_pcm_runtime *rtd) { diff --git a/sound/soc/amd/acp/acp-mach.h b/sound/soc/amd/acp/acp-mach.h index fd6299844ebe..5dc47cfbff10 100644 --- a/sound/soc/amd/acp/acp-mach.h +++ b/sound/soc/amd/acp/acp-mach.h @@ -17,12 +17,6 @@ #include <linux/input.h> #include <linux/module.h> #include <sound/soc.h> -#include <linux/gpio.h> -#include <linux/gpio/consumer.h> - -#define EN_SPKR_GPIO_GB 0x11F -#define EN_SPKR_GPIO_NK 0x146 -#define EN_SPKR_GPIO_NONE -EINVAL enum be_id { HEADSET_BE_ID = 0, @@ -55,11 +49,9 @@ struct acp_card_drvdata { unsigned int dai_fmt; struct clk *wclk; struct clk *bclk; - unsigned int gpio_spkr_en; }; int acp_sofdsp_dai_links_create(struct snd_soc_card *card); int acp_legacy_dai_links_create(struct snd_soc_card *card); -int event_spkr_handler(struct snd_soc_dapm_widget *w, - struct snd_kcontrol *k, int event); + #endif diff --git a/sound/soc/amd/acp/acp-sof-mach.c b/sound/soc/amd/acp/acp-sof-mach.c index c1d9650fc222..dc2786cc81ef 100644 --- a/sound/soc/amd/acp/acp-sof-mach.c +++ b/sound/soc/amd/acp/acp-sof-mach.c @@ -27,7 +27,6 @@ static struct acp_card_drvdata sof_rt5682_rt1019_data = { .hs_codec_id = RT5682, .amp_codec_id = RT1019, .dmic_codec_id = DMIC, - .gpio_spkr_en = EN_SPKR_GPIO_GB, }; static struct acp_card_drvdata sof_rt5682_max_data = { @@ -37,7 +36,6 @@ static struct acp_card_drvdata sof_rt5682_max_data = { .hs_codec_id = RT5682, .amp_codec_id = MAX98360A, .dmic_codec_id = DMIC, - .gpio_spkr_en = EN_SPKR_GPIO_NK, }; static struct acp_card_drvdata sof_rt5682s_rt1019_data = { @@ -56,7 +54,6 @@ static struct acp_card_drvdata sof_rt5682s_max_data = { .hs_codec_id = RT5682S, .amp_codec_id = MAX98360A, .dmic_codec_id = DMIC, - .gpio_spkr_en = EN_SPKR_GPIO_NK, }; static const struct snd_kcontrol_new acp_controls[] = { @@ -70,16 +67,15 @@ static const struct snd_kcontrol_new acp_controls[] = { static const struct snd_soc_dapm_widget acp_widgets[] = { SND_SOC_DAPM_HP("Headphone Jack", NULL), SND_SOC_DAPM_MIC("Headset Mic", NULL), - SND_SOC_DAPM_SPK("Spk", event_spkr_handler), - SND_SOC_DAPM_SPK("Left Spk", event_spkr_handler), - SND_SOC_DAPM_SPK("Right Spk", event_spkr_handler), + SND_SOC_DAPM_SPK("Spk", NULL), + SND_SOC_DAPM_SPK("Left Spk", NULL), + SND_SOC_DAPM_SPK("Right Spk", NULL), }; static int acp_sof_probe(struct platform_device *pdev) { struct snd_soc_card *card = NULL; struct device *dev = &pdev->dev; - unsigned int spkr_gpio; int ret; if (!pdev->id_entry) @@ -97,20 +93,9 @@ static int acp_sof_probe(struct platform_device *pdev) card->controls = acp_controls; card->num_controls = ARRAY_SIZE(acp_controls); card->drvdata = (struct acp_card_drvdata *)pdev->id_entry->driver_data; - spkr_gpio = ((struct acp_card_drvdata *)(card->drvdata))->gpio_spkr_en; acp_sofdsp_dai_links_create(card); - if (gpio_is_valid(spkr_gpio)) { - ret = devm_gpio_request(dev, spkr_gpio, "spkren"); - if (ret) { - dev_err(dev, "(%s) gpio request failed: %d\n", - __func__, ret); - return ret; - } - gpio_direction_output(spkr_gpio, 0); - } - ret = devm_snd_soc_register_card(&pdev->dev, card); if (ret) { dev_err(&pdev->dev, -- 2.32.0

4 6

[PATCH] ASoC: tas2770: Insert post reset delay
by Martin Povišer 02 Feb '22

02 Feb '22

Per TAS2770 datasheet there must be a 1 ms delay from reset to first command. So insert delays into the driver where appropriate. Fixes: 1a476abc723e ("tas2770: add tas2770 smart PA kernel driver") Signed-off-by: Martin Povišer <povik+lin(a)protonmail.com> --- sound/soc/codecs/tas2770.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/sound/soc/codecs/tas2770.c b/sound/soc/codecs/tas2770.c index b52c0861edc8..b397a2122dd4 100644 --- a/sound/soc/codecs/tas2770.c +++ b/sound/soc/codecs/tas2770.c @@ -38,10 +38,12 @@ static void tas2770_reset(struct tas2770_priv *tas2770) gpiod_set_value_cansleep(tas2770->reset_gpio, 0); msleep(20); gpiod_set_value_cansleep(tas2770->reset_gpio, 1); + usleep_range(1000, 2000); } snd_soc_component_write(tas2770->component, TAS2770_SW_RST, TAS2770_RST); + usleep_range(1000, 2000); } static int tas2770_set_bias_level(struct snd_soc_component *component, @@ -110,6 +112,7 @@ static int tas2770_codec_resume(struct snd_soc_component *component) if (tas2770->sdz_gpio) { gpiod_set_value_cansleep(tas2770->sdz_gpio, 1); + usleep_range(1000, 2000); } else { ret = snd_soc_component_update_bits(component, TAS2770_PWR_CTRL, TAS2770_PWR_CTRL_MASK, @@ -529,8 +532,10 @@ static int tas2770_codec_probe(struct snd_soc_component *component) tas2770->component = component; - if (tas2770->sdz_gpio) + if (tas2770->sdz_gpio) { gpiod_set_value_cansleep(tas2770->sdz_gpio, 1); + usleep_range(1000, 2000); + } tas2770_reset(tas2770); -- 2.33.0

2 1

[PATCH] kselftest: alsa: Check for event generation when we write to controls
by Mark Brown 02 Feb '22

02 Feb '22

Add some coverage of event generation to mixer-test. Rather than doing a separate set of writes designed to trigger events we add a step to the existing write_and_verify() which checks to see if the value we read back from non-volatile controls matches the value before writing and that an event is or isn't generated as appropriate. The "tests" for events then simply check that no spurious or missing events were detected. This avoids needing further logic to generate appropriate values for each control type and maximises coverage. When checking for events we use a timeout of 0. This relies on the kernel generating any event prior to returning to userspace when setting a control. That is currently the case and it is difficult to see it changing, if it does the test will need to be updated. Using a delay of 0 means that we don't slow things down unduly when checking for no event or when events fail to be generated. We don't check behaviour for volatile controls since we can't tell what the behaviour is supposed to be for any given control. Signed-off-by: Mark Brown <broonie(a)kernel.org> --- tools/testing/selftests/alsa/mixer-test.c | 148 +++++++++++++++++++++- 1 file changed, 145 insertions(+), 3 deletions(-) diff --git a/tools/testing/selftests/alsa/mixer-test.c b/tools/testing/selftests/alsa/mixer-test.c index 0e88f4f3d802..42cf3b724586 100644 --- a/tools/testing/selftests/alsa/mixer-test.c +++ b/tools/testing/selftests/alsa/mixer-test.c @@ -3,7 +3,7 @@ // kselftest for the ALSA mixer API // // Original author: Mark Brown <broonie(a)kernel.org> -// Copyright (c) 2021 Arm Limited +// Copyright (c) 2021-2 Arm Limited // This test will iterate over all cards detected in the system, exercising // every mixer control it can find. This may conflict with other system @@ -27,11 +27,12 @@ #include "../kselftest.h" -#define TESTS_PER_CONTROL 4 +#define TESTS_PER_CONTROL 6 struct card_data { snd_ctl_t *handle; int card; + struct pollfd pollfd; int num_ctls; snd_ctl_elem_list_t *ctls; struct card_data *next; @@ -43,6 +44,8 @@ struct ctl_data { snd_ctl_elem_info_t *info; snd_ctl_elem_value_t *def_val; int elem; + int event_missing; + int event_spurious; struct card_data *card; struct ctl_data *next; }; @@ -149,6 +152,7 @@ void find_controls(void) if (!ctl_data) ksft_exit_fail_msg("Out of memory\n"); + memset(ctl_data, 0, sizeof(*ctl_data)); ctl_data->card = card_data; ctl_data->elem = ctl; ctl_data->name = snd_ctl_elem_list_get_name(card_data->ctls, @@ -184,6 +188,26 @@ void find_controls(void) ctl_list = ctl_data; } + /* Set up for events */ + err = snd_ctl_subscribe_events(card_data->handle, true); + if (err < 0) { + ksft_exit_fail_msg("snd_ctl_subscribe_events() failed for card %d: %d\n", + card, err); + } + + err = snd_ctl_poll_descriptors_count(card_data->handle); + if (err != 1) { + ksft_exit_fail_msg("Unexpected desciptor count %d for card %d\n", + err, card); + } + + err = snd_ctl_poll_descriptors(card_data->handle, + &card_data->pollfd, 1); + if (err != 1) { + ksft_exit_fail_msg("snd_ctl_poll_descriptors() failed for %d\n", + card, err); + } + next_card: if (snd_card_next(&card) < 0) { ksft_print_msg("snd_card_next"); @@ -194,6 +218,73 @@ void find_controls(void) snd_config_delete(config); } +/* + * Block for up to timeout ms for an event, returns a negative value + * on error, 0 for no event and 1 for an event. + */ +int wait_for_event(struct ctl_data *ctl, int timeout) +{ + unsigned short revents; + snd_ctl_event_t *event; + int count, err; + unsigned int mask = 0; + unsigned int ev_id; + + snd_ctl_event_alloca(&event); + + do { + err = poll(&(ctl->card->pollfd), 1, timeout); + if (err < 0) { + ksft_print_msg("poll() failed for %s: %s (%d)\n", + ctl->name, strerror(errno), errno); + return -1; + } + /* Timeout */ + if (err == 0) + return 0; + + err = snd_ctl_poll_descriptors_revents(ctl->card->handle, + &(ctl->card->pollfd), + 1, &revents); + if (err < 0) { + ksft_print_msg("snd_ctl_poll_desciptors_revents() failed for %s: %d\n", + ctl->name, err); + return err; + } + if (revents & POLLERR) { + ksft_print_msg("snd_ctl_poll_desciptors_revents() reported POLLERR for %s\n", + ctl->name); + return -1; + } + /* No read events */ + if (!(revents & POLLIN)) { + ksft_print_msg("No POLLIN\n"); + continue; + } + + err = snd_ctl_read(ctl->card->handle, event); + if (err < 0) { + ksft_print_msg("snd_ctl_read() failed for %s: %d\n", + ctl->name, err); + return err; + } + + if (snd_ctl_event_get_type(event) != SND_CTL_EVENT_ELEM) + continue; + + /* The ID returned from the event is 1 less than numid */ + mask = snd_ctl_event_elem_get_mask(event); + ev_id = snd_ctl_event_elem_get_numid(event); + if (ev_id != ctl->elem + 1) { + ksft_print_msg("Event for unexpected ctl %s\n", + snd_ctl_event_elem_get_name(event)); + continue; + } + } while ((mask & SND_CTL_EVENT_MASK_VALUE) != SND_CTL_EVENT_MASK_VALUE); + + return 1; +} + bool ctl_value_index_valid(struct ctl_data *ctl, snd_ctl_elem_value_t *val, int index) { @@ -428,7 +519,8 @@ int write_and_verify(struct ctl_data *ctl, { int err, i; bool error_expected, mismatch_shown; - snd_ctl_elem_value_t *read_val, *w_val; + snd_ctl_elem_value_t *initial_val, *read_val, *w_val; + snd_ctl_elem_value_alloca(&initial_val); snd_ctl_elem_value_alloca(&read_val); snd_ctl_elem_value_alloca(&w_val); @@ -446,6 +538,18 @@ int write_and_verify(struct ctl_data *ctl, snd_ctl_elem_value_copy(expected_val, write_val); } + /* Store the value before we write */ + if (snd_ctl_elem_info_is_readable(ctl->info)) { + snd_ctl_elem_value_set_id(initial_val, ctl->id); + + err = snd_ctl_elem_read(ctl->card->handle, initial_val); + if (err < 0) { + ksft_print_msg("snd_ctl_elem_read() failed: %s\n", + snd_strerror(err)); + return err; + } + } + /* * Do the write, if we have an expected value ignore the error * and carry on to validate the expected value. @@ -470,6 +574,30 @@ int write_and_verify(struct ctl_data *ctl, return err; } + /* + * Check for an event if the value changed, or confirm that + * there was none if it didn't. We rely on the kernel + * generating the notification before it returns from the + * write, this is currently true, should that ever change this + * will most likely break and need updating. + */ + if (!snd_ctl_elem_info_is_volatile(ctl->info)) { + err = wait_for_event(ctl, 0); + if (snd_ctl_elem_value_compare(initial_val, read_val)) { + if (err < 1) { + ksft_print_msg("No event generated for %s\n", + ctl->name); + ctl->event_missing++; + } + } else { + if (err != 0) { + ksft_print_msg("Spurious event generated for %s\n", + ctl->name); + ctl->event_spurious++; + } + } + } + /* * Use the libray to compare values, if there's a mismatch * carry on and try to provide a more useful diagnostic than @@ -898,6 +1026,18 @@ void test_ctl_write_invalid(struct ctl_data *ctl) ctl->card->card, ctl->elem); } +void test_ctl_event_missing(struct ctl_data *ctl) +{ + ksft_test_result(!ctl->event_missing, "event_missing.%d.%d\n", + ctl->card->card, ctl->elem); +} + +void test_ctl_event_spurious(struct ctl_data *ctl) +{ + ksft_test_result(!ctl->event_spurious, "event_spurious.%d.%d\n", + ctl->card->card, ctl->elem); +} + int main(void) { struct ctl_data *ctl; @@ -917,6 +1057,8 @@ int main(void) test_ctl_write_default(ctl); test_ctl_write_valid(ctl); test_ctl_write_invalid(ctl); + test_ctl_event_missing(ctl); + test_ctl_event_spurious(ctl); } ksft_exit_pass(); -- 2.30.2

3 5

Re: [PATCH] wm8962: add a simple DMIC enable control
by Charles Keepax 02 Feb '22

02 Feb '22

On Wed, Feb 02, 2022 at 11:17:34AM +0100, Martin Kepplinger wrote: > Am Mittwoch, dem 02.02.2022 um 09:53 +0000 schrieb Charles Keepax: > > On Tue, Feb 01, 2022 at 04:01:13PM +0100, Martin Kepplinger wrote: > Do you have a code example from a different codec that has roughly what > is missing here? (the sound subsystem is new to me) Full disclosure this is complete untested, but it should be pretty close. Let me know if it does the trick and I will send a proper patch to the list. I do have a Librem 5 in a draw somewhere so can pull that out if we get really stuck, but that might have to wait until the weekend :-). I don't know if you guys are using the analogue bypass paths around the digital core on the chip. I think those will still work with the mics set to digital, so I have left the routes as is, but that might require some checking at some point. Thanks, Charles diff --git a/sound/soc/codecs/wm8962.c b/sound/soc/codecs/wm8962.c index a5584ba962dcf..2c41d31956aa8 100644 --- a/sound/soc/codecs/wm8962.c +++ b/sound/soc/codecs/wm8962.c @@ -2049,6 +2049,13 @@ static SOC_ENUM_SINGLE_DECL(hpoutl_enum, static const struct snd_kcontrol_new hpoutl_mux = SOC_DAPM_ENUM("HPOUTL Mux", hpoutl_enum); +static const char * const input_mode_text[] = { "Analog", "Digital" }; + +static SOC_ENUM_SINGLE_VIRT_DECL(input_mode_enum, input_mode_text); + +static const struct snd_kcontrol_new input_mode_mux = + SOC_DAPM_ENUM("Input Mode", input_mode_enum); + static const struct snd_kcontrol_new inpgal[] = { SOC_DAPM_SINGLE("IN1L Switch", WM8962_LEFT_INPUT_PGA_CONTROL, 3, 1, 0), SOC_DAPM_SINGLE("IN2L Switch", WM8962_LEFT_INPUT_PGA_CONTROL, 2, 1, 0), @@ -2147,6 +2154,9 @@ SND_SOC_DAPM_MIXER("MIXINR", WM8962_PWR_MGMT_1, 4, 0, SND_SOC_DAPM_AIF_IN("DMIC_ENA", NULL, 0, WM8962_PWR_MGMT_1, 10, 0), +SND_SOC_DAPM_MUX("Input Mode L", SND_SOC_NOPM, 0, 0, &input_mode_mux), +SND_SOC_DAPM_MUX("Input Mode R", SND_SOC_NOPM, 0, 0, &input_mode_mux), + SND_SOC_DAPM_ADC("ADCL", "Capture", WM8962_PWR_MGMT_1, 3, 0), SND_SOC_DAPM_ADC("ADCR", "Capture", WM8962_PWR_MGMT_1, 2, 0), @@ -2226,16 +2236,19 @@ static const struct snd_soc_dapm_route wm8962_intercon[] = { { "DMIC_ENA", NULL, "DMICDAT" }, + { "Input Mode L", "Analog", "MIXINL" }, + { "Input Mode L", "Digital", "DMIC_ENA" }, + { "Input Mode R", "Analog", "MIXINR" }, + { "Input Mode R", "Digital", "DMIC_ENA" }, + { "ADCL", NULL, "SYSCLK" }, { "ADCL", NULL, "TOCLK" }, - { "ADCL", NULL, "MIXINL" }, - { "ADCL", NULL, "DMIC_ENA" }, + { "ADCL", NULL, "Input Mode L" }, { "ADCL", NULL, "DSP2" }, { "ADCR", NULL, "SYSCLK" }, { "ADCR", NULL, "TOCLK" }, - { "ADCR", NULL, "MIXINR" }, - { "ADCR", NULL, "DMIC_ENA" }, + { "ADCR", NULL, "Input Mode R" }, { "ADCR", NULL, "DSP2" }, { "STL", "Left", "ADCL" }, -- 2.11.0

1 0

Re: [PATCH] wm8962: add a simple DMIC enable control
by Charles Keepax 02 Feb '22

02 Feb '22

On Tue, Feb 01, 2022 at 04:01:13PM +0100, Martin Kepplinger wrote: > In order to use the external mic we need to switch DMIC_ENA off. When you say external mic do you mean an analogue mic connected to the INxy pins on the chip? > I know when DMIC is not used at all, the codec driver does > snd_soc_dapm_nc_pin(dapm, "DMICDAT"); but I'm not sure how I'd create > a control based on that. snd_soc_dapm_nc_pin should be called on DMICDAT if the GPIOs are not configured for use of a DMIC. And if called DMIC_ENA should never be set by the driver, since it can't be used as the pins are not configured to operate as DMICs. > I'm not yet looking into detection - only making it work when selected > manually, via ucm. Although I need detection too later. > > While this works when I set the control in ucm, AFAIK the way I do it > here is not correct though due to dapm. > > I guess this conflicts with the widget: > SND_SOC_DAPM_AIF_IN("DMIC_ENA", NULL, 0, WM8962_PWR_MGMT_1, 10, 0), > > Do you have any advice for me on how to do what I want? > Yes the DMIC enable should be controlled through DAPM when the relevant audio path is enabled. Just to check I understand the problem correctly. You have a system that has both analogue and digital mics connected, and the problem is that DMIC_ENA is then permanently enabled, meaning you can't access the audio from the analogue mics? Assuming I am correct above, looking through the DAPM graph it does look like the DMIC is oddly wired. It does appear to be hard wired into ADCL, which would indeed cause it to be permanently enabled if the pins are configured for DMIC. Assuming there isn't some reason the chip can't switch between digital and analogue modes (I can't see an obvious one in the datasheet), I think really there is a DAPM mux missing here. There should be a mux connecting both MIXINL and DMIC_ENA to ADCL/ADCR, rather than them both being directly connected that would let the user switch between analogue and digital inputs. Thanks, Charles

1 0

[PATCH] kselftest: alsa: Declare most functions static
by Mark Brown 01 Feb '22

01 Feb '22

This program has only one file so most functions can be static. Signed-off-by: Mark Brown <broonie(a)kernel.org> --- This depends on my previously posted patch adding coverage of events: https://lore.kernel.org/all/20220201151551.21497-1-broonie@kernel.org/ tools/testing/selftests/alsa/mixer-test.c | 58 ++++++++++++----------- 1 file changed, 30 insertions(+), 28 deletions(-) diff --git a/tools/testing/selftests/alsa/mixer-test.c b/tools/testing/selftests/alsa/mixer-test.c index 42cf3b724586..8faae89b7b48 100644 --- a/tools/testing/selftests/alsa/mixer-test.c +++ b/tools/testing/selftests/alsa/mixer-test.c @@ -71,7 +71,8 @@ struct ctl_data *ctl_list = NULL; #endif #ifndef LIB_HAS_LOAD_STRING -int snd_config_load_string(snd_config_t **config, const char *s, size_t size) +static int snd_config_load_string(snd_config_t **config, const char *s, + size_t size) { snd_input_t *input; snd_config_t *dst; @@ -99,7 +100,7 @@ int snd_config_load_string(snd_config_t **config, const char *s, size_t size) } #endif -void find_controls(void) +static void find_controls(void) { char name[32]; int card, ctl, err; @@ -222,7 +223,7 @@ void find_controls(void) * Block for up to timeout ms for an event, returns a negative value * on error, 0 for no event and 1 for an event. */ -int wait_for_event(struct ctl_data *ctl, int timeout) +static int wait_for_event(struct ctl_data *ctl, int timeout) { unsigned short revents; snd_ctl_event_t *event; @@ -285,8 +286,9 @@ int wait_for_event(struct ctl_data *ctl, int timeout) return 1; } -bool ctl_value_index_valid(struct ctl_data *ctl, snd_ctl_elem_value_t *val, - int index) +static bool ctl_value_index_valid(struct ctl_data *ctl, + snd_ctl_elem_value_t *val, + int index) { long int_val; long long int64_val; @@ -397,7 +399,7 @@ bool ctl_value_index_valid(struct ctl_data *ctl, snd_ctl_elem_value_t *val, * Check that the provided value meets the constraints for the * provided control. */ -bool ctl_value_valid(struct ctl_data *ctl, snd_ctl_elem_value_t *val) +static bool ctl_value_valid(struct ctl_data *ctl, snd_ctl_elem_value_t *val) { int i; bool valid = true; @@ -413,7 +415,7 @@ bool ctl_value_valid(struct ctl_data *ctl, snd_ctl_elem_value_t *val) * Check that we can read the default value and it is valid. Write * tests use the read value to restore the default. */ -void test_ctl_get_value(struct ctl_data *ctl) +static void test_ctl_get_value(struct ctl_data *ctl) { int err; @@ -448,9 +450,9 @@ void test_ctl_get_value(struct ctl_data *ctl) ctl->card->card, ctl->elem); } -bool show_mismatch(struct ctl_data *ctl, int index, - snd_ctl_elem_value_t *read_val, - snd_ctl_elem_value_t *expected_val) +static bool show_mismatch(struct ctl_data *ctl, int index, + snd_ctl_elem_value_t *read_val, + snd_ctl_elem_value_t *expected_val) { long long expected_int, read_int; @@ -513,9 +515,9 @@ bool show_mismatch(struct ctl_data *ctl, int index, * the write to fail, for verifying that invalid writes don't corrupt * anything. */ -int write_and_verify(struct ctl_data *ctl, - snd_ctl_elem_value_t *write_val, - snd_ctl_elem_value_t *expected_val) +static int write_and_verify(struct ctl_data *ctl, + snd_ctl_elem_value_t *write_val, + snd_ctl_elem_value_t *expected_val) { int err, i; bool error_expected, mismatch_shown; @@ -622,7 +624,7 @@ int write_and_verify(struct ctl_data *ctl, * Make sure we can write the default value back to the control, this * should validate that at least some write works. */ -void test_ctl_write_default(struct ctl_data *ctl) +static void test_ctl_write_default(struct ctl_data *ctl) { int err; @@ -655,7 +657,7 @@ void test_ctl_write_default(struct ctl_data *ctl) ctl->card->card, ctl->elem); } -bool test_ctl_write_valid_boolean(struct ctl_data *ctl) +static bool test_ctl_write_valid_boolean(struct ctl_data *ctl) { int err, i, j; bool fail = false; @@ -676,7 +678,7 @@ bool test_ctl_write_valid_boolean(struct ctl_data *ctl) return !fail; } -bool test_ctl_write_valid_integer(struct ctl_data *ctl) +static bool test_ctl_write_valid_integer(struct ctl_data *ctl) { int err; int i; @@ -706,7 +708,7 @@ bool test_ctl_write_valid_integer(struct ctl_data *ctl) return !fail; } -bool test_ctl_write_valid_integer64(struct ctl_data *ctl) +static bool test_ctl_write_valid_integer64(struct ctl_data *ctl) { int err, i; long long j, step; @@ -734,7 +736,7 @@ bool test_ctl_write_valid_integer64(struct ctl_data *ctl) return !fail; } -bool test_ctl_write_valid_enumerated(struct ctl_data *ctl) +static bool test_ctl_write_valid_enumerated(struct ctl_data *ctl) { int err, i, j; bool fail = false; @@ -755,7 +757,7 @@ bool test_ctl_write_valid_enumerated(struct ctl_data *ctl) return !fail; } -void test_ctl_write_valid(struct ctl_data *ctl) +static void test_ctl_write_valid(struct ctl_data *ctl) { bool pass; int err; @@ -808,8 +810,8 @@ void test_ctl_write_valid(struct ctl_data *ctl) ctl->card->card, ctl->elem); } -bool test_ctl_write_invalid_value(struct ctl_data *ctl, - snd_ctl_elem_value_t *val) +static bool test_ctl_write_invalid_value(struct ctl_data *ctl, + snd_ctl_elem_value_t *val) { int err; long val_read; @@ -830,7 +832,7 @@ bool test_ctl_write_invalid_value(struct ctl_data *ctl, return !ctl_value_valid(ctl, val); } -bool test_ctl_write_invalid_boolean(struct ctl_data *ctl) +static bool test_ctl_write_invalid_boolean(struct ctl_data *ctl) { int err, i; long val_read; @@ -849,7 +851,7 @@ bool test_ctl_write_invalid_boolean(struct ctl_data *ctl) return !fail; } -bool test_ctl_write_invalid_integer(struct ctl_data *ctl) +static bool test_ctl_write_invalid_integer(struct ctl_data *ctl) { int i; bool fail = false; @@ -895,7 +897,7 @@ bool test_ctl_write_invalid_integer(struct ctl_data *ctl) return !fail; } -bool test_ctl_write_invalid_integer64(struct ctl_data *ctl) +static bool test_ctl_write_invalid_integer64(struct ctl_data *ctl) { int i; bool fail = false; @@ -941,7 +943,7 @@ bool test_ctl_write_invalid_integer64(struct ctl_data *ctl) return !fail; } -bool test_ctl_write_invalid_enumerated(struct ctl_data *ctl) +static bool test_ctl_write_invalid_enumerated(struct ctl_data *ctl) { int err, i; unsigned int val_read; @@ -973,7 +975,7 @@ bool test_ctl_write_invalid_enumerated(struct ctl_data *ctl) } -void test_ctl_write_invalid(struct ctl_data *ctl) +static void test_ctl_write_invalid(struct ctl_data *ctl) { bool pass; int err; @@ -1026,13 +1028,13 @@ void test_ctl_write_invalid(struct ctl_data *ctl) ctl->card->card, ctl->elem); } -void test_ctl_event_missing(struct ctl_data *ctl) +static void test_ctl_event_missing(struct ctl_data *ctl) { ksft_test_result(!ctl->event_missing, "event_missing.%d.%d\n", ctl->card->card, ctl->elem); } -void test_ctl_event_spurious(struct ctl_data *ctl) +static void test_ctl_event_spurious(struct ctl_data *ctl) { ksft_test_result(!ctl->event_spurious, "event_spurious.%d.%d\n", ctl->card->card, ctl->elem); -- 2.30.2

2 1

[GIT PULL] ASoC fixes for v5.17-rc2
by Mark Brown 01 Feb '22

01 Feb '22

The following changes since commit f517ba4924ad026f2583553db02f3c8bc69de88b: ASoC: cs35l41: Add support for hibernate memory retention mode (2022-01-07 17:14:27 +0000) are available in the Git repository at: https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git tags/asoc-fix-v5.17-rc2 for you to fetch changes up to a4f399a1416f645ac701064a55b0cb5203707ac9: Input: wm97xx: Simplify resource management (2022-01-31 13:17:24 +0000) ---------------------------------------------------------------- ASoC: Fixes for v5.17 Quite a few fixes here, including an unusually large set in the core spurred on by various testing efforts as well as the usual small driver fixes. There are quite a few fixes for out of bounds writes in both the core and the various Qualcomm drivers, plus a couple of fixes for locking in the DPCM code. ---------------------------------------------------------------- Ajit Kumar Pandey (1): ASoC: amd: acp-mach: Fix Left and Right rt1019 amp devices Christophe JAILLET (1): Input: wm97xx: Simplify resource management Dan Carpenter (1): ASoC: max9759: fix underflow in speaker_gain_control_put() Dmitry Osipenko (1): ASoC: hdmi-codec: Fix OOB memory accesses Jiasheng Jiang (1): ASoC: cpcap: Check for NULL pointer after calling of_get_child_by_name Julian Braha (1): ASoC: mediatek: fix unmet dependency on GPIOLIB for SND_SOC_DMIC Mark Brown (5): ASoC: ops: Reject out of bounds values in snd_soc_put_volsw() ASoC: ops: Reject out of bounds values in snd_soc_put_volsw_sx() ASoC: ops: Reject out of bounds values in snd_soc_put_xr_sx() ASoC DPCM lockdep fixes ASoC: ops: Check for negative values before reading them Miaoqian Lin (1): ASoC: fsl: Add missing error handling in pcm030_fabric_probe Peter Ujfalusi (1): ASoC: rt5682: Fix deadlock on resume Robert Hancock (2): ASoC: xilinx: xlnx_formatter_pcm: Make buffer bytes multiple of period bytes ASoC: simple-card: fix probe failure on platform component Srinivas Kandagatla (4): ASoC: codecs: wcd938x: fix incorrect used of portid ASoC: codecs: lpass-rx-macro: fix sidetone register offsets ASoC: codecs: wcd938x: fix return value of mixer put function ASoC: qdsp6: q6apm-dai: only stop graphs that are started Takashi Iwai (2): ASoC: soc-pcm: Fix DPCM lockdep warning due to nested stream locks ASoC: soc-pcm: Move debugfs removal out of spinlock drivers/input/touchscreen/wm97xx-core.c | 12 +++--------- include/sound/pcm.h | 15 +++++++++++++++ include/uapi/sound/asound.h | 4 +++- sound/core/pcm_native.c | 13 +++++++++++++ sound/soc/amd/acp/acp-mach-common.c | 4 ++-- sound/soc/codecs/cpcap.c | 2 ++ sound/soc/codecs/hdmi-codec.c | 2 +- sound/soc/codecs/lpass-rx-macro.c | 8 ++++---- sound/soc/codecs/max9759.c | 3 ++- sound/soc/codecs/rt5682-i2c.c | 15 ++++----------- sound/soc/codecs/rt5682.c | 24 ++++++++---------------- sound/soc/codecs/rt5682.h | 2 -- sound/soc/codecs/wcd938x.c | 31 +++++++++++++++++-------------- sound/soc/fsl/pcm030-audio-fabric.c | 11 ++++++++--- sound/soc/generic/simple-card.c | 26 +++++++++++++++++++++++++- sound/soc/mediatek/Kconfig | 2 +- sound/soc/qcom/qdsp6/q6apm-dai.c | 7 +++++-- sound/soc/soc-ops.c | 29 ++++++++++++++++++++++++++--- sound/soc/soc-pcm.c | 18 ++++++++++++------ sound/soc/xilinx/xlnx_formatter_pcm.c | 27 ++++++++++++++++++++++++--- 20 files changed, 175 insertions(+), 80 deletions(-)

2 1

[PATCH] ALSA: hda: Skip codec shutdown in case the codec is not registered
by Peter Ujfalusi 01 Feb '22

01 Feb '22

If the codec->registered is not set then it means that pm_runtime is not yet enabled and the codec->pcm_list_head has not been initialized. The access to the not initialized pcm_list_head will lead a kernel crash during shutdown. Reported-by: Guennadi Liakhovetski <guennadi.liakhovetski(a)linux.intel.com> Signed-off-by: Peter Ujfalusi <peter.ujfalusi(a)linux.intel.com> Tested-by: Guennadi Liakhovetski <guennadi.liakhovetski(a)linux.intel.com> --- sound/pci/hda/hda_codec.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/sound/pci/hda/hda_codec.c b/sound/pci/hda/hda_codec.c index 7016b48227bf..f552785d301e 100644 --- a/sound/pci/hda/hda_codec.c +++ b/sound/pci/hda/hda_codec.c @@ -3000,6 +3000,10 @@ void snd_hda_codec_shutdown(struct hda_codec *codec) { struct hda_pcm *cpcm; + /* Skip the shutdown if codec is not registered */ + if (!codec->registered) + return; + list_for_each_entry(cpcm, &codec->pcm_list_head, list) snd_pcm_suspend_all(cpcm->pcm); -- 2.35.0

2 1

No speaker output ALC294 Asus Zephyrus S17 GX701LWS
by kernel＠killick.email 01 Feb '22

01 Feb '22

I am having no speaker output on the attached device. Headphones work through jack, but just not the internal speakers. Attached alsa-info. If you need any further information please let me know.

1 0

[PATCH] ALSA: usb-audio: Correct quirk for VF0770
by Jonas Hahnfeld 01 Feb '22

01 Feb '22

This device provides both audio and video. The original quirk added in commit 48827e1d6af5 ("ALSA: usb-audio: Add quirk for VF0770") used USB_DEVICE to match the vendor and product ID. Depending on module order, if snd-usb-audio was asked first, it would match the entire device and uvcvideo wouldn't get to see it. Change the matching to USB_AUDIO_DEVICE to restore uvcvideo matching in all cases. Fixes: 48827e1d6af5 ("ALSA: usb-audio: Add quirk for VF0770") Reported-by: Jukka Heikintalo <heikintalo.jukka(a)gmail.com> Tested-by: Jukka Heikintalo <heikintalo.jukka(a)gmail.com> Reported-by: Paweł Susicki <pawel.susicki(a)gmail.com> Tested-by: Paweł Susicki <pawel.susicki(a)gmail.com> Cc: <stable(a)vger.kernel.org> # 5.4, 5.10, 5.14, 5.15 Signed-off-by: Jonas Hahnfeld <hahnjo(a)hahnjo.de> --- sound/usb/quirks-table.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/usb/quirks-table.h b/sound/usb/quirks-table.h index b1522e43173e..0ea39565e623 100644 --- a/sound/usb/quirks-table.h +++ b/sound/usb/quirks-table.h @@ -84,7 +84,7 @@ * combination. */ { - USB_DEVICE(0x041e, 0x4095), + USB_AUDIO_DEVICE(0x041e, 0x4095), .driver_info = (unsigned long) &(const struct snd_usb_audio_quirk) { .ifnum = QUIRK_ANY_INTERFACE, .type = QUIRK_COMPOSITE, -- 2.35.1

2 1

[PATCH] sound: Replace acpi_bus_get_device()
by Rafael J. Wysocki 01 Feb '22

01 Feb '22

From: Rafael J. Wysocki <rafael.j.wysocki(a)intel.com> Replace acpi_bus_get_device() that is going to be dropped with acpi_fetch_acpi_dev(). No intentional functional impact. Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki(a)intel.com> --- sound/hda/intel-sdw-acpi.c | 7 +++---- sound/soc/soc-acpi.c | 7 ++----- 2 files changed, 5 insertions(+), 9 deletions(-) Index: linux-pm/sound/hda/intel-sdw-acpi.c =================================================================== --- linux-pm.orig/sound/hda/intel-sdw-acpi.c +++ linux-pm/sound/hda/intel-sdw-acpi.c @@ -50,11 +50,11 @@ static bool is_link_enabled(struct fwnod static int sdw_intel_scan_controller(struct sdw_intel_acpi_info *info) { - struct acpi_device *adev; + struct acpi_device *adev = acpi_fetch_acpi_dev(info->handle); int ret, i; u8 count; - if (acpi_bus_get_device(info->handle, &adev)) + if (!adev) return -EINVAL; /* Found controller, find links supported */ @@ -119,7 +119,6 @@ static acpi_status sdw_intel_acpi_cb(acp void *cdata, void **return_value) { struct sdw_intel_acpi_info *info = cdata; - struct acpi_device *adev; acpi_status status; u64 adr; @@ -127,7 +126,7 @@ static acpi_status sdw_intel_acpi_cb(acp if (ACPI_FAILURE(status)) return AE_OK; /* keep going */ - if (acpi_bus_get_device(handle, &adev)) { + if (!acpi_fetch_acpi_dev(handle)) { pr_err("%s: Couldn't find ACPI handle\n", __func__); return AE_NOT_FOUND; } Index: linux-pm/sound/soc/soc-acpi.c =================================================================== --- linux-pm.orig/sound/soc/soc-acpi.c +++ linux-pm/sound/soc/soc-acpi.c @@ -55,16 +55,13 @@ EXPORT_SYMBOL_GPL(snd_soc_acpi_find_mach static acpi_status snd_soc_acpi_find_package(acpi_handle handle, u32 level, void *context, void **ret) { - struct acpi_device *adev; + struct acpi_device *adev = acpi_fetch_acpi_dev(handle); acpi_status status; struct snd_soc_acpi_package_context *pkg_ctx = context; pkg_ctx->data_valid = false; - if (acpi_bus_get_device(handle, &adev)) - return AE_OK; - - if (adev->status.present && adev->status.functional) { + if (adev && adev->status.present && adev->status.functional) { struct acpi_buffer buffer = {ACPI_ALLOCATE_BUFFER, NULL}; union acpi_object *myobj = NULL;

2 1

[PATCH] conf: fix memory leaks in parse_def()
by Sebastian Berger 01 Feb '22

01 Feb '22

For all execution paths in parse_def(), free the id string before returning. Previous implementations fail to do this if the configuration: (1) tries to reference the child of a non-compound node, or (2) does not provide a valid argument after an assignment ('=') operator. For example, the invocations: (1) snd_config_load_string(&conf, "foo 0 foo.a 1", 0) (2) snd_config_load_string(&conf, "bar =", 0) would leak the strings "foo" or "bar", respectively. Signed-off-by: Sebastian Berger <sebastian.berger(a)mailbox.org> --- src/conf.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/conf.c b/src/conf.c index 70f0e773..8a09505b 100644 --- a/src/conf.c +++ b/src/conf.c @@ -1403,7 +1403,8 @@ static int parse_def(snd_config_t *parent, input_t *input, int skip, int overrid if (mode != OVERRIDE) { if (n->type != SND_CONFIG_TYPE_COMPOUND) { SNDERR("%s is not a compound", id); - return -EINVAL; + err = -EINVAL; + goto __end; } n->u.compound.join = true; parent = n; @@ -1425,8 +1426,10 @@ static int parse_def(snd_config_t *parent, input_t *input, int skip, int overrid } if (c == '=') { c = get_nonwhite(input); - if (c < 0) - return c; + if (c < 0) { + err = c; + goto __end; + } } if (!skip) { if (_snd_config_search(parent, id, -1, &n) == 0) { -- 2.35.1

1 0

[PATCH v6 0/1] firmware: mtk: add adsp ipc protocol for sof
by allen-kh.cheng 31 Jan '22

31 Jan '22

From: Allen-KH Cheng <Allen-KH.Cheng(a)mediatek.com> This patch provides mtk adsp ipc support for sof. ADSP IPC protocol offers (send/recv) interfaces using mediatek-mailbox APIs. This was tested and confirmed on MT8195 cherry board with sof. Based on linux-next changes since v5: - fix WARNING: modpost: missing MODULE_LICENSE() in drivers/mailbox /mtk-adsp-mailbox.o. Add MODULE_LICENSE in the last line. - Due to WARNING: Missing or malformed SPDX-License-Identifier tag in line 1 in checkpatch, we don't remove SPDX-License in line 1. changes since v4: - add error message for wrong mbox chan changes since v3: - rebase on v5.16-rc8 - update reviewers changes since v2: - add out tag for two memory free phases changes since v1: - add comments for mtk_adsp_ipc_send and mtk_adsp_ipc_recv - remove useless MODULE_LICENSE - change label name to out_free Allen-KH Cheng (1): firmware: mediatek: add adsp ipc protocol interface drivers/firmware/Kconfig | 1 + drivers/firmware/Makefile | 1 + drivers/firmware/mediatek/Kconfig | 9 + drivers/firmware/mediatek/Makefile | 2 + drivers/firmware/mediatek/mtk-adsp-ipc.c | 161 ++++++++++++++++++ .../linux/firmware/mediatek/mtk-adsp-ipc.h | 65 +++++++ 6 files changed, 239 insertions(+) create mode 100644 drivers/firmware/mediatek/Kconfig create mode 100644 drivers/firmware/mediatek/Makefile create mode 100644 drivers/firmware/mediatek/mtk-adsp-ipc.c create mode 100644 include/linux/firmware/mediatek/mtk-adsp-ipc.h -- 2.18.0

2 2

[PATCH] ASoC: max98927: add missing header file
by Randy Dunlap 31 Jan '22

31 Jan '22

Add a header file that provides the missing function prototypes and macro to fix these build errors (seen on arch/alpha/): ../sound/soc/codecs/max98927.c: In function 'max98927_i2c_probe': ../sound/soc/codecs/max98927.c:902:19: error: implicit declaration of function 'devm_gpiod_get_optional'; did you mean 'devm_regulator_get_optional'? [-Werror=implicit-function-declaration] 902 | = devm_gpiod_get_optional(&i2c->dev, "reset", GPIOD_OUT_HIGH); | ^~~~~~~~~~~~~~~~~~~~~~~ ../sound/soc/codecs/max98927.c:902:63: error: 'GPIOD_OUT_HIGH' undeclared (first use in this function); did you mean 'GPIOF_INIT_HIGH'? 902 | = devm_gpiod_get_optional(&i2c->dev, "reset", GPIOD_OUT_HIGH); | ^~~~~~~~~~~~~~ ../sound/soc/codecs/max98927.c:909:17: error: implicit declaration of function 'gpiod_set_value_cansleep'; did you mean 'gpio_set_value_cansleep'? [-Werror=implicit-function-declaration] 909 | gpiod_set_value_cansleep(max98927->reset_gpio, 0); | ^~~~~~~~~~~~~~~~~~~~~~~~ Fixes: 4d67dc1998f1 ("ASoC: max98927: Handle reset gpio when probing i2c") Signed-off-by: Randy Dunlap <rdunlap(a)infradead.org> Reported-by: kernel test robot <lkp(a)intel.com> Cc: Alejandro Tafalla <atafalla(a)dnyon.com> Cc: Mark Brown <broonie(a)kernel.org> Cc: Liam Girdwood <lgirdwood(a)gmail.com> Cc: Takashi Iwai <tiwai(a)suse.com> Cc: alsa-devel(a)alsa-project.org --- sound/soc/codecs/max98927.c | 1 + 1 file changed, 1 insertion(+) --- linux-next-20220128.orig/sound/soc/codecs/max98927.c +++ linux-next-20220128/sound/soc/codecs/max98927.c @@ -16,6 +16,7 @@ #include <sound/pcm_params.h> #include <sound/soc.h> #include <linux/gpio.h> +#include <linux/gpio/consumer.h> #include <linux/of_gpio.h> #include <sound/tlv.h> #include "max98927.h"

2 1

[PATCH] ALSA: hda/realtek: Add quirk for ASUS GU603
by Albert Geanta 31 Jan '22

31 Jan '22

The ASUS GU603 (Zephyrus M16 - SSID 1043:16b2) requires a quirk similar to other ASUS devices for correctly routing the 4 integrated speakers. This fixes it by adding a corresponding quirk entry, which connects the bass speakers to the proper DAC. Signed-off-by: Albert Geantă <albertgeanta(a)gmail.com> --- sound/pci/hda/patch_realtek.c | 1 + 1 file changed, 1 insertion(+) diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c index 668274e52674..61b314c7dbc9 100644 --- a/sound/pci/hda/patch_realtek.c +++ b/sound/pci/hda/patch_realtek.c @@ -8969,6 +8969,7 @@ static const struct snd_pci_quirk alc269_fixup_tbl[] = { SND_PCI_QUIRK(0x1043, 0x1e51, "ASUS Zephyrus M15", ALC294_FIXUP_ASUS_GU502_PINS), SND_PCI_QUIRK(0x1043, 0x1e8e, "ASUS Zephyrus G15", ALC289_FIXUP_ASUS_GA401), SND_PCI_QUIRK(0x1043, 0x1f11, "ASUS Zephyrus G14", ALC289_FIXUP_ASUS_GA401), + SND_PCI_QUIRK(0x1043, 0x16b2, "ASUS GU603", ALC289_FIXUP_ASUS_GA401), SND_PCI_QUIRK(0x1043, 0x3030, "ASUS ZN270IE", ALC256_FIXUP_ASUS_AIO_GPIO2), SND_PCI_QUIRK(0x1043, 0x831a, "ASUS P901", ALC269_FIXUP_STEREO_DMIC), SND_PCI_QUIRK(0x1043, 0x834a, "ASUS S101", ALC269_FIXUP_STEREO_DMIC), -- 2.35.1

3 2

[PATCH 0/3] hda/realtek: Add/Improve several Gigabyte X570(S) audio quirks
by Christian Lachner 31 Jan '22

31 Jan '22

This patch series cleans up and improves my previous work for the Gigabyte X570 audio quirks and adds more mainboards to make use of it. Christian Lachner (3): hda/realtek: Add missing fixup-model for Gigabyte X570 ALC1220 quirks hda/realtek: Fix silent output on Gigabyte X570S Aorus Master (newer chipset) hda/realtek: Fix silent output on Gigabyte X570 Aorus Xtreme after reboot from Windows sound/pci/hda/patch_realtek.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) -- 2.34.1

2 4

[PATCH] ALSA: hda: realtek: Fix race at concurrent COEF updates
by Takashi Iwai 31 Jan '22

31 Jan '22

The COEF access is done with two steps: setting the index then read or write the data. When multiple COEF accesses are performed concurrently, the index and data might be paired unexpectedly. In most cases, this isn't a big problem as the COEF setup is done at the initialization, but some dynamic changes like the mute LED may hit such a race. For avoiding the racy COEF accesses, this patch introduces a new mutex coef_mutex to alc_spec, and wrap the COEF accessing functions with it. Reported-by: Alexander Sergeyev <sergeev917(a)gmail.com> Cc: <stable(a)vger.kernel.org> Link: https://lore.kernel.org/r/20220111195229.a77wrpjclqwrx4bx@localhost.localdo… Signed-off-by: Takashi Iwai <tiwai(a)suse.de> --- sound/pci/hda/patch_realtek.c | 61 ++++++++++++++++++++++++++++------- 1 file changed, 50 insertions(+), 11 deletions(-) diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c index 668274e52674..a5677be0a405 100644 --- a/sound/pci/hda/patch_realtek.c +++ b/sound/pci/hda/patch_realtek.c @@ -98,6 +98,7 @@ struct alc_spec { unsigned int gpio_mic_led_mask; struct alc_coef_led mute_led_coef; struct alc_coef_led mic_led_coef; + struct mutex coef_mutex; hda_nid_t headset_mic_pin; hda_nid_t headphone_mic_pin; @@ -137,8 +138,8 @@ struct alc_spec { * COEF access helper functions */ -static int alc_read_coefex_idx(struct hda_codec *codec, hda_nid_t nid, - unsigned int coef_idx) +static int __alc_read_coefex_idx(struct hda_codec *codec, hda_nid_t nid, + unsigned int coef_idx) { unsigned int val; @@ -147,28 +148,61 @@ static int alc_read_coefex_idx(struct hda_codec *codec, hda_nid_t nid, return val; } +static int alc_read_coefex_idx(struct hda_codec *codec, hda_nid_t nid, + unsigned int coef_idx) +{ + struct alc_spec *spec = codec->spec; + unsigned int val; + + mutex_lock(&spec->coef_mutex); + val = __alc_read_coefex_idx(codec, nid, coef_idx); + mutex_unlock(&spec->coef_mutex); + return val; +} + #define alc_read_coef_idx(codec, coef_idx) \ alc_read_coefex_idx(codec, 0x20, coef_idx) -static void alc_write_coefex_idx(struct hda_codec *codec, hda_nid_t nid, - unsigned int coef_idx, unsigned int coef_val) +static void __alc_write_coefex_idx(struct hda_codec *codec, hda_nid_t nid, + unsigned int coef_idx, unsigned int coef_val) { snd_hda_codec_write(codec, nid, 0, AC_VERB_SET_COEF_INDEX, coef_idx); snd_hda_codec_write(codec, nid, 0, AC_VERB_SET_PROC_COEF, coef_val); } +static void alc_write_coefex_idx(struct hda_codec *codec, hda_nid_t nid, + unsigned int coef_idx, unsigned int coef_val) +{ + struct alc_spec *spec = codec->spec; + + mutex_lock(&spec->coef_mutex); + __alc_write_coefex_idx(codec, nid, coef_idx, coef_val); + mutex_unlock(&spec->coef_mutex); +} + #define alc_write_coef_idx(codec, coef_idx, coef_val) \ alc_write_coefex_idx(codec, 0x20, coef_idx, coef_val) +static void __alc_update_coefex_idx(struct hda_codec *codec, hda_nid_t nid, + unsigned int coef_idx, unsigned int mask, + unsigned int bits_set) +{ + unsigned int val = __alc_read_coefex_idx(codec, nid, coef_idx); + + if (val != -1) + __alc_write_coefex_idx(codec, nid, coef_idx, + (val & ~mask) | bits_set); +} + static void alc_update_coefex_idx(struct hda_codec *codec, hda_nid_t nid, unsigned int coef_idx, unsigned int mask, unsigned int bits_set) { - unsigned int val = alc_read_coefex_idx(codec, nid, coef_idx); + struct alc_spec *spec = codec->spec; - if (val != -1) - alc_write_coefex_idx(codec, nid, coef_idx, - (val & ~mask) | bits_set); + mutex_lock(&spec->coef_mutex); + __alc_update_coefex_idx(codec, nid, coef_idx, mask, bits_set); + mutex_unlock(&spec->coef_mutex); } #define alc_update_coef_idx(codec, coef_idx, mask, bits_set) \ @@ -201,13 +235,17 @@ struct coef_fw { static void alc_process_coef_fw(struct hda_codec *codec, const struct coef_fw *fw) { + struct alc_spec *spec = codec->spec; + + mutex_lock(&spec->coef_mutex); for (; fw->nid; fw++) { if (fw->mask == (unsigned short)-1) - alc_write_coefex_idx(codec, fw->nid, fw->idx, fw->val); + __alc_write_coefex_idx(codec, fw->nid, fw->idx, fw->val); else - alc_update_coefex_idx(codec, fw->nid, fw->idx, - fw->mask, fw->val); + __alc_update_coefex_idx(codec, fw->nid, fw->idx, + fw->mask, fw->val); } + mutex_unlock(&spec->coef_mutex); } /* @@ -1153,6 +1191,7 @@ static int alc_alloc_spec(struct hda_codec *codec, hda_nid_t mixer_nid) codec->spdif_status_reset = 1; codec->forced_resume = 1; codec->patch_ops = alc_patch_ops; + mutex_init(&spec->coef_mutex); err = alc_codec_rename_from_preset(codec); if (err < 0) { -- 2.31.1

1 0

[BUG] ALSA: core: possible deadlock involving waiting and locking operations
by Jia-Ju Bai 29 Jan '22

29 Jan '22

Hello, My static analysis tool reports a possible deadlock in the sound driver in Linux 5.10: snd_card_disconnect_sync() spin_lock_irq(&card->files_lock); --> Line 461 (Lock A) wait_event_lock_irq(card->remove_sleep, ...); --> Line 462 (Wait X) spin_unlock_irq(&card->files_lock); --> Line 465 (Unlock A) snd_hwdep_release() mutex_lock(&hw->open_mutex); --> Line 152 (Lock B) mutex_unlock(&hw->open_mutex); --> Line 157 (Unlock B) snd_card_file_remove() wake_up_all(&card->remove_sleep); --> Line 976 (Wake X) snd_hwdep_open() mutex_lock(&hw->open_mutex); --> Line 95 (Lock B) snd_card_file_add() spin_lock(&card->files_lock); --> Line 932 (Lock A) spin_unlock(&card->files_lock); --> Line 940 (Unlock A) mutex_unlock(&hw->open_mutex); --> Line 139 (Unlock B) When snd_card_disconnect_sync() is executed, "Wait X" is performed by holding "Lock A". If snd_hwdep_open() is executed at this time, it holds "Lock B" and then waits for acquiring "Lock A". If snd_hwdep_release() is executed at this time, it waits for acquiring "Lock B", and thus "Wake X" cannot be performed to wake up "Wait X" in snd_card_disconnect_sync(), causing a possible deadlock. I am not quite sure whether this possible problem is real and how to fix it if it is real. Any feedback would be appreciated, thanks :) Best wishes, Jia-Ju Bai

3 4

[PATCH v2] ASoC: cs42l51: Improve error handling in cs42l51_remove()
by Uwe Kleine-König 29 Jan '22

29 Jan '22

When disabling a regulator fails while the device goes away, there is little we can do and the machine is probably in enough trouble that any action we'd want to take fails anyhow. The return value used to be passed on in cs42l51_i2c_remove() (i.e. the i2c device remove callback). But the i2c core ignores the error code (apart from emitting a generic warning) and removes the device anyhow. So return 0 unconditionally in cs42l51_i2c_remove(), and instead of returning the error code to the upper layer emit a more helpful warning message. After that nobody is interested any more in the actual error code, so let cs42l51_remove() return void. Signed-off-by: Uwe Kleine-König <u.kleine-koenig(a)pengutronix.de> --- Hello, compared to v1 (Message-Id: 20211021103627.70975-1-u.kleine-koenig(a)pengutronix.de) I'm using regulator_bulk_disable() instead of regulator_bulk_force_disable(). Best regards Uwe sound/soc/codecs/cs42l51-i2c.c | 4 +++- sound/soc/codecs/cs42l51.c | 11 ++++++++--- sound/soc/codecs/cs42l51.h | 2 +- 3 files changed, 12 insertions(+), 5 deletions(-) diff --git a/sound/soc/codecs/cs42l51-i2c.c b/sound/soc/codecs/cs42l51-i2c.c index 70260e0a8f09..3cb21a2ba29f 100644 --- a/sound/soc/codecs/cs42l51-i2c.c +++ b/sound/soc/codecs/cs42l51-i2c.c @@ -31,7 +31,9 @@ static int cs42l51_i2c_probe(struct i2c_client *i2c, static int cs42l51_i2c_remove(struct i2c_client *i2c) { - return cs42l51_remove(&i2c->dev); + cs42l51_remove(&i2c->dev); + + return 0; } static const struct dev_pm_ops cs42l51_pm_ops = { diff --git a/sound/soc/codecs/cs42l51.c b/sound/soc/codecs/cs42l51.c index c61b17dc2af8..e9c3cb4e2bfc 100644 --- a/sound/soc/codecs/cs42l51.c +++ b/sound/soc/codecs/cs42l51.c @@ -793,14 +793,19 @@ int cs42l51_probe(struct device *dev, struct regmap *regmap) } EXPORT_SYMBOL_GPL(cs42l51_probe); -int cs42l51_remove(struct device *dev) +void cs42l51_remove(struct device *dev) { struct cs42l51_private *cs42l51 = dev_get_drvdata(dev); + int ret; gpiod_set_value_cansleep(cs42l51->reset_gpio, 1); - return regulator_bulk_disable(ARRAY_SIZE(cs42l51->supplies), - cs42l51->supplies); + ret = regulator_bulk_disable(ARRAY_SIZE(cs42l51->supplies), + cs42l51->supplies); + if (ret) + dev_warn(dev, "Failed to disable all regulators (%pe)\n", + ERR_PTR(ret)); + } EXPORT_SYMBOL_GPL(cs42l51_remove); diff --git a/sound/soc/codecs/cs42l51.h b/sound/soc/codecs/cs42l51.h index 9d06cf7f8876..a79343e8a54e 100644 --- a/sound/soc/codecs/cs42l51.h +++ b/sound/soc/codecs/cs42l51.h @@ -13,7 +13,7 @@ struct device; extern const struct regmap_config cs42l51_regmap; int cs42l51_probe(struct device *dev, struct regmap *regmap); -int cs42l51_remove(struct device *dev); +void cs42l51_remove(struct device *dev); int __maybe_unused cs42l51_suspend(struct device *dev); int __maybe_unused cs42l51_resume(struct device *dev); extern const struct of_device_id cs42l51_of_match[]; base-commit: df0cc57e057f18e44dac8e6c18aba47ab53202f9 -- 2.34.1

2 1

[PATCH 0/3] SoC: SOF: ipc: Optimizations for tx message
by Peter Ujfalusi 29 Jan '22

29 Jan '22

Hi, The series will drop the internal use of 'header' parameter which is always set to hdr->cmd. The other simplification is to use the provided message directly as it is guarantied to be valid throughout the message sending and we can save memory by not allocating a temporary buffer, also saving on needles memcpy() operations. Regards, Peter --- Peter Ujfalusi (3): ASoC: SOF: Intel: cnl: Use pm_gate->hdr.cmd in cnl_compact_ipc_compress() ASoC: SOF: ipc: Drop header parameter from sof_ipc_tx_message_unlocked() ASoC: SOF: ipc: Do not allocate buffer for msg_data sound/soc/sof/intel/cnl.c | 6 ++---- sound/soc/sof/ipc.c | 24 ++++++++++++------------ 2 files changed, 14 insertions(+), 16 deletions(-) -- 2.35.0

2 4

[PATCH v2 0/3] (Re)enable DP/HDMI audio for RK3399 Gru
by Brian Norris 29 Jan '22

29 Jan '22

This series fixes DP/HDMI audio for RK3399 Gru systems. First, there was a regression with the switch to SPDIF. Patch 1 can be taken separately as a regression fix if desired. But it's not quite so useful (at least on Chrome OS systems) without the second part. Second, jack detection was never upstreamed, because the hdmi-codec dependencies were still being worked out when this platform was first supported. Patches cover a few subsystems. Perhaps this is something for arm-soc? Changes in v2: - (Un)set pinctrl, because the default assumes we're routing out to external pins Brian Norris (3): arm64: dts: rockchip: Switch RK3399-Gru DP to SPDIF output drm/rockchip: cdn-dp: Support HDMI codec plug-change callback ASoC: rk3399_gru_sound: Wire up DP jack detection arch/arm64/boot/dts/rockchip/rk3399-gru.dtsi | 17 ++++++++---- drivers/gpu/drm/rockchip/cdn-dp-core.c | 28 ++++++++++++++++++++ drivers/gpu/drm/rockchip/cdn-dp-core.h | 4 +++ sound/soc/rockchip/rk3399_gru_sound.c | 20 ++++++++++++++ 4 files changed, 64 insertions(+), 5 deletions(-) -- 2.34.1.703.g22d0c6ccf7-goog

5 11

[PATCH v3 0/6] ASOC: amd: acp: Add generic PDM and PCI driver support for ACP
by Ajit Kumar Pandey 29 Jan '22

29 Jan '22

changes since v2: - add dmic prepare callback and adopted few nitpicks comments - use read_poll_timeout in place of while loop - added check for unused variable as pointed out - few cleanups Ajit Kumar Pandey (6): ASoC: amd: acp: Add generic support for PDM controller on ACP ASoC: amd: acp: Add PDM controller based dmic dai for Renoir ASoC: amd: acp: Add generic PCI driver module for ACP device ASoC: amd: acp: Add ACP init()/deinit() callback for Renoir. ASoC: amd: acp: acp-legacy: Add DMIC dai link support for Renoir ASoC: amd: renoir: Add check for acp configuration flags sound/soc/amd/Kconfig | 1 + sound/soc/amd/acp/Kconfig | 10 ++ sound/soc/amd/acp/Makefile | 4 + sound/soc/amd/acp/acp-legacy-mach.c | 4 +- sound/soc/amd/acp/acp-mach-common.c | 21 +++ sound/soc/amd/acp/acp-pci.c | 160 ++++++++++++++++++++++ sound/soc/amd/acp/acp-pdm.c | 193 +++++++++++++++++++++++++++ sound/soc/amd/acp/acp-renoir.c | 160 ++++++++++++++++++++++ sound/soc/amd/acp/amd.h | 23 +++- sound/soc/amd/acp/chip_offset_byte.h | 26 ++++ sound/soc/amd/mach-config.h | 1 + sound/soc/amd/renoir/rn-pci-acp3x.c | 7 +- sound/soc/amd/renoir/rn_acp3x.h | 3 + 13 files changed, 609 insertions(+), 4 deletions(-) create mode 100644 sound/soc/amd/acp/acp-pci.c create mode 100644 sound/soc/amd/acp/acp-pdm.c -- 2.25.1

2 7

[PATCH] ASoC: ops: Check for negative values before reading them
by Mark Brown 29 Jan '22

29 Jan '22

The controls allow inputs to be specified as negative but our manipulating them into register fields need to be done on unsigned variables so the checks for negative numbers weren't taking effect properly. Do the checks for negative values on the variable in the ABI struct rather than on our local unsigned copy. Signed-off-by: Mark Brown <broonie(a)kernel.org> --- sound/soc/soc-ops.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/sound/soc/soc-ops.c b/sound/soc/soc-ops.c index dc0e7c8d31f3..9833611b83d1 100644 --- a/sound/soc/soc-ops.c +++ b/sound/soc/soc-ops.c @@ -316,26 +316,26 @@ int snd_soc_put_volsw(struct snd_kcontrol *kcontrol, if (sign_bit) mask = BIT(sign_bit + 1) - 1; + if (ucontrol->value.integer.value[0] < 0) + return -EINVAL; val = ucontrol->value.integer.value[0]; if (mc->platform_max && val > mc->platform_max) return -EINVAL; if (val > max - min) return -EINVAL; - if (val < 0) - return -EINVAL; val = (val + min) & mask; if (invert) val = max - val; val_mask = mask << shift; val = val << shift; if (snd_soc_volsw_is_stereo(mc)) { + if (ucontrol->value.integer.value[1] < 0) + return -EINVAL; val2 = ucontrol->value.integer.value[1]; if (mc->platform_max && val2 > mc->platform_max) return -EINVAL; if (val2 > max - min) return -EINVAL; - if (val2 < 0) - return -EINVAL; val2 = (val2 + min) & mask; if (invert) val2 = max - val2; @@ -423,13 +423,13 @@ int snd_soc_put_volsw_sx(struct snd_kcontrol *kcontrol, int err = 0; unsigned int val, val_mask; + if (ucontrol->value.integer.value[0] < 0) + return -EINVAL; val = ucontrol->value.integer.value[0]; if (mc->platform_max && val > mc->platform_max) return -EINVAL; if (val > max - min) return -EINVAL; - if (val < 0) - return -EINVAL; val_mask = mask << shift; val = (val + min) & mask; val = val << shift; -- 2.30.2

1 1

[PATCH v1] ASoC: hdmi-codec: Fix OOB memory accesses
by Dmitry Osipenko 29 Jan '22

29 Jan '22

Correct size of iec_status array by changing it to the size of status array of the struct snd_aes_iec958. This fixes out-of-bounds slab read accesses made by memcpy() of the hdmi-codec driver. This problem is reported by KASAN. Cc: stable(a)vger.kernel.org Signed-off-by: Dmitry Osipenko <digetx(a)gmail.com> --- include/uapi/sound/asound.h | 4 +++- sound/soc/codecs/hdmi-codec.c | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/include/uapi/sound/asound.h b/include/uapi/sound/asound.h index ef0cafe295b2..2d3e5df39a59 100644 --- a/include/uapi/sound/asound.h +++ b/include/uapi/sound/asound.h @@ -56,8 +56,10 @@ * * ****************************************************************************/ +#define AES_IEC958_STATUS_SIZE 24 + struct snd_aes_iec958 { - unsigned char status[24]; /* AES/IEC958 channel status bits */ + unsigned char status[AES_IEC958_STATUS_SIZE]; /* AES/IEC958 channel status bits */ unsigned char subcode[147]; /* AES/IEC958 subcode bits */ unsigned char pad; /* nothing */ unsigned char dig_subframe[4]; /* AES/IEC958 subframe bits */ diff --git a/sound/soc/codecs/hdmi-codec.c b/sound/soc/codecs/hdmi-codec.c index b61f980cabdc..b07607a9ecea 100644 --- a/sound/soc/codecs/hdmi-codec.c +++ b/sound/soc/codecs/hdmi-codec.c @@ -277,7 +277,7 @@ struct hdmi_codec_priv { bool busy; struct snd_soc_jack *jack; unsigned int jack_status; - u8 iec_status[5]; + u8 iec_status[AES_IEC958_STATUS_SIZE]; }; static const struct snd_soc_dapm_widget hdmi_widgets[] = { -- 2.33.1

2 1

[PATCH v2 0/2] ASoC DPCM lockdep fixes
by Takashi Iwai 29 Jan '22

29 Jan '22

Hi, this is the revised patches for addressing ASoC lockdep warnings due to the recent DPCM locking refactoring. Takashi v1->v2: - minor correction in the changelog for nested lock - debugfs removal workaround === Takashi Iwai (2): ASoC: soc-pcm: Fix DPCM lockdep warning due to nested stream locks ASoC: soc-pcm: Move debugfs removal out of spinlock include/sound/pcm.h | 15 +++++++++++++++ sound/core/pcm_native.c | 13 +++++++++++++ sound/soc/soc-pcm.c | 18 ++++++++++++------ 3 files changed, 40 insertions(+), 6 deletions(-) -- 2.31.1

2 3

[PATCH] ASoC: rt5682: Fix deadlock on resume
by Peter Ujfalusi 29 Jan '22

29 Jan '22

On resume from suspend the following chain of events can happen: A rt5682_resume() -> mod_delayed_work() for jack_detect_work B DAPM sequence starts ( DAPM is locked now) A1. rt5682_jack_detect_handler() scheduled - Takes both jdet_mutex and calibrate_mutex - Calls in to rt5682_headset_detect() which tries to take DAPM lock, it starts to wait for it as B path took it already. B1. DAPM sequence reaches the "HP Amp", rt5682_hp_event() tries to take the jdet_mutex, but it is locked in A1, so it waits. Deadlock. To solve the deadlock, drop the jdet_mutex, use the jack_detect_work to do the jack removal handling, move the dapm lock up one level to protect the most of the rt5682_jack_detect_handler(), but not the jack reporting as it might trigger a DAPM sequence. The rt5682_headset_detect() can be changed to static as well. Fixes: 8deb34a90f063 ("ASoC: rt5682: fix the wrong jack type detected") Signed-off-by: Peter Ujfalusi <peter.ujfalusi(a)linux.intel.com> --- Hi, Recently we started to see resume failures in SOF CI: https://github.com/thesofproject/linux/issues/3370 Which turned out to be caused by a lockdep in rt5682 codec driver on at resume time. This patch is fixing the issue while not introducing other failures, checked by our CI: https://github.com/thesofproject/linux/pull/3392 Regards, Peter sound/soc/codecs/rt5682-i2c.c | 15 ++++----------- sound/soc/codecs/rt5682.c | 24 ++++++++---------------- sound/soc/codecs/rt5682.h | 2 -- 3 files changed, 12 insertions(+), 29 deletions(-) diff --git a/sound/soc/codecs/rt5682-i2c.c b/sound/soc/codecs/rt5682-i2c.c index 20e0f90ea498..20fc0f3766de 100644 --- a/sound/soc/codecs/rt5682-i2c.c +++ b/sound/soc/codecs/rt5682-i2c.c @@ -59,18 +59,12 @@ static void rt5682_jd_check_handler(struct work_struct *work) struct rt5682_priv *rt5682 = container_of(work, struct rt5682_priv, jd_check_work.work); - if (snd_soc_component_read(rt5682->component, RT5682_AJD1_CTRL) - & RT5682_JDH_RS_MASK) { + if (snd_soc_component_read(rt5682->component, RT5682_AJD1_CTRL) & RT5682_JDH_RS_MASK) /* jack out */ - rt5682->jack_type = rt5682_headset_detect(rt5682->component, 0); - - snd_soc_jack_report(rt5682->hs_jack, rt5682->jack_type, - SND_JACK_HEADSET | - SND_JACK_BTN_0 | SND_JACK_BTN_1 | - SND_JACK_BTN_2 | SND_JACK_BTN_3); - } else { + mod_delayed_work(system_power_efficient_wq, + &rt5682->jack_detect_work, 0); + else schedule_delayed_work(&rt5682->jd_check_work, 500); - } } static irqreturn_t rt5682_irq(int irq, void *data) @@ -198,7 +192,6 @@ static int rt5682_i2c_probe(struct i2c_client *i2c, } mutex_init(&rt5682->calibrate_mutex); - mutex_init(&rt5682->jdet_mutex); rt5682_calibrate(rt5682); rt5682_apply_patch_list(rt5682, &i2c->dev); diff --git a/sound/soc/codecs/rt5682.c b/sound/soc/codecs/rt5682.c index 415ec564c82e..0a0ec4a021e1 100644 --- a/sound/soc/codecs/rt5682.c +++ b/sound/soc/codecs/rt5682.c @@ -922,15 +922,13 @@ static void rt5682_enable_push_button_irq(struct snd_soc_component *component, * * Returns detect status. */ -int rt5682_headset_detect(struct snd_soc_component *component, int jack_insert) +static int rt5682_headset_detect(struct snd_soc_component *component, int jack_insert) { struct rt5682_priv *rt5682 = snd_soc_component_get_drvdata(component); struct snd_soc_dapm_context *dapm = &component->dapm; unsigned int val, count; if (jack_insert) { - snd_soc_dapm_mutex_lock(dapm); - snd_soc_component_update_bits(component, RT5682_PWR_ANLG_1, RT5682_PWR_VREF2 | RT5682_PWR_MB, RT5682_PWR_VREF2 | RT5682_PWR_MB); @@ -981,8 +979,6 @@ int rt5682_headset_detect(struct snd_soc_component *component, int jack_insert) snd_soc_component_update_bits(component, RT5682_MICBIAS_2, RT5682_PWR_CLK25M_MASK | RT5682_PWR_CLK1M_MASK, RT5682_PWR_CLK25M_PU | RT5682_PWR_CLK1M_PU); - - snd_soc_dapm_mutex_unlock(dapm); } else { rt5682_enable_push_button_irq(component, false); snd_soc_component_update_bits(component, RT5682_CBJ_CTRL_1, @@ -1011,7 +1007,6 @@ int rt5682_headset_detect(struct snd_soc_component *component, int jack_insert) dev_dbg(component->dev, "jack_type = %d\n", rt5682->jack_type); return rt5682->jack_type; } -EXPORT_SYMBOL_GPL(rt5682_headset_detect); static int rt5682_set_jack_detect(struct snd_soc_component *component, struct snd_soc_jack *hs_jack, void *data) @@ -1094,6 +1089,7 @@ void rt5682_jack_detect_handler(struct work_struct *work) { struct rt5682_priv *rt5682 = container_of(work, struct rt5682_priv, jack_detect_work.work); + struct snd_soc_dapm_context *dapm; int val, btn_type; while (!rt5682->component) @@ -1102,7 +1098,9 @@ void rt5682_jack_detect_handler(struct work_struct *work) while (!rt5682->component->card->instantiated) usleep_range(10000, 15000); - mutex_lock(&rt5682->jdet_mutex); + dapm = snd_soc_component_get_dapm(rt5682->component); + + snd_soc_dapm_mutex_lock(dapm); mutex_lock(&rt5682->calibrate_mutex); val = snd_soc_component_read(rt5682->component, RT5682_AJD1_CTRL) @@ -1162,6 +1160,9 @@ void rt5682_jack_detect_handler(struct work_struct *work) rt5682->irq_work_delay_time = 50; } + mutex_unlock(&rt5682->calibrate_mutex); + snd_soc_dapm_mutex_unlock(dapm); + snd_soc_jack_report(rt5682->hs_jack, rt5682->jack_type, SND_JACK_HEADSET | SND_JACK_BTN_0 | SND_JACK_BTN_1 | @@ -1174,9 +1175,6 @@ void rt5682_jack_detect_handler(struct work_struct *work) else cancel_delayed_work_sync(&rt5682->jd_check_work); } - - mutex_unlock(&rt5682->calibrate_mutex); - mutex_unlock(&rt5682->jdet_mutex); } EXPORT_SYMBOL_GPL(rt5682_jack_detect_handler); @@ -1526,7 +1524,6 @@ static int rt5682_hp_event(struct snd_soc_dapm_widget *w, { struct snd_soc_component *component = snd_soc_dapm_to_component(w->dapm); - struct rt5682_priv *rt5682 = snd_soc_component_get_drvdata(component); switch (event) { case SND_SOC_DAPM_PRE_PMU: @@ -1538,17 +1535,12 @@ static int rt5682_hp_event(struct snd_soc_dapm_widget *w, RT5682_DEPOP_1, 0x60, 0x60); snd_soc_component_update_bits(component, RT5682_DAC_ADC_DIG_VOL1, 0x00c0, 0x0080); - - mutex_lock(&rt5682->jdet_mutex); - snd_soc_component_update_bits(component, RT5682_HP_CTRL_2, RT5682_HP_C2_DAC_L_EN | RT5682_HP_C2_DAC_R_EN, RT5682_HP_C2_DAC_L_EN | RT5682_HP_C2_DAC_R_EN); usleep_range(5000, 10000); snd_soc_component_update_bits(component, RT5682_CHARGE_PUMP_1, RT5682_CP_SW_SIZE_MASK, RT5682_CP_SW_SIZE_L); - - mutex_unlock(&rt5682->jdet_mutex); break; case SND_SOC_DAPM_POST_PMD: diff --git a/sound/soc/codecs/rt5682.h b/sound/soc/codecs/rt5682.h index c917c76200ea..52ff0d9c36c5 100644 --- a/sound/soc/codecs/rt5682.h +++ b/sound/soc/codecs/rt5682.h @@ -1463,7 +1463,6 @@ struct rt5682_priv { int jack_type; int irq_work_delay_time; - struct mutex jdet_mutex; }; extern const char *rt5682_supply_names[RT5682_NUM_SUPPLIES]; @@ -1473,7 +1472,6 @@ int rt5682_sel_asrc_clk_src(struct snd_soc_component *component, void rt5682_apply_patch_list(struct rt5682_priv *rt5682, struct device *dev); -int rt5682_headset_detect(struct snd_soc_component *component, int jack_insert); void rt5682_jack_detect_handler(struct work_struct *work); bool rt5682_volatile_register(struct device *dev, unsigned int reg); -- 2.34.1

2 1

[PATCH] ASoC: soc-pcm: Fix DPCM lockdep warning due to nested stream locks
by Takashi Iwai 29 Jan '22

29 Jan '22

The recent change for DPCM locking caused spurious lockdep warnings. Actually the warnings are false-positive, as those are triggered due to the nested stream locks for FE and BE. Since both locks belong to the same lock class, lockdep sees it as if a deadlock. For fixing this, we need take PCM stream locks for BE with the nested lock primitives. Since currently snd_pcm_stream_lock*() helper assumes only the top-level single locking, a new helper function snd_pcm_stream_lock_irqsave_nested() is defined for a single-depth nested lock, which is now used in the BE DAI trigger that is always performed inside a FE stream lock. Fixes: b7898396f4bb ("ASoC: soc-pcm: Fix and cleanup DPCM locking") Reported-and-tested-by: Hans de Goede <hdegoede(a)redhat.com> Reported-by: Marek Szyprowski <m.szyprowski(a)samsung.com> Link: https://lore.kernel.org/r/73018f3c-9769-72ea-0325-b3f8e2381e30@redhat.com Link: https://lore.kernel.org/alsa-devel/9a0abddd-49e9-872d-2f00-a1697340f786@sam… Signed-off-by: Takashi Iwai <tiwai(a)suse.de> --- include/sound/pcm.h | 15 +++++++++++++++ sound/core/pcm_native.c | 13 +++++++++++++ sound/soc/soc-pcm.c | 6 +++--- 3 files changed, 31 insertions(+), 3 deletions(-) diff --git a/include/sound/pcm.h b/include/sound/pcm.h index 9b187d86e1bd..36da42cd0774 100644 --- a/include/sound/pcm.h +++ b/include/sound/pcm.h @@ -617,6 +617,7 @@ void snd_pcm_stream_unlock(struct snd_pcm_substream *substream); void snd_pcm_stream_lock_irq(struct snd_pcm_substream *substream); void snd_pcm_stream_unlock_irq(struct snd_pcm_substream *substream); unsigned long _snd_pcm_stream_lock_irqsave(struct snd_pcm_substream *substream); +unsigned long _snd_pcm_stream_lock_irqsave_nested(struct snd_pcm_substream *substream); /** * snd_pcm_stream_lock_irqsave - Lock the PCM stream @@ -635,6 +636,20 @@ unsigned long _snd_pcm_stream_lock_irqsave(struct snd_pcm_substream *substream); void snd_pcm_stream_unlock_irqrestore(struct snd_pcm_substream *substream, unsigned long flags); +/** + * snd_pcm_stream_lock_irqsave_nested - Single-nested PCM stream locking + * @substream: PCM substream + * @flags: irq flags + * + * This locks the PCM stream like snd_pcm_stream_lock_irqsave() but with + * the single-depth lockdep subclass. + */ +#define snd_pcm_stream_lock_irqsave_nested(substream, flags) \ + do { \ + typecheck(unsigned long, flags); \ + flags = _snd_pcm_stream_lock_irqsave_nested(substream); \ + } while (0) + /** * snd_pcm_group_for_each_entry - iterate over the linked substreams * @s: the iterator diff --git a/sound/core/pcm_native.c b/sound/core/pcm_native.c index 621883e71194..a056b3ef3c84 100644 --- a/sound/core/pcm_native.c +++ b/sound/core/pcm_native.c @@ -172,6 +172,19 @@ unsigned long _snd_pcm_stream_lock_irqsave(struct snd_pcm_substream *substream) } EXPORT_SYMBOL_GPL(_snd_pcm_stream_lock_irqsave); +unsigned long _snd_pcm_stream_lock_irqsave_nested(struct snd_pcm_substream *substream) +{ + unsigned long flags = 0; + if (substream->pcm->nonatomic) + mutex_lock_nested(&substream->self_group.mutex, + SINGLE_DEPTH_NESTING); + else + spin_lock_irqsave_nested(&substream->self_group.lock, flags, + SINGLE_DEPTH_NESTING); + return flags; +} +EXPORT_SYMBOL_GPL(_snd_pcm_stream_lock_irqsave_nested); + /** * snd_pcm_stream_unlock_irqrestore - Unlock the PCM stream * @substream: PCM substream diff --git a/sound/soc/soc-pcm.c b/sound/soc/soc-pcm.c index 7abfc48b26ca..e8876e65c649 100644 --- a/sound/soc/soc-pcm.c +++ b/sound/soc/soc-pcm.c @@ -46,8 +46,8 @@ static inline void snd_soc_dpcm_stream_lock_irq(struct snd_soc_pcm_runtime *rtd, snd_pcm_stream_lock_irq(snd_soc_dpcm_get_substream(rtd, stream)); } -#define snd_soc_dpcm_stream_lock_irqsave(rtd, stream, flags) \ - snd_pcm_stream_lock_irqsave(snd_soc_dpcm_get_substream(rtd, stream), flags) +#define snd_soc_dpcm_stream_lock_irqsave_nested(rtd, stream, flags) \ + snd_pcm_stream_lock_irqsave_nested(snd_soc_dpcm_get_substream(rtd, stream), flags) static inline void snd_soc_dpcm_stream_unlock_irq(struct snd_soc_pcm_runtime *rtd, int stream) @@ -2094,7 +2094,7 @@ int dpcm_be_dai_trigger(struct snd_soc_pcm_runtime *fe, int stream, be = dpcm->be; be_substream = snd_soc_dpcm_get_substream(be, stream); - snd_soc_dpcm_stream_lock_irqsave(be, stream, flags); + snd_soc_dpcm_stream_lock_irqsave_nested(be, stream, flags); /* is this op for this BE ? */ if (!snd_soc_dpcm_be_can_update(fe, be, stream)) -- 2.31.1

3 4

[PATCH] ASoC: SOF: Intel: hda: Remove link assignment limitation
by Peter Ujfalusi 28 Jan '22

28 Jan '22

From: Ranjani Sridharan <ranjani.sridharan(a)linux.intel.com> The limitation to assign a link DMA channel for a BE iff the corresponding host DMA channel is assigned to a connected FE is only applicable if the PROCEN_FMT_QUIRK is set. So, remove it for platforms that do not enable the quirk. Complements: a792bfc1c2bc ("ASoC: SOF: Intel: hda-stream: limit PROCEN workaround") Signed-off-by: Ranjani Sridharan <ranjani.sridharan(a)linux.intel.com> Reviewed-by: Pierre-Louis Bossart <pierre-louis.bossart(a)linux.intel.com> Reviewed-by: Rander Wang <rander.wang(a)intel.com> Reviewed-by: Kai Vehmanen <kai.vehmanen(a)linux.intel.com> Reviewed-by: Peter Ujfalusi <peter.ujfalusi(a)linux.intel.com> Signed-off-by: Peter Ujfalusi <peter.ujfalusi(a)linux.intel.com> --- sound/soc/sof/intel/hda-dai.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/sound/soc/sof/intel/hda-dai.c b/sound/soc/sof/intel/hda-dai.c index cd12589355ef..28a54145c150 100644 --- a/sound/soc/sof/intel/hda-dai.c +++ b/sound/soc/sof/intel/hda-dai.c @@ -59,6 +59,8 @@ static struct hdac_ext_stream * { struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); struct sof_intel_hda_stream *hda_stream; + const struct sof_intel_dsp_desc *chip; + struct snd_sof_dev *sdev; struct hdac_ext_stream *res = NULL; struct hdac_stream *stream = NULL; @@ -77,9 +79,20 @@ static struct hdac_ext_stream * continue; hda_stream = hstream_to_sof_hda_stream(hstream); + sdev = hda_stream->sdev; + chip = get_chip_info(sdev->pdata); /* check if link is available */ if (!hstream->link_locked) { + /* + * choose the first available link for platforms that do not have the + * PROCEN_FMT_QUIRK set. + */ + if (!(chip->quirks & SOF_INTEL_PROCEN_FMT_QUIRK)) { + res = hstream; + break; + } + if (stream->opened) { /* * check if the stream tag matches the stream -- 2.35.0

2 1

[PATCH] ASoC: SOF: trace: Simplify count adjustment in trace_read
by Peter Ujfalusi 28 Jan '22

28 Jan '22

The first count check and fixup against "buffer - lpos" can be removed as we will do the adjustment later against the "avail" in sof_dfsentry_trace_read() Signed-off-by: Peter Ujfalusi <peter.ujfalusi(a)linux.intel.com> Reviewed-by: Pierre-Louis Bossart <pierre-louis.bossart(a)linux.intel.com> Reviewed-by: Ranjani Sridharan <ranjani.sridharan(a)linux.intel.com> --- sound/soc/sof/trace.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/sound/soc/sof/trace.c b/sound/soc/sof/trace.c index f13024c8ebf2..9b505c4fe794 100644 --- a/sound/soc/sof/trace.c +++ b/sound/soc/sof/trace.c @@ -308,9 +308,6 @@ static ssize_t sof_dfsentry_trace_read(struct file *file, char __user *buffer, lpos_64 = lpos; lpos = do_div(lpos_64, buffer_size); - if (count > buffer_size - lpos) /* min() not used to avoid sparse warnings */ - count = buffer_size - lpos; - /* get available count based on current host offset */ avail = sof_wait_trace_avail(sdev, lpos, buffer_size); if (sdev->dtrace_error) { @@ -319,7 +316,8 @@ static ssize_t sof_dfsentry_trace_read(struct file *file, char __user *buffer, } /* make sure count is <= avail */ - count = avail > count ? count : avail; + if (count > avail) + count = avail; /* copy available trace data to debugfs */ rem = copy_to_user(buffer, ((u8 *)(dfse->buf) + lpos), count); -- 2.35.0

2 1

[PATCH v2 0/5] Tegra234 APE support
by Sameer Pujar 28 Jan '22

28 Jan '22

This adds APE support on Tegra234 and enables sound card on Jetson AGX Orin platform. Changelog ========= v1->v2 ------ * Rebased patches on latest linux-next Mohan Kumar (1): ASoC: tegra: Update AHUB driver for Tegra234 Sameer Pujar (4): dt-bindings: Add Tegra234 APE support dt-bindings: Document Tegra234 APE support arm64: tegra: Add audio devices on Tegra234 arm64: tegra: APE sound card for Jetson AGX Orin .../bindings/bus/nvidia,tegra210-aconnect.yaml | 1 + .../bindings/dma/nvidia,tegra210-adma.yaml | 4 +- .../bindings/interrupt-controller/arm,gic.yaml | 1 + .../bindings/sound/nvidia,tegra186-dspk.yaml | 4 +- .../bindings/sound/nvidia,tegra210-admaif.yaml | 4 +- .../bindings/sound/nvidia,tegra210-adx.yaml | 1 + .../bindings/sound/nvidia,tegra210-ahub.yaml | 1 + .../bindings/sound/nvidia,tegra210-amx.yaml | 3 + .../bindings/sound/nvidia,tegra210-dmic.yaml | 1 + .../bindings/sound/nvidia,tegra210-i2s.yaml | 1 + .../bindings/sound/nvidia,tegra210-mixer.yaml | 1 + .../bindings/sound/nvidia,tegra210-mvc.yaml | 1 + .../bindings/sound/nvidia,tegra210-sfc.yaml | 1 + .../dts/nvidia/tegra234-p3737-0000+p3701-0000.dts | 1783 ++++++++++++++++++++ arch/arm64/boot/dts/nvidia/tegra234.dtsi | 432 +++++ include/dt-bindings/clock/tegra234-clock.h | 74 +- include/dt-bindings/memory/tegra234-mc.h | 7 + include/dt-bindings/power/tegra234-powergate.h | 9 + sound/soc/tegra/tegra210_ahub.c | 146 +- sound/soc/tegra/tegra210_ahub.h | 4 +- 20 files changed, 2473 insertions(+), 6 deletions(-) create mode 100644 include/dt-bindings/power/tegra234-powergate.h -- 2.7.4

2 6

[PATCH] ASoC: dt-bindings: realtek, rt5682s: Drop Tegra specifics from example
by Rob Herring 28 Jan '22

28 Jan '22

There's no need to complicate examples with a platform specific macro. It also complicates example parsing to figure out the number of interrupt cells in examples (based on bracketing). Signed-off-by: Rob Herring <robh(a)kernel.org> --- .../devicetree/bindings/sound/realtek,rt5682s.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Documentation/devicetree/bindings/sound/realtek,rt5682s.yaml b/Documentation/devicetree/bindings/sound/realtek,rt5682s.yaml index d65c0ed5060c..ca5b8987b749 100644 --- a/Documentation/devicetree/bindings/sound/realtek,rt5682s.yaml +++ b/Documentation/devicetree/bindings/sound/realtek,rt5682s.yaml @@ -21,6 +21,7 @@ properties: description: I2C address of the device. interrupts: + maxItems: 1 description: The CODEC's interrupt output. realtek,dmic1-data-pin: @@ -94,7 +95,7 @@ required: examples: - | - #include <dt-bindings/gpio/tegra-gpio.h> + #include <dt-bindings/gpio/gpio.h> #include <dt-bindings/interrupt-controller/irq.h> i2c { @@ -104,10 +105,9 @@ examples: codec@1a { compatible = "realtek,rt5682s"; reg = <0x1a>; - interrupt-parent = <&gpio>; - interrupts = <TEGRA_GPIO(U, 6) IRQ_TYPE_LEVEL_HIGH>; + interrupts = <6 IRQ_TYPE_LEVEL_HIGH>; realtek,ldo1-en-gpios = - <&gpio TEGRA_GPIO(R, 2) GPIO_ACTIVE_HIGH>; + <&gpio 2 GPIO_ACTIVE_HIGH>; realtek,dmic1-data-pin = <1>; realtek,dmic1-clk-pin = <1>; realtek,jd-src = <1>; -- 2.32.0

2 1

[PATCH] ASoC: fsl: Add missing error handling in pcm030_fabric_probe
by Miaoqian Lin 28 Jan '22

28 Jan '22

Add the missing platform_device_put() and platform_device_del() before return from pcm030_fabric_probe in the error handling case. Fixes: c912fa913446 ("ASoC: fsl: register the wm9712-codec") Signed-off-by: Miaoqian Lin <linmq006(a)gmail.com> --- sound/soc/fsl/pcm030-audio-fabric.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/sound/soc/fsl/pcm030-audio-fabric.c b/sound/soc/fsl/pcm030-audio-fabric.c index af3c3b90c0ac..02c4ae20c673 100644 --- a/sound/soc/fsl/pcm030-audio-fabric.c +++ b/sound/soc/fsl/pcm030-audio-fabric.c @@ -93,15 +93,22 @@ static int pcm030_fabric_probe(struct platform_device *op) dev_err(&op->dev, "platform_device_alloc() failed\n"); ret = platform_device_add(pdata->codec_device); - if (ret) + if (ret) { dev_err(&op->dev, "platform_device_add() failed: %d\n", ret); + goto exit_device_put; + } ret = snd_soc_register_card(card); if (ret) dev_err(&op->dev, "snd_soc_register_card() failed: %d\n", ret); platform_set_drvdata(op, pdata); + return ret; +exit_release_dev: + platform_device_del(pdata->codec_device); +exit_device_put: + platform_device_put(pdata->codec_device); return ret; } -- 2.17.1

2 3

[PATCH 0/4] ASoC: qcom: fixes for Qualcomm codecs and q6apm
by Srinivas Kandagatla 28 Jan '22

28 Jan '22

Hi Mark, Some recent testing found few issues with wcd938x and lpass-tx codec drivers. WCD938x was accessing array out of boundaries resulting in corruption and system crashes along with not handling kcontrol put return values correctly and rx-macro had incorrect sidetone registers offsets. One final fix in q6apm to add a check if graph started before stopping it. Thanks, srini Srinivas Kandagatla (4): ASoC: codecs: wcd938x: fix incorrect used of portid ASoC: codecs: lpass-rx-macro: fix sidetone register offsets ASoC: codecs: wcd938x: fix return value of mixer put function ASoC: qdsp6: q6apm-dai: only stop graphs that are started sound/soc/codecs/lpass-rx-macro.c | 8 ++++---- sound/soc/codecs/wcd938x.c | 31 +++++++++++++++++-------------- sound/soc/qcom/qdsp6/q6apm-dai.c | 7 +++++-- 3 files changed, 26 insertions(+), 20 deletions(-) -- 2.21.0

2 7

[PATCH 1/2] ASoC: ops: fix signedness bug in snd_soc_put_volsw()
by Dan Carpenter 28 Jan '22

28 Jan '22

The "val" and "val2" variables need to signed for the checking to work as intended. Fixes: 817f7c9335ec ("ASoC: ops: Reject out of bounds values in snd_soc_put_volsw()") Signed-off-by: Dan Carpenter <dan.carpenter(a)oracle.com> --- sound/soc/soc-ops.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/sound/soc/soc-ops.c b/sound/soc/soc-ops.c index dc0e7c8d31f3..0091fa96eb48 100644 --- a/sound/soc/soc-ops.c +++ b/sound/soc/soc-ops.c @@ -310,8 +310,9 @@ int snd_soc_put_volsw(struct snd_kcontrol *kcontrol, unsigned int invert = mc->invert; int err; bool type_2r = false; - unsigned int val2 = 0; - unsigned int val, val_mask; + unsigned int val_mask; + int val2 = 0; + int val; if (sign_bit) mask = BIT(sign_bit + 1) - 1; -- 2.20.1

2 5

[PATCH] ASoC: dt-bindings: Centralize the 'sound-dai' definition
by Rob Herring 28 Jan '22

28 Jan '22

'sound-dai' is a common property, but has duplicate type definitions. Create a new common definition to define the type and then update all the other occurrences to just define how many entries there are just like other phandle+arg properties. The constraints on the number of entries is based on the examples and could be wrong. Cc: Krzysztof Kozlowski <krzysztof.kozlowski(a)canonical.com> Signed-off-by: Rob Herring <robh(a)kernel.org> --- Please ack, this depends on commit abf0fee97313 ("dt-bindings: Improve phandle-array schemas") in my tree. --- .../bindings/sound/amlogic,gx-sound-card.yaml | 4 ++-- .../bindings/sound/google,sc7180-trogdor.yaml | 6 ++++-- .../bindings/sound/imx-audio-card.yaml | 7 +++++-- .../bindings/sound/qcom,sm8250.yaml | 10 +++++++--- .../bindings/sound/samsung,aries-wm8994.yaml | 5 +---- .../bindings/sound/samsung,midas-audio.yaml | 2 -- .../bindings/sound/samsung,odroid.yaml | 9 +++------ .../devicetree/bindings/sound/sound-dai.yaml | 20 +++++++++++++++++++ 8 files changed, 42 insertions(+), 21 deletions(-) create mode 100644 Documentation/devicetree/bindings/sound/sound-dai.yaml diff --git a/Documentation/devicetree/bindings/sound/amlogic,gx-sound-card.yaml b/Documentation/devicetree/bindings/sound/amlogic,gx-sound-card.yaml index 2e35aeaa8781..8b5be4b92f35 100644 --- a/Documentation/devicetree/bindings/sound/amlogic,gx-sound-card.yaml +++ b/Documentation/devicetree/bindings/sound/amlogic,gx-sound-card.yaml @@ -57,7 +57,7 @@ patternProperties: rate sound-dai: - $ref: /schemas/types.yaml#/definitions/phandle-array + maxItems: 1 description: phandle of the CPU DAI patternProperties: @@ -71,7 +71,7 @@ patternProperties: properties: sound-dai: - $ref: /schemas/types.yaml#/definitions/phandle-array + maxItems: 1 description: phandle of the codec DAI required: diff --git a/Documentation/devicetree/bindings/sound/google,sc7180-trogdor.yaml b/Documentation/devicetree/bindings/sound/google,sc7180-trogdor.yaml index 837e3faa63a9..233caa0ade87 100644 --- a/Documentation/devicetree/bindings/sound/google,sc7180-trogdor.yaml +++ b/Documentation/devicetree/bindings/sound/google,sc7180-trogdor.yaml @@ -62,13 +62,15 @@ patternProperties: description: Holds subnode which indicates cpu dai. type: object properties: - sound-dai: true + sound-dai: + maxItems: 1 codec: description: Holds subnode which indicates codec dai. type: object properties: - sound-dai: true + sound-dai: + maxItems: 1 required: - link-name diff --git a/Documentation/devicetree/bindings/sound/imx-audio-card.yaml b/Documentation/devicetree/bindings/sound/imx-audio-card.yaml index d1816dd061cf..bb3a435722c7 100644 --- a/Documentation/devicetree/bindings/sound/imx-audio-card.yaml +++ b/Documentation/devicetree/bindings/sound/imx-audio-card.yaml @@ -59,13 +59,16 @@ patternProperties: description: Holds subnode which indicates cpu dai. type: object properties: - sound-dai: true + sound-dai: + maxItems: 1 codec: description: Holds subnode which indicates codec dai. type: object properties: - sound-dai: true + sound-dai: + minItems: 1 + maxItems: 2 fsl,mclk-equal-bclk: description: Indicates mclk can be equal to bclk, especially for sai interface diff --git a/Documentation/devicetree/bindings/sound/qcom,sm8250.yaml b/Documentation/devicetree/bindings/sound/qcom,sm8250.yaml index 4bfda04b4608..4ecd4080bb96 100644 --- a/Documentation/devicetree/bindings/sound/qcom,sm8250.yaml +++ b/Documentation/devicetree/bindings/sound/qcom,sm8250.yaml @@ -69,19 +69,23 @@ patternProperties: description: Holds subnode which indicates cpu dai. type: object properties: - sound-dai: true + sound-dai: + maxItems: 1 platform: description: Holds subnode which indicates platform dai. type: object properties: - sound-dai: true + sound-dai: + maxItems: 1 codec: description: Holds subnode which indicates codec dai. type: object properties: - sound-dai: true + sound-dai: + minItems: 1 + maxItems: 4 required: - link-name diff --git a/Documentation/devicetree/bindings/sound/samsung,aries-wm8994.yaml b/Documentation/devicetree/bindings/sound/samsung,aries-wm8994.yaml index eb487ed3ca3b..4ffa275b3c49 100644 --- a/Documentation/devicetree/bindings/sound/samsung,aries-wm8994.yaml +++ b/Documentation/devicetree/bindings/sound/samsung,aries-wm8994.yaml @@ -27,9 +27,6 @@ properties: sound-dai: minItems: 2 maxItems: 2 - items: - maxItems: 1 - $ref: /schemas/types.yaml#/definitions/phandle-array description: | phandles to the I2S controller and bluetooth codec, in that order @@ -38,7 +35,7 @@ properties: type: object properties: sound-dai: - $ref: /schemas/types.yaml#/definitions/phandle-array + maxItems: 1 description: phandle to the WM8994 CODEC samsung,audio-routing: diff --git a/Documentation/devicetree/bindings/sound/samsung,midas-audio.yaml b/Documentation/devicetree/bindings/sound/samsung,midas-audio.yaml index 095775c598fa..ec50bcb4af5f 100644 --- a/Documentation/devicetree/bindings/sound/samsung,midas-audio.yaml +++ b/Documentation/devicetree/bindings/sound/samsung,midas-audio.yaml @@ -21,7 +21,6 @@ properties: type: object properties: sound-dai: - $ref: /schemas/types.yaml#/definitions/phandle-array maxItems: 1 description: phandle to the I2S controller required: @@ -31,7 +30,6 @@ properties: type: object properties: sound-dai: - $ref: /schemas/types.yaml#/definitions/phandle-array maxItems: 1 description: phandle to the WM1811 CODEC required: diff --git a/Documentation/devicetree/bindings/sound/samsung,odroid.yaml b/Documentation/devicetree/bindings/sound/samsung,odroid.yaml index e8122bc87362..db2513f3e168 100644 --- a/Documentation/devicetree/bindings/sound/samsung,odroid.yaml +++ b/Documentation/devicetree/bindings/sound/samsung,odroid.yaml @@ -37,18 +37,15 @@ properties: type: object properties: sound-dai: - $ref: /schemas/types.yaml#/definitions/phandle-array description: phandles to the I2S controllers codec: type: object properties: sound-dai: - $ref: /schemas/types.yaml#/definitions/phandle-array - description: | - List of phandles to the CODEC nodes, - first entry must be corresponding to the MAX98090 CODEC and - the second entry must be the phandle of the HDMI IP block node. + items: + - description: phandle of the MAX98090 CODEC + - description: phandle of the HDMI IP block node samsung,audio-routing: $ref: /schemas/types.yaml#/definitions/non-unique-string-array diff --git a/Documentation/devicetree/bindings/sound/sound-dai.yaml b/Documentation/devicetree/bindings/sound/sound-dai.yaml new file mode 100644 index 000000000000..61c6f7abc4e7 --- /dev/null +++ b/Documentation/devicetree/bindings/sound/sound-dai.yaml @@ -0,0 +1,20 @@ +# SPDX-License-Identifier: GPL-2.0-only OR BSD-2-Clause +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/sound/sound-dai.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Digital Audio Interface consumer Device Tree Bindings + +maintainers: + - Rob Herring <robh(a)kernel.org> + +select: true + +properties: + sound-dai: + $ref: /schemas/types.yaml#/definitions/phandle-array + description: A phandle plus args to digital audio interface provider(s) + +additionalProperties: true +... -- 2.32.0

4 5

Fix pre-processor defs parsing with recursive includes
by GitHub pull_request - opened 27 Jan '22

27 Jan '22

alsa-project/alsa-utils pull request #140 was opened from ranj063: Since the Define {} config has been removed form the input_cfg, use the tplg_pp->define_cfg_merged for search for variable definitions. Also, fix the parsing logic to first merge all variables from the conf files recursively and then override them with the command line definitions. Request URL : https://github.com/alsa-project/alsa-utils/pull/140 Patch URL : https://github.com/alsa-project/alsa-utils/pull/140.patch Repository URL: https://github.com/alsa-project/alsa-utils

1 0

acp6x: add initial support for AMD Yellow Carp - ACP6x
by GitHub pull_request - opened 27 Jan '22

27 Jan '22

alsa-project/alsa-ucm-conf pull request #138 was opened from perexg: https://github.com/alsa-project/alsa-ucm-conf/issues/136 Request URL : https://github.com/alsa-project/alsa-ucm-conf/pull/138 Patch URL : https://github.com/alsa-project/alsa-ucm-conf/pull/138.patch Repository URL: https://github.com/alsa-project/alsa-ucm-conf

1 0

ucm2: Add intial Amlogic GXL support
by GitHub pull_request - opened 27 Jan '22

27 Jan '22

alsa-project/alsa-ucm-conf pull request #137 was opened from jeromebrunet: This adds the support for the GXL-P241 and the LIBRETECH-CC. I have proposed the related ucm-validator PR: https://github.com/alsa-project/alsa-tests/pull/23 I was not successful with txt check: ``` !!Sysfs card info !!--------------- Traceback (most recent call last): File "/home/jbrunet/work/generic/sound/alsa-tests/python/ucm-validator/./ucm.py", line 238, in <module> main(sys.argv) File "/home/jbrunet/work/generic/sound/alsa-tests/python/ucm-validator/./ucm.py", line 233, in main r = globals()[cmd](*argv[2:]) File "/home/jbrunet/work/generic/sound/alsa-tests/python/ucm-validator/./ucm.py", line 185, in do_configs errors, warnings = config_walk(alsainfo_path) File "/home/jbrunet/work/generic/sound/alsa-tests/python/ucm-validator/./ucm.py", line 129, in config_walk errors1, warnings1 = config_walk(path2) File "/home/jbrunet/work/generic/sound/alsa-tests/python/ucm-validator/./ucm.py", line 142, in config_walk info.load(path2) File "/home/jbrunet/work/generic/sound/alsa-tests/python/ucm-validator/../lib/alsainfo.py", line 314, in load raise AlsaInfoError("%s: unknown section %s" % (filename, repr(name))) alsainfo.AlsaInfoError: configs/Meson/LIBRETECH-CC.txt: unknown section 'Sysfs card info' ``` I also check with the dummy json: ``` *** configuration 'configs/Meson/GXL-P241.json' @ AlsaJsonSoundcard(json='GXL-P241', id='GXL-P241', driver='gx-sound-card', name='GXL-P241', longname='GXL-P241') *** Device file 'conf.d/gx-sound-card/GXL-P241.conf' Verb 'HiFi', file 'Meson/p241/p241-HiFi.conf' Device 'Line' Device 'HDMI' ERR: conf.d/gx-sound-card/GXL-P241.conf: Verb=HiFi Device=Line PlaybackPCM defined in SectionVerb ERR: AlsaJsonSoundcard(json='GXL-P241', id='GXL-P241', driver='gx-sound-card', name='GXL-P241', longname='GXL-P241') ERR: total errors: 1 ``` I'm not quite sure where to put the `PlaybackPCM`, if not in `Verb`. The `Device ` section in not a good fit, as far as I understand. On these devices, we have a single PCM interface. HDMI and Line Devices may be enabled on it (possibly simultaneously). Any suggestion ? Looking at pulseaudio, I'm quite happy with the result: ``` $ pactl list sinks Sink #0 State: SUSPENDED Name: alsa_output.platform-sound.HiFi__hw_LIBRETECHCC_0__sink Description: Built-in Audio HDMI + Analog Lineout Driver: module-alsa-card.c Sample Specification: s16le 2ch 44100Hz Channel Map: front-left,front-right Owner Module: 6 Mute: no Volume: front-left: 65536 / 100% / 0.00 dB, front-right: 65536 / 100% / 0.00 dB balance 0.00 Base Volume: 65536 / 100% / 0.00 dB Monitor Source: alsa_output.platform-sound.HiFi__hw_LIBRETECHCC_0__sink.monitor Latency: 0 usec, configured 0 usec Flags: HARDWARE DECIBEL_VOLUME LATENCY Properties: alsa.resolution_bits = "16" device.api = "alsa" device.class = "sound" alsa.class = "generic" alsa.subclass = "generic-mix" alsa.name = "" alsa.id = "fe.dai-link-0 (*)" alsa.subdevice = "0" alsa.subdevice_name = "subdevice #0" alsa.device = "0" alsa.card = "0" alsa.card_name = "LIBRETECH-CC" alsa.long_card_name = "LIBRETECH-CC" alsa.driver_name = "snd_soc_meson_gx_sound_card" device.bus_path = "platform-sound" sysfs.path = "/devices/platform/sound/sound/card0" device.form_factor = "internal" device.string = "_ucm0001.hw:LIBRETECHCC,0" device.buffering.buffer_size = "352768" device.buffering.fragment_size = "176384" device.access_mode = "mmap+timer" device.profile.name = "HiFi: hw:LIBRETECHCC,0: sink" device.profile.description = "HDMI + Analog Lineout" alsa.mixer_device = "_ucm0001.hw:LIBRETECHCC" device.description = "Built-in Audio HDMI + Analog Lineout" module-udev-detect.discovered = "1" device.icon_name = "audio-card" Ports: [Out] HDMI: HDMI (type: HDMI, priority: 100, availability unknown) [Out] Line: Analog Lineout (type: Line, priority: 100, availability unknown) Active Port: [Out] HDMI Formats: pcm ``` Request URL : https://github.com/alsa-project/alsa-ucm-conf/pull/137 Patch URL : https://github.com/alsa-project/alsa-ucm-conf/pull/137.patch Repository URL: https://github.com/alsa-project/alsa-ucm-conf

1 0

Mouse stopped working in xterm and rxvt-unicode
by GitHub issues - opened 27 Jan '22

27 Jan '22

alsa-project/alsa-utils issue #139 was opened from m-ou-se: Since 1.2.6, I can't control alsamixer with my mouse's scroll wheel anymore in xterm and rxvt-unicode. I'm assuming it's related to this commit: https://github.com/alsa-project/alsa-utils/commit/31820c5f239fca2de12c8d1a7… Issue URL : https://github.com/alsa-project/alsa-utils/issues/139 Repository URL: https://github.com/alsa-project/alsa-utils

1 0

[PATCH] ALSA: hda: Fix signedness of sscanf() arguments
by Takashi Iwai 27 Jan '22

27 Jan '22

The %x format of sscanf() takes an unsigned int pointer, while we pass a signed int pointer. Practically it's OK, but this may result in a compile warning. Let's fix it. Fixes: a235d5b8e550 ("ALSA: hda: Allow model option to specify PCI SSID alias") Reported-by: kernel test robot <lkp(a)intel.com> Signed-off-by: Takashi Iwai <tiwai(a)suse.de> --- sound/pci/hda/hda_auto_parser.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/pci/hda/hda_auto_parser.c b/sound/pci/hda/hda_auto_parser.c index 82c492b05667..cd1db943b7e0 100644 --- a/sound/pci/hda/hda_auto_parser.c +++ b/sound/pci/hda/hda_auto_parser.c @@ -981,7 +981,7 @@ void snd_hda_pick_fixup(struct hda_codec *codec, int id = HDA_FIXUP_ID_NOT_SET; const char *name = NULL; const char *type = NULL; - int vendor, device; + unsigned int vendor, device; if (codec->fixup_id != HDA_FIXUP_ID_NOT_SET) return; -- 2.31.1

1 0

[PATCH] ALSA: usb-audio: initialize variables that could ignore errors
by trix＠redhat.com 27 Jan '22

27 Jan '22

From: Tom Rix <trix(a)redhat.com> clang static analysis reports this representative issue mixer.c:1548:35: warning: Assigned value is garbage or undefined ucontrol->value.integer.value[0] = val; ^ ~~~ The filter_error() macro allows errors to be ignored. If errors can be ignored, initialize variables so garbage will not be used. Fixes: 48cc42973509 ("ALSA: usb-audio: Filter error from connector kctl ops, too") Signed-off-by: Tom Rix <trix(a)redhat.com> --- sound/usb/mixer.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/sound/usb/mixer.c b/sound/usb/mixer.c index e8f3f8d622ec5..630766ba259fd 100644 --- a/sound/usb/mixer.c +++ b/sound/usb/mixer.c @@ -1527,6 +1527,10 @@ static int get_connector_value(struct usb_mixer_elem_info *cval, usb_audio_err(chip, "cannot get connectors status: req = %#x, wValue = %#x, wIndex = %#x, type = %d\n", UAC_GET_CUR, validx, idx, cval->val_type); + + if (val) + *val = 0; + return filter_error(cval, ret); } -- 2.26.3

2 1

[PATCH 0/5] Tegra234 APE support
by Sameer Pujar 27 Jan '22

27 Jan '22

This adds APE support on Tegra234 and enables sound card on Jetson AGX Orin platform. Mohan Kumar (1): ASoC: tegra: Update AHUB driver for Tegra234 Sameer Pujar (4): dt-bindings: Add Tegra234 APE support dt-bindings: Document Tegra234 APE support arm64: tegra: Add audio devices on Tegra234 arm64: tegra: APE sound card for Jetson AGX Orin .../bindings/bus/nvidia,tegra210-aconnect.yaml | 1 + .../bindings/dma/nvidia,tegra210-adma.yaml | 4 +- .../bindings/interrupt-controller/arm,gic.yaml | 1 + .../bindings/sound/nvidia,tegra186-dspk.yaml | 4 +- .../bindings/sound/nvidia,tegra210-admaif.yaml | 4 +- .../bindings/sound/nvidia,tegra210-adx.yaml | 1 + .../bindings/sound/nvidia,tegra210-ahub.yaml | 1 + .../bindings/sound/nvidia,tegra210-amx.yaml | 3 + .../bindings/sound/nvidia,tegra210-dmic.yaml | 1 + .../bindings/sound/nvidia,tegra210-i2s.yaml | 1 + .../bindings/sound/nvidia,tegra210-mixer.yaml | 1 + .../bindings/sound/nvidia,tegra210-mvc.yaml | 1 + .../bindings/sound/nvidia,tegra210-sfc.yaml | 1 + .../dts/nvidia/tegra234-p3737-0000+p3701-0000.dts | 1781 ++++++++++++++++++++ arch/arm64/boot/dts/nvidia/tegra234.dtsi | 432 +++++ include/dt-bindings/clock/tegra234-clock.h | 72 + include/dt-bindings/memory/tegra234-mc.h | 5 + include/dt-bindings/power/tegra234-powergate.h | 1 + sound/soc/tegra/tegra210_ahub.c | 147 +- sound/soc/tegra/tegra210_ahub.h | 4 +- 20 files changed, 2461 insertions(+), 5 deletions(-) -- 2.7.4

2 7

Add support for AMD ACP Microphone devices for Yellow Carp platform
by GitHub issues - opened 27 Jan '22

27 Jan '22

alsa-project/alsa-ucm-conf issue #136 was opened from vijendarmukunda: We have tried to add similar changes which were applied for Renoir platform for YC platform by following below link. https://github.com/alsa-project/alsa-ucm-conf/issues/54 But we are unable to create links. Without ALSA UCM changes, we are able to observe similar issues earlier reported on Renoir platform as mentioned below. 1) Fallback profile is getting loaded and capture endpoint name is not listed as "Digital Microphone" 2) Mic Mute Led button is not reflected with Mute status. Attached pa-info and alsa info output. [painfo.txt](https://github.com/alsa-project/alsa-ucm-conf/files/7947396/pai… [alsa-info.txt](https://github.com/alsa-project/alsa-ucm-conf/files/7947401/… a Issue URL : https://github.com/alsa-project/alsa-ucm-conf/issues/136 Repository URL: https://github.com/alsa-project/alsa-ucm-conf

1 0

Fixes for attribute value validation in the topology pre-processor
by GitHub pull_request - opened 27 Jan '22

27 Jan '22

alsa-project/alsa-utils pull request #138 was opened from ranj063: This PR fixes 2 issues: 1. Allow variable definitions within included conf files 2. Validating attributes after expanding the variables Request URL : https://github.com/alsa-project/alsa-utils/pull/138 Patch URL : https://github.com/alsa-project/alsa-utils/pull/138.patch Repository URL: https://github.com/alsa-project/alsa-utils

1 0

Re: [PATCH v2] sound/soc: adds TAS5754M digital input amplifier component driver
by Joerg Schambacher 26 Jan '22

26 Jan '22

Mark, Thanks for your useful feedback. I guess my comments on my first reply got lost somewhere on the way .... I've updated and fixed some other issues meanwhile, too. Joerg On Wed, Nov 17, 2021 at 03:13:47PM +0000, Mark Brown wrote: > On Fri, Oct 29, 2021 at 11:57:30AM +0200, Joerg Schambacher wrote: > > > Adds a minimum component driver to run the amplifier in I2S master > > mode only from standard audio clocks. Therefore, it only allows > > 44.1, 88.2, 176.4, 48, 96 and 192ksps with 16, 20, 24 and 32 bits > > sample size. Digital volume control and the -6dB switch are supported. > > This looks pretty clean, there's a bunch of minor stylistic bits below > but other than one major thing this looks good. The major thing is the > use of a had coded init sequence to configure the device rather than > implemenenting the relevant APIs to do so, that's going to make the > driver unsuitable for use on boards other than the specific one you > happen to be looking at at the minute. > > Please submit patches using subject lines reflecting the style for the > subsystem, this makes it easier for people to identify relevant patches. > Look at what existing commits in the area you're changing are doing and > make sure your subject lines visually resemble what they're doing. > > > @@ -0,0 +1,547 @@ > > +// SPDX-License-Identifier: GPL-2.0 > > +/* > > + * Driver for the TAS5754M Audio Amplifier in Master mode (only) > > + * supports only standard audio frequencies 44.1 to 192 ksps > > Please make the entire comment a C++ one so things look more > intentional. > > > +EXPORT_SYMBOL_GPL(tas5754m_regmap); > yes, remainder from some experiments - fixed > There's only one file in the driver, why is this exported? > > > + mclk = clk_get_rate(tas5754m->sclk); > > + bclk = sample_len * 2 * params_rate(params); > > snd_soc_params_to_bclk(). snd_soc_params_to_bclk() does not always gives the necessary value > > > + // set SCLK divider > > + ret |= regmap_write(tas5754m->regmap, TAS5754M_MASTER_CLKDIV_1, > > + bclk_div - 1); > > + > > + // set LRCLK divider > > + ret |= regmap_write(tas5754m->regmap, TAS5754M_MASTER_CLKDIV_2, > > + lrclk_div - 1); > Fixed > Check the return statuses individually or just don't bother, if you or > them together then you could end up with a nonsensical error code which > could cause confusion down the line. > > > + if (mute) { > > + snd_soc_component_write(component, TAS5754M_MUTE, 0x11); > > + } else { > > + usleep_range(1000, 2000); > > + snd_soc_component_write(component, TAS5754M_MUTE, 0x00); > > Why the sleep here? Wait for settling of the clocks before unmute > > > + ret = regmap_multi_reg_write(regmap, tas5754m_init_sequence, > > + ARRAY_SIZE(tas5754m_init_sequence)); > > This init sequence looks an awful lot like it's doing board specific > configuration - it's enabling the PLL, configuring GPIOs and clock > dividers among other things. These should all be done through board > specific configuration or based on the currently configured audio path, > what's suitable for one board may not be suitable for another board. > Doing a reset of the chip is good but the rest of it really looks like > it doesn't belong. Ok, completely re-organized in the next trial > > > + ret = snd_soc_register_component(dev, > > + &tas5754m_soc_component, &tas5754m_dai, 1); > > devm_snd_soc_register_component() > fixed > > +static const struct i2c_device_id tas5754m_i2c_id[] = { > > + { "tas5754m", }, > > + { } > > +}; > > +MODULE_DEVICE_TABLE(i2c, tas5754m_i2c_id); > > + > > +#ifdef CONFIG_OF > > +static const struct of_device_id tas5754m_of_match[] = { > > + { .compatible = "ti,tas5754m", }, > > + { .compatible = "ti,tas5756m", }, > > + { } > > +}; > > +MODULE_DEVICE_TABLE(of, tas5754m_of_match); > > +#endif > > Why not list both I2C IDs as well? Fixed > > > @@ -0,0 +1,259 @@ > > +/* SPDX-License-Identifier: GPL-2.0-only */ > > +/* > > + * Driver for the TAS5754M DAC+amplifier combo devices > > + * > > + * Author: (copied from pcm512x.h) > > + * Mark Brown <broonie(a)kernel.org> > > + * Copyright 2014 Linaro Ltd > > + */ > > If the register map can be copied can't the two drivers be combined? The TI apps team recommended to write a separate driver as there are some differences. I have also aligned some names to the TAS575xM spec in the next patch > > > +#define TAS5754M_VIRT_BASE 0x000 > > +#define TAS5754M_PAGE_LEN 0x80 > > +#define TAS5754M_PAGE_BASE(n) (TAS5754M_VIRT_BASE + (TAS5754M_PAGE_LEN * n)) > > + > > +#define TAS5754M_PAGE 0 > > There's no mention of paging in the regmap description for the driver > which feels like it's asking for problems. I think, it's defined in the correct way. Where/when exactly do you see a problem? > > > + > > +#define TAS5754M_RESET (TAS5754M_PAGE_BASE(0) + 1) > > +#define TAS5754M_POWER (TAS5754M_PAGE_BASE(0) + 2) > > +#define TAS5754M_MUTE (TAS5754M_PAGE_BASE(0) + 3) > > +#define TAS5754M_PLL_EN (TAS5754M_PAGE_BASE(0) + 4) > > +#define TAS5754M_SPI_MISO_FUNCTION (TAS5754M_PAGE_BASE(0) + 6) > > +#define TAS5754M_DSP (TAS5754M_PAGE_BASE(0) + 7) > > +#define TAS5754M_GPIO_EN (TAS5754M_PAGE_BASE(0) + 8) > > +#define TAS5754M_BCLK_LRCLK_CFG (TAS5754M_PAGE_BASE(0) + 9) > > +#define TAS5754M_DSP_GPIO_INPUT (TAS5754M_PAGE_BASE(0) + 10) > > +#define TAS5754M_MASTER_MODE (TAS5754M_PAGE_BASE(0) + 12) > > +#define TAS5754M_PLL_REF (TAS5754M_PAGE_BASE(0) + 13) > > +#define TAS5754M_DAC_REF (TAS5754M_PAGE_BASE(0) + 14) > > +#define TAS5754M_GPIO_DACIN (TAS5754M_PAGE_BASE(0) + 16) > > +#define TAS5754M_GPIO_PLLIN (TAS5754M_PAGE_BASE(0) + 18) > > +#define TAS5754M_SYNCHRONIZE (TAS5754M_PAGE_BASE(0) + 19) > > +#define TAS5754M_PLL_COEFF_0 (TAS5754M_PAGE_BASE(0) + 20) > > +#define TAS5754M_PLL_COEFF_1 (TAS5754M_PAGE_BASE(0) + 21) > > +#define TAS5754M_PLL_COEFF_2 (TAS5754M_PAGE_BASE(0) + 22) > > +#define TAS5754M_PLL_COEFF_3 (TAS5754M_PAGE_BASE(0) + 23) > > +#define TAS5754M_PLL_COEFF_4 (TAS5754M_PAGE_BASE(0) + 24) > > +#define TAS5754M_DSP_CLKDIV (TAS5754M_PAGE_BASE(0) + 27) > > +#define TAS5754M_DAC_CLKDIV (TAS5754M_PAGE_BASE(0) + 28) > > +#define TAS5754M_NCP_CLKDIV (TAS5754M_PAGE_BASE(0) + 29) > > +#define TAS5754M_OSR_CLKDIV (TAS5754M_PAGE_BASE(0) + 30) > > +#define TAS5754M_MASTER_CLKDIV_1 (TAS5754M_PAGE_BASE(0) + 32) > > +#define TAS5754M_MASTER_CLKDIV_2 (TAS5754M_PAGE_BASE(0) + 33) > > +#define TAS5754M_FS_SPEED_MODE (TAS5754M_PAGE_BASE(0) + 34) > > +#define TAS5754M_IDAC_1 (TAS5754M_PAGE_BASE(0) + 35) > > +#define TAS5754M_IDAC_2 (TAS5754M_PAGE_BASE(0) + 36) > > +#define TAS5754M_ERROR_DETECT (TAS5754M_PAGE_BASE(0) + 37) > > +#define TAS5754M_I2S_1 (TAS5754M_PAGE_BASE(0) + 40) > > +#define TAS5754M_I2S_2 (TAS5754M_PAGE_BASE(0) + 41) > > +#define TAS5754M_DAC_ROUTING (TAS5754M_PAGE_BASE(0) + 42) > > +#define TAS5754M_DSP_PROGRAM (TAS5754M_PAGE_BASE(0) + 43) > > +#define TAS5754M_CLKDET (TAS5754M_PAGE_BASE(0) + 44) > > +#define TAS5754M_AUTO_MUTE (TAS5754M_PAGE_BASE(0) + 59) > > +#define TAS5754M_DIGITAL_VOLUME_1 (TAS5754M_PAGE_BASE(0) + 60) > > +#define TAS5754M_DIGITAL_VOLUME_2 (TAS5754M_PAGE_BASE(0) + 61) > > +#define TAS5754M_DIGITAL_VOLUME_3 (TAS5754M_PAGE_BASE(0) + 62) > > +#define TAS5754M_DIGITAL_MUTE_1 (TAS5754M_PAGE_BASE(0) + 63) > > +#define TAS5754M_DIGITAL_MUTE_2 (TAS5754M_PAGE_BASE(0) + 64) > > +#define TAS5754M_DIGITAL_MUTE_3 (TAS5754M_PAGE_BASE(0) + 65) > > +#define TAS5754M_GPIO_OUTPUT_1 (TAS5754M_PAGE_BASE(0) + 80) > > +#define TAS5754M_GPIO_OUTPUT_2 (TAS5754M_PAGE_BASE(0) + 81) > > +#define TAS5754M_GPIO_OUTPUT_3 (TAS5754M_PAGE_BASE(0) + 82) > > +#define TAS5754M_GPIO_OUTPUT_4 (TAS5754M_PAGE_BASE(0) + 83) > > +#define TAS5754M_GPIO_OUTPUT_5 (TAS5754M_PAGE_BASE(0) + 84) > > +#define TAS5754M_GPIO_OUTPUT_6 (TAS5754M_PAGE_BASE(0) + 85) > > +#define TAS5754M_GPIO_CONTROL_1 (TAS5754M_PAGE_BASE(0) + 86) > > +#define TAS5754M_GPIO_CONTROL_2 (TAS5754M_PAGE_BASE(0) + 87) > > +#define TAS5754M_OVERFLOW (TAS5754M_PAGE_BASE(0) + 90) > > +#define TAS5754M_RATE_DET_1 (TAS5754M_PAGE_BASE(0) + 91) > > +#define TAS5754M_RATE_DET_2 (TAS5754M_PAGE_BASE(0) + 92) > > +#define TAS5754M_RATE_DET_3 (TAS5754M_PAGE_BASE(0) + 93) > > +#define TAS5754M_RATE_DET_4 (TAS5754M_PAGE_BASE(0) + 94) > > +#define TAS5754M_CLOCK_STATUS (TAS5754M_PAGE_BASE(0) + 95) > > +#define TAS5754M_ANALOG_MUTE_DET (TAS5754M_PAGE_BASE(0) + 108) > > +#define TAS5754M_GPIN (TAS5754M_PAGE_BASE(0) + 119) > > +#define TAS5754M_DIGITAL_MUTE_DET (TAS5754M_PAGE_BASE(0) + 120) > > + > > +#define TAS5754M_OUTPUT_AMPLITUDE (TAS5754M_PAGE_BASE(1) + 1) > > +#define TAS5754M_ANALOG_GAIN_CTRL (TAS5754M_PAGE_BASE(1) + 2) > > +#define TAS5754M_UNDERVOLTAGE_PROT (TAS5754M_PAGE_BASE(1) + 5) > > +#define TAS5754M_ANALOG_MUTE_CTRL (TAS5754M_PAGE_BASE(1) + 6) > > +#define TAS5754M_ANALOG_GAIN_BOOST (TAS5754M_PAGE_BASE(1) + 7) > > +#define TAS5754M_VCOM_CTRL_1 (TAS5754M_PAGE_BASE(1) + 8) > > +#define TAS5754M_VCOM_CTRL_2 (TAS5754M_PAGE_BASE(1) + 9) > > + > > +#define TAS5754M_CRAM_CTRL (TAS5754M_PAGE_BASE(44) + 1) > > + > > +#define TAS5754M_FLEX_A (TAS5754M_PAGE_BASE(253) + 63) > > +#define TAS5754M_FLEX_B (TAS5754M_PAGE_BASE(253) + 64) > > + > > +#define TAS5754M_MAX_REGISTER (TAS5754M_PAGE_BASE(253) + 64) > > + > > +/* Page 0, Register 1 - reset */ > > +#define TAS5754M_RSTR (1 << 0) > > +#define TAS5754M_RSTM (1 << 4) > > + > > +/* Page 0, Register 2 - power */ > > +#define TAS5754M_RQPD (1 << 0) > > +#define TAS5754M_RQPD_SHIFT 0 > > +#define TAS5754M_RQST (1 << 4) > > +#define TAS5754M_RQST_SHIFT 4 > > + > > +/* Page 0, Register 3 - mute */ > > +#define TAS5754M_RQMR (1 << 0) > > +#define TAS5754M_RQMR_SHIFT 0 > > +#define TAS5754M_RQML (1 << 4) > > +#define TAS5754M_RQML_SHIFT 4 > > + > > +/* Page 0, Register 4 - PLL */ > > +#define TAS5754M_PLLE (1 << 0) > > +#define TAS5754M_PLLE_SHIFT 0 > > +#define TAS5754M_PLCK (1 << 4) > > +#define TAS5754M_PLCK_SHIFT 4 > > + > > +/* Page 0, Register 7 - DSP */ > > +#define TAS5754M_SDSL (1 << 0) > > +#define TAS5754M_SDSL_SHIFT 0 > > +#define TAS5754M_DEMP (1 << 4) > > +#define TAS5754M_DEMP_SHIFT 4 > > + > > +/* Page 0, Register 8 - GPIO output enable */ > > +#define TAS5754M_G1OE (1 << 0) > > +#define TAS5754M_G2OE (1 << 1) > > +#define TAS5754M_G3OE (1 << 2) > > +#define TAS5754M_G4OE (1 << 3) > > +#define TAS5754M_G5OE (1 << 4) > > +#define TAS5754M_G6OE (1 << 5) > > + > > +/* Page 0, Register 9 - BCK, LRCLK configuration */ > > +#define TAS5754M_LRKO (1 << 0) > > +#define TAS5754M_LRKO_SHIFT 0 > > +#define TAS5754M_BCKO (1 << 4) > > +#define TAS5754M_BCKO_SHIFT 4 > > +#define TAS5754M_BCKP (1 << 5) > > +#define TAS5754M_BCKP_SHIFT 5 > > + > > +/* Page 0, Register 12 - Master mode BCK, LRCLK reset */ > > +#define TAS5754M_RLRK (1 << 0) > > +#define TAS5754M_RLRK_SHIFT 0 > > +#define TAS5754M_RBCK (1 << 1) > > +#define TAS5754M_RBCK_SHIFT 1 > > + > > +/* Page 0, Register 13 - PLL reference */ > > +#define TAS5754M_SREF (7 << 4) > > +#define TAS5754M_SREF_SHIFT 4 > > +#define TAS5754M_SREF_SCK (0 << 4) > > +#define TAS5754M_SREF_BCK (1 << 4) > > +#define TAS5754M_SREF_GPIO (3 << 4) > > + > > +/* Page 0, Register 14 - DAC reference */ > > +#define TAS5754M_SDAC (7 << 4) > > +#define TAS5754M_SDAC_SHIFT 4 > > +#define TAS5754M_SDAC_MCK (0 << 4) > > +#define TAS5754M_SDAC_PLL (1 << 4) > > +#define TAS5754M_SDAC_SCK (3 << 4) > > +#define TAS5754M_SDAC_BCK (4 << 4) > > +#define TAS5754M_SDAC_GPIO (5 << 4) > > + > > +/* Page 0, Register 16, 18 - GPIO source for DAC, PLL */ > > +#define TAS5754M_GREF (7 << 0) > > +#define TAS5754M_GREF_SHIFT 0 > > +#define TAS5754M_GREF_GPIO1 (0 << 0) > > +#define TAS5754M_GREF_GPIO2 (1 << 0) > > +#define TAS5754M_GREF_GPIO3 (2 << 0) > > +#define TAS5754M_GREF_GPIO4 (3 << 0) > > +#define TAS5754M_GREF_GPIO5 (4 << 0) > > +#define TAS5754M_GREF_GPIO6 (5 << 0) > > + > > +/* Page 0, Register 19 - synchronize */ > > +#define TAS5754M_RQSY (1 << 0) > > +#define TAS5754M_RQSY_RESUME (0 << 0) > > +#define TAS5754M_RQSY_HALT (1 << 0) > > + > > +/* Page 0, Register 34 - fs speed mode */ > > +#define TAS5754M_FSSP (3 << 0) > > +#define TAS5754M_FSSP_SHIFT 0 > > +#define TAS5754M_FSSP_48KHZ (0 << 0) > > +#define TAS5754M_FSSP_96KHZ (1 << 0) > > +#define TAS5754M_FSSP_192KHZ (2 << 0) > > +#define TAS5754M_FSSP_384KHZ (3 << 0) > > + > > +/* Page 0, Register 37 - Error detection */ > > +#define TAS5754M_IPLK (1 << 0) > > +#define TAS5754M_DCAS (1 << 1) > > +#define TAS5754M_IDCM (1 << 2) > > +#define TAS5754M_IDCH (1 << 3) > > +#define TAS5754M_IDSK (1 << 4) > > +#define TAS5754M_IDBK (1 << 5) > > +#define TAS5754M_IDFS (1 << 6) > > + > > +/* Page 0, Register 40 - I2S configuration */ > > +#define TAS5754M_ALEN (3 << 0) > > +#define TAS5754M_ALEN_SHIFT 0 > > +#define TAS5754M_ALEN_16 (0 << 0) > > +#define TAS5754M_ALEN_20 (1 << 0) > > +#define TAS5754M_ALEN_24 (2 << 0) > > +#define TAS5754M_ALEN_32 (3 << 0) > > +#define TAS5754M_AFMT (3 << 4) > > +#define TAS5754M_AFMT_SHIFT 4 > > +#define TAS5754M_AFMT_I2S (0 << 4) > > +#define TAS5754M_AFMT_DSP (1 << 4) > > +#define TAS5754M_AFMT_RTJ (2 << 4) > > +#define TAS5754M_AFMT_LTJ (3 << 4) > > + > > +/* Page 0, Register 42 - DAC routing */ > > +#define TAS5754M_AUPR_SHIFT 0 > > +#define TAS5754M_AUPL_SHIFT 4 > > + > > +/* Page 0, Register 59 - auto mute */ > > +#define TAS5754M_ATMR_SHIFT 0 > > +#define TAS5754M_ATML_SHIFT 4 > > + > > +/* Page 0, Register 63 - ramp rates */ > > +#define TAS5754M_VNDF_SHIFT 6 > > +#define TAS5754M_VNDS_SHIFT 4 > > +#define TAS5754M_VNUF_SHIFT 2 > > +#define TAS5754M_VNUS_SHIFT 0 > > + > > +/* Page 0, Register 64 - emergency ramp rates */ > > +#define TAS5754M_VEDF_SHIFT 6 > > +#define TAS5754M_VEDS_SHIFT 4 > > + > > +/* Page 0, Register 65 - Digital mute enables */ > > +#define TAS5754M_ACTL_SHIFT 2 > > +#define TAS5754M_AMLE_SHIFT 1 > > +#define TAS5754M_AMRE_SHIFT 0 > > + > > +/* Page 0, Register 80-85, GPIO output selection */ > > +#define TAS5754M_GxSL (31 << 0) > > +#define TAS5754M_GxSL_SHIFT 0 > > +#define TAS5754M_GxSL_OFF (0 << 0) > > +#define TAS5754M_GxSL_DSP (1 << 0) > > +#define TAS5754M_GxSL_REG (2 << 0) > > +#define TAS5754M_GxSL_AMUTB (3 << 0) > > +#define TAS5754M_GxSL_AMUTL (4 << 0) > > +#define TAS5754M_GxSL_AMUTR (5 << 0) > > +#define TAS5754M_GxSL_CLKI (6 << 0) > > +#define TAS5754M_GxSL_SDOUT (7 << 0) > > +#define TAS5754M_GxSL_ANMUL (8 << 0) > > +#define TAS5754M_GxSL_ANMUR (9 << 0) > > +#define TAS5754M_GxSL_PLLLK (10 << 0) > > +#define TAS5754M_GxSL_CPCLK (11 << 0) > > +#define TAS5754M_GxSL_UV0_7 (14 << 0) > > +#define TAS5754M_GxSL_UV0_3 (15 << 0) > > +#define TAS5754M_GxSL_PLLCK (16 << 0) > > + > > +/* Page 1, Register 2 - analog volume control */ > > +#define TAS5754M_RAGN_SHIFT 0 > > +#define TAS5754M_LAGN_SHIFT 4 > > + > > +/* Page 1, Register 7 - analog boost control */ > > +#define TAS5754M_AGBR_SHIFT 0 > > +#define TAS5754M_AGBL_SHIFT 4 > > + > > +#endif > > > > base-commit: f6274b06e326d8471cdfb52595f989a90f5e888f > > -- > > 2.17.1 > >

2 1

[PATCH v5 0/9] Support Spi in i2c-multi-instantiate driver
by Stefan Binding 26 Jan '22

26 Jan '22

Add support for SPI bus in the i2c-multi-instantiate driver as upcoming laptops will need to multi instantiate SPI devices from a single device node, which has multiple SpiSerialBus entries at the ACPI table. With the new SPI support, i2c-multi-instantiate becomes bus-multi-instantiate and is moved to the ACPI folder. The intention is to support the SPI bus by re-using the current I2C multi instantiate, instead of creating a new SPI multi instantiate, to make it possible for peripherals that can be controlled by I2C or SPI to have the same HID at the ACPI table. The new driver (serial multi instantiate, smi) checks for the hard-coded bus type and returns -ENODEV in case of zero devices found for that bus. In the case of automatic bus detection, the driver will give preference to I2C. The expectation is for a device node in the ACPI table to have multiple I2cSerialBus only or multiple SpiSerialBus only, not a mix of both; and for the case where there are both entries in one device node, only the I2C ones would be probed. This new serial multi instantiate will be used in CS35L41 HDA new driver. Changes since V4: - renamed bus-multi-instantiate to serial-multi-instantiate - various minor fixes in serial-multi-instantiate - fix returns in serial-multi-instantiate - removed unnecessary stubs in spi.h - re-order SSIDs in patch_realtek.c Lucas Tanure (4): platform/x86: i2c-multi-instantiate: Rename it for a generic serial driver name platform/x86: serial-multi-instantiate: Reorganize I2C functions ALSA: hda/realtek: Add support for HP Laptops ACPI / scan: Create platform device for CS35L41 Stefan Binding (5): spi: Make spi_alloc_device and spi_add_device public again spi: Create helper API to lookup ACPI info for spi device spi: Support selection of the index of the ACPI Spi Resource before alloc spi: Add API to count spi acpi resources platform/x86: serial-multi-instantiate: Add SPI support MAINTAINERS | 4 +- drivers/acpi/scan.c | 16 +- drivers/platform/x86/Kconfig | 14 +- drivers/platform/x86/Makefile | 2 +- drivers/platform/x86/i2c-multi-instantiate.c | 174 --------- .../platform/x86/serial-multi-instantiate.c | 346 ++++++++++++++++++ drivers/spi/spi.c | 137 ++++++- include/linux/spi/spi.h | 20 + sound/pci/hda/patch_realtek.c | 43 ++- 9 files changed, 549 insertions(+), 207 deletions(-) delete mode 100644 drivers/platform/x86/i2c-multi-instantiate.c create mode 100644 drivers/platform/x86/serial-multi-instantiate.c -- 2.25.1

3 17

[PATCH v2] kselftest: alsa: Add test case for writing invalid values
by Mark Brown 26 Jan '22

26 Jan '22

Attempt to write various invalid values for control types we know about and check that something sensible happens. The ABI isn't quite as clearly defined as one might like, rather than generating an error when an invalid value is written many devices will silently rewrite the value into one that is valid for the control. The exact value chosen is not predictable so in the case the write succeeds we just check that the value we read back is one that is valid for the control. Reviewed-by: Shuah Khan <skhan(a)linuxfoundation.org> Signed-off-by: Mark Brown <broonie(a)kernel.org> --- v2: - Fix a couple of _integer()/_integer64() confusions. tools/testing/selftests/alsa/mixer-test.c | 222 +++++++++++++++++++++- 1 file changed, 221 insertions(+), 1 deletion(-) diff --git a/tools/testing/selftests/alsa/mixer-test.c b/tools/testing/selftests/alsa/mixer-test.c index 17f158d7a767..0e88f4f3d802 100644 --- a/tools/testing/selftests/alsa/mixer-test.c +++ b/tools/testing/selftests/alsa/mixer-test.c @@ -13,6 +13,7 @@ #include <stdio.h> #include <stdlib.h> #include <stdbool.h> +#include <limits.h> #include <string.h> #include <getopt.h> #include <stdarg.h> @@ -26,7 +27,7 @@ #include "../kselftest.h" -#define TESTS_PER_CONTROL 3 +#define TESTS_PER_CONTROL 4 struct card_data { snd_ctl_t *handle; @@ -679,6 +680,224 @@ void test_ctl_write_valid(struct ctl_data *ctl) ctl->card->card, ctl->elem); } +bool test_ctl_write_invalid_value(struct ctl_data *ctl, + snd_ctl_elem_value_t *val) +{ + int err; + long val_read; + + /* Ideally this will fail... */ + err = snd_ctl_elem_write(ctl->card->handle, val); + if (err < 0) + return false; + + /* ...but some devices will clamp to an in range value */ + err = snd_ctl_elem_read(ctl->card->handle, val); + if (err < 0) { + ksft_print_msg("%s failed to read: %s\n", + ctl->name, snd_strerror(err)); + return true; + } + + return !ctl_value_valid(ctl, val); +} + +bool test_ctl_write_invalid_boolean(struct ctl_data *ctl) +{ + int err, i; + long val_read; + bool fail = false; + snd_ctl_elem_value_t *val; + snd_ctl_elem_value_alloca(&val); + + for (i = 0; i < snd_ctl_elem_info_get_count(ctl->info); i++) { + snd_ctl_elem_value_copy(val, ctl->def_val); + snd_ctl_elem_value_set_boolean(val, i, 2); + + if (test_ctl_write_invalid_value(ctl, val)) + fail = true; + } + + return !fail; +} + +bool test_ctl_write_invalid_integer(struct ctl_data *ctl) +{ + int i; + bool fail = false; + snd_ctl_elem_value_t *val; + snd_ctl_elem_value_alloca(&val); + + for (i = 0; i < snd_ctl_elem_info_get_count(ctl->info); i++) { + if (snd_ctl_elem_info_get_min(ctl->info) != LONG_MIN) { + /* Just under range */ + snd_ctl_elem_value_copy(val, ctl->def_val); + snd_ctl_elem_value_set_integer(val, i, + snd_ctl_elem_info_get_min(ctl->info) - 1); + + if (test_ctl_write_invalid_value(ctl, val)) + fail = true; + + /* Minimum representable value */ + snd_ctl_elem_value_copy(val, ctl->def_val); + snd_ctl_elem_value_set_integer(val, i, LONG_MIN); + + if (test_ctl_write_invalid_value(ctl, val)) + fail = true; + } + + if (snd_ctl_elem_info_get_max(ctl->info) != LONG_MAX) { + /* Just over range */ + snd_ctl_elem_value_copy(val, ctl->def_val); + snd_ctl_elem_value_set_integer(val, i, + snd_ctl_elem_info_get_max(ctl->info) + 1); + + if (test_ctl_write_invalid_value(ctl, val)) + fail = true; + + /* Maximum representable value */ + snd_ctl_elem_value_copy(val, ctl->def_val); + snd_ctl_elem_value_set_integer(val, i, LONG_MAX); + + if (test_ctl_write_invalid_value(ctl, val)) + fail = true; + } + } + + return !fail; +} + +bool test_ctl_write_invalid_integer64(struct ctl_data *ctl) +{ + int i; + bool fail = false; + snd_ctl_elem_value_t *val; + snd_ctl_elem_value_alloca(&val); + + for (i = 0; i < snd_ctl_elem_info_get_count(ctl->info); i++) { + if (snd_ctl_elem_info_get_min64(ctl->info) != LLONG_MIN) { + /* Just under range */ + snd_ctl_elem_value_copy(val, ctl->def_val); + snd_ctl_elem_value_set_integer64(val, i, + snd_ctl_elem_info_get_min64(ctl->info) - 1); + + if (test_ctl_write_invalid_value(ctl, val)) + fail = true; + + /* Minimum representable value */ + snd_ctl_elem_value_copy(val, ctl->def_val); + snd_ctl_elem_value_set_integer64(val, i, LLONG_MIN); + + if (test_ctl_write_invalid_value(ctl, val)) + fail = true; + } + + if (snd_ctl_elem_info_get_max64(ctl->info) != LLONG_MAX) { + /* Just over range */ + snd_ctl_elem_value_copy(val, ctl->def_val); + snd_ctl_elem_value_set_integer64(val, i, + snd_ctl_elem_info_get_max64(ctl->info) + 1); + + if (test_ctl_write_invalid_value(ctl, val)) + fail = true; + + /* Maximum representable value */ + snd_ctl_elem_value_copy(val, ctl->def_val); + snd_ctl_elem_value_set_integer64(val, i, LLONG_MAX); + + if (test_ctl_write_invalid_value(ctl, val)) + fail = true; + } + } + + return !fail; +} + +bool test_ctl_write_invalid_enumerated(struct ctl_data *ctl) +{ + int err, i; + unsigned int val_read; + bool fail = false; + snd_ctl_elem_value_t *val; + snd_ctl_elem_value_alloca(&val); + + snd_ctl_elem_value_set_id(val, ctl->id); + + for (i = 0; i < snd_ctl_elem_info_get_count(ctl->info); i++) { + /* One beyond maximum */ + snd_ctl_elem_value_copy(val, ctl->def_val); + snd_ctl_elem_value_set_enumerated(val, i, + snd_ctl_elem_info_get_items(ctl->info)); + + if (test_ctl_write_invalid_value(ctl, val)) + fail = true; + + /* Maximum representable value */ + snd_ctl_elem_value_copy(val, ctl->def_val); + snd_ctl_elem_value_set_enumerated(val, i, UINT_MAX); + + if (test_ctl_write_invalid_value(ctl, val)) + fail = true; + + } + + return !fail; +} + + +void test_ctl_write_invalid(struct ctl_data *ctl) +{ + bool pass; + int err; + + /* If the control is turned off let's be polite */ + if (snd_ctl_elem_info_is_inactive(ctl->info)) { + ksft_print_msg("%s is inactive\n", ctl->name); + ksft_test_result_skip("write_invalid.%d.%d\n", + ctl->card->card, ctl->elem); + return; + } + + if (!snd_ctl_elem_info_is_writable(ctl->info)) { + ksft_print_msg("%s is not writeable\n", ctl->name); + ksft_test_result_skip("write_invalid.%d.%d\n", + ctl->card->card, ctl->elem); + return; + } + + switch (snd_ctl_elem_info_get_type(ctl->info)) { + case SND_CTL_ELEM_TYPE_BOOLEAN: + pass = test_ctl_write_invalid_boolean(ctl); + break; + + case SND_CTL_ELEM_TYPE_INTEGER: + pass = test_ctl_write_invalid_integer(ctl); + break; + + case SND_CTL_ELEM_TYPE_INTEGER64: + pass = test_ctl_write_invalid_integer64(ctl); + break; + + case SND_CTL_ELEM_TYPE_ENUMERATED: + pass = test_ctl_write_invalid_enumerated(ctl); + break; + + default: + /* No tests for this yet */ + ksft_test_result_skip("write_invalid.%d.%d\n", + ctl->card->card, ctl->elem); + return; + } + + /* Restore the default value to minimise disruption */ + err = write_and_verify(ctl, ctl->def_val, NULL); + if (err < 0) + pass = false; + + ksft_test_result(pass, "write_invalid.%d.%d\n", + ctl->card->card, ctl->elem); +} + int main(void) { struct ctl_data *ctl; @@ -697,6 +916,7 @@ int main(void) test_ctl_get_value(ctl); test_ctl_write_default(ctl); test_ctl_write_valid(ctl); + test_ctl_write_invalid(ctl); } ksft_exit_pass(); -- 2.30.2

2 1

[PATCH] ALSA: hda: Fix UAF of leds class devs at unbinding
by Takashi Iwai 26 Jan '22

26 Jan '22

The LED class devices that are created by HD-audio codec drivers are registered via devm_led_classdev_register() and associated with the HD-audio codec device. Unfortunately, it turned out that the devres release doesn't work for this case; namely, since the codec resource release happens before the devm call chain, it triggers a NULL dereference or a UAF for a stale set_brightness_delay callback. For fixing the bug, this patch changes the LED class device register and unregister in a manual manner without devres, keeping the instances in hda_gen_spec. Reported-by: Alexander Sergeyev <sergeev917(a)gmail.com> Cc: <stable(a)vger.kernel.org> Link: https://lore.kernel.org/r/20220111195229.a77wrpjclqwrx4bx@localhost.localdo… Signed-off-by: Takashi Iwai <tiwai(a)suse.de> --- sound/pci/hda/hda_generic.c | 17 +++++++++++++++-- sound/pci/hda/hda_generic.h | 3 +++ 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/sound/pci/hda/hda_generic.c b/sound/pci/hda/hda_generic.c index 3bf5e3410703..fc114e522480 100644 --- a/sound/pci/hda/hda_generic.c +++ b/sound/pci/hda/hda_generic.c @@ -91,6 +91,12 @@ static void snd_hda_gen_spec_free(struct hda_gen_spec *spec) free_kctls(spec); snd_array_free(&spec->paths); snd_array_free(&spec->loopback_list); +#ifdef CONFIG_SND_HDA_GENERIC_LEDS + if (spec->led_cdevs[LED_AUDIO_MUTE]) + led_classdev_unregister(spec->led_cdevs[LED_AUDIO_MUTE]); + if (spec->led_cdevs[LED_AUDIO_MICMUTE]) + led_classdev_unregister(spec->led_cdevs[LED_AUDIO_MICMUTE]); +#endif } /* @@ -3922,7 +3928,10 @@ static int create_mute_led_cdev(struct hda_codec *codec, enum led_brightness), bool micmute) { + struct hda_gen_spec *spec = codec->spec; struct led_classdev *cdev; + int idx = micmute ? LED_AUDIO_MICMUTE : LED_AUDIO_MUTE; + int err; cdev = devm_kzalloc(&codec->core.dev, sizeof(*cdev), GFP_KERNEL); if (!cdev) @@ -3932,10 +3941,14 @@ static int create_mute_led_cdev(struct hda_codec *codec, cdev->max_brightness = 1; cdev->default_trigger = micmute ? "audio-micmute" : "audio-mute"; cdev->brightness_set_blocking = callback; - cdev->brightness = ledtrig_audio_get(micmute ? LED_AUDIO_MICMUTE : LED_AUDIO_MUTE); + cdev->brightness = ledtrig_audio_get(idx); cdev->flags = LED_CORE_SUSPENDRESUME; - return devm_led_classdev_register(&codec->core.dev, cdev); + err = led_classdev_register(&codec->core.dev, cdev); + if (err < 0) + return err; + spec->led_cdevs[idx] = cdev; + return 0; } /** diff --git a/sound/pci/hda/hda_generic.h b/sound/pci/hda/hda_generic.h index 8e1bc8ea74fc..34eba40cc6e6 100644 --- a/sound/pci/hda/hda_generic.h +++ b/sound/pci/hda/hda_generic.h @@ -294,6 +294,9 @@ struct hda_gen_spec { struct hda_jack_callback *cb); void (*mic_autoswitch_hook)(struct hda_codec *codec, struct hda_jack_callback *cb); + + /* leds */ + struct led_classdev *led_cdevs[NUM_AUDIO_LEDS]; }; /* values for add_stereo_mix_input flag */ -- 2.31.1

1 0

Re: No sound on gpd pocket 3
by Pierre-Louis Bossart 26 Jan '22

26 Jan '22

On 1/24/22 12:35, anthony tonitch wrote: > HO, I'm really sorry, I did this alsa-info from my main computer over > ssh and I might have typed the command on the wrong terminal :'( > here it is http://alsa-project.org/db/?f=8ec2e745ceafb1a659d71eff99ad3a9eda3eb62d ah, now it's starting to make sense. I am afraid you have the ES8316 codec, or one of its variants. /sys/bus/acpi/devices/ESSX8326:00/status 15 so no you don't want to use options snd-intel-dspcfg dsp_driver=1 but options snd-intel-dspcfg dsp_driver=3 The auto-detection don't work because we use a different codec HID for the driver selection { .flags = FLAG_SOF, .device = 0x5a98, .codec_hid = "ESSX8336", }, as well as the machine driver selection { .id = "ESSX8336", .drv_name = "sof-essx8336", .sof_tplg_filename = "sof-glk-es8336.tplg", }, This is really a problematic set of devices, where absolutely all possible I2S links have been used, along with GPIO settings and DMICs. Please file a bug on https://github.com/thesofproject/linux/issues so that we can keep track of this and suggest solution. Thanks! > Le lun. 24 janv. 2022 à 18:11, Pierre-Louis Bossart > <pierre-louis.bossart(a)linux.intel.com> a écrit : >> >> >> >> On 1/24/22 10:52, anthony tonitch wrote: >>> Hello, >>> >>> I have a problem I guess related to sof... I already asked on the irc >>> #alsa(a)libera.chat and gnarface advised me to come and ask on this >>> mailing list! >> >> using "options snd-intel-dspcfg dsp_driver=1" to avoid using SOF isn't >> very helpful on an AMD platform :-) >> >> 08:00.1 Audio device [0403]: NVIDIA Corporation GP104 High Definition >> Audio Controller [10de:10f0] (rev a1) >> Subsystem: PNY Device [196e:11a0] >> 0a:00.3 Audio device [0403]: Advanced Micro Devices, Inc. [AMD] Family >> 17h (Models 00h-0fh) HD Audio Controller [1022:1457] >> Subsystem: ASUSTeK Computer Inc. Device [1043:86c7] >> >> Best of luck! >> >>> >>> I am struggling to make the sound of my gpd pocket 3 to work on linux >>> (archlinux to be precise)! In fact, the sound is not supposed to work >>> out of the box as other users tested it before me! but they all had >>> the solution to set the dsp_driver and this didn't worked for me! >>> I checked several times to see if the module was loaded properly and >>> yes it is (as you can also check in the alsa-info at the end of the mail)! >>> >>> If I do aplay -l I get a bunch of hdmi connection that is not working >>> at all! I'm really lost here and I don't even know what to look for >>> anymore >>> >>> The sound works great on windows so This doens't seems to be hardware problem ?! >>> and I tried to plug an usb headset which give me sound so I doesn't >>> seems to be config related either ?! (tho the jack doesn't work) >>> >>> I asked on several places already. I post the different links here in >>> case you want to check but I don't have any response to any post >>> unfortunately! >>> >>> - Post on Archlinux BBS: https://bbs.archlinux.org/viewtopic.php?id=273044 >>> - Post on subreddit GPDPocket: >>> https://www.reddit.com/r/GPDPocket/comments/s31qi8/gpd_p3_no_sound_linux/ >>> >>> - Screenshot and bios picture of maybe relevant informations: >>> - https://imgur.com/a/DouSB3m >>> - https://imgur.com/a/K232PLJ >>> >>> I hope there is enough informations to help me debug this but if you >>> need anything I can provide it! this is a small pc and I'm usualy >>> quarrying it around! >>> I know this is better to send mail but if you need me to chat for any >>> reason (it would be easier for instance) I'm usually hanging on the >>> libera.chat irc as tonitch you can pm or tag me on #alsa >>> >>> Here is the alsa-info.sh : >>> http://alsa-project.org/db/?f=6ddb669a19086cebdb121c97c25bbdccb98e856d >>> >>> Thanks a lot for your help! >>> >>> PS: Ubuntu mate have released their official pocket 3 distribution and >>> I tried it but the sound didn't worked either, here is the alsa-info >>> In case this help ?! : >>> http://alsa-project.org/db/?f=df4c183fd00cec224006ec8caa228705399ad873

2 4

[PATCH] ASoC: Intel: atom: Remove redundant check to simplify the code
by Tang Bin 25 Jan '22

25 Jan '22

In the function sst_platform_get_resources(), if platform_get_irq() failed, the return should not be zero, as the example in platform.c is * int irq = platform_get_irq(pdev, 0) * if (irq < 0) * return irq; So remove the redundant check to simplify the code. Signed-off-by: Tang Bin <tangbin(a)cmss.chinamobile.com> --- sound/soc/intel/atom/sst/sst_acpi.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sound/soc/intel/atom/sst/sst_acpi.c b/sound/soc/intel/atom/sst/sst_acpi.c index 3be64430c..696d547c5 100644 --- a/sound/soc/intel/atom/sst/sst_acpi.c +++ b/sound/soc/intel/atom/sst/sst_acpi.c @@ -226,8 +226,8 @@ static int sst_platform_get_resources(struct intel_sst_drv *ctx) /* Find the IRQ */ ctx->irq_num = platform_get_irq(pdev, ctx->pdata->res_info->acpi_ipc_irq_index); - if (ctx->irq_num <= 0) - return ctx->irq_num < 0 ? ctx->irq_num : -EIO; + if (ctx->irq_num < 0) + return ctx->irq_num; return 0; } -- 2.20.1.windows.1

5 7

[PATCH 0/3] ASoC: sh: rz-ssi: Trivial changes
by Lad Prabhakar 25 Jan '22

25 Jan '22

Hi All, This patch series has trivial changes for rz-ssi driver. Patches 1 (partial) & 2 are from series [3]. patch 1/3 is just a cosmetic change which was part of patch [0] where it uses a do-while instead of while-do. Patch 2/3 is from series [1] where a helper function is added and patch 3/3 is a new patch which removes duplicate macros. All the patches apply to [2] (sound -next) [0] https://patchwork.kernel.org/project/alsa-devel/patch/ 20220115012303.29651-2-prabhakar.mahadev-lad.rj(a)bp.renesas.com/ [1] https://patchwork.kernel.org/project/alsa-devel/patch/ 20220115012303.29651-6-prabhakar.mahadev-lad.rj(a)bp.renesas.com/ [2] https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git/log/ [3] https://patchwork.kernel.org/project/alsa-devel/list/?series=605672 Cheers, Prabhakar Lad Prabhakar (3): ASoC: sh: rz-ssi: Use a do-while loop in rz_ssi_pio_recv() ASoC: sh: rz-ssi: Add rz_ssi_set_substream() helper function ASoC: sh: rz-ssi: Remove duplicate macros sound/soc/sh/rz-ssi.c | 31 ++++++++++++++++--------------- 1 file changed, 16 insertions(+), 15 deletions(-) -- 2.17.1

3 5

[PATCH v1 0/3] ASoC: Add bounds checking for written values
by Mark Brown 25 Jan '22

25 Jan '22

This series adds verification that values written to registers are in bounds for controls since the core doesn't validate for us. Mark Brown (3): ASoC: ops: Reject out of bounds values in snd_soc_put_volsw() ASoC: ops: Reject out of bounds values in snd_soc_put_volsw_sx() ASoC: ops: Reject out of bounds values in snd_soc_put_xr_sx() sound/soc/soc-ops.c | 29 ++++++++++++++++++++++++++--- 1 file changed, 26 insertions(+), 3 deletions(-) base-commit: e783362eb54cd99b2cac8b3a9aeac942e6f6ac07 -- 2.30.2

3 10

Re: [PATCH 5/5] spi: make remove callback a void function
by Jérôme Pouiller 25 Jan '22

25 Jan '22

On Sunday 23 January 2022 18:52:01 CET Uwe Kleine-König wrote: > > The value returned by an spi driver's remove function is mostly ignored. > (Only an error message is printed if the value is non-zero that the > error is ignored.) > > So change the prototype of the remove function to return no value. This > way driver authors are not tempted to assume that passing an error to > the upper layer is a good idea. All drivers are adapted accordingly. > There is no intended change of behaviour, all callbacks were prepared to > return 0 before. > > Signed-off-by: Uwe Kleine-König <u.kleine-koenig(a)pengutronix.de> [...] > diff --git a/drivers/staging/wfx/bus_spi.c b/drivers/staging/wfx/bus_spi.c > index 55ffcd7c42e2..fa0ff66a457d 100644 > --- a/drivers/staging/wfx/bus_spi.c > +++ b/drivers/staging/wfx/bus_spi.c > @@ -232,12 +232,11 @@ static int wfx_spi_probe(struct spi_device *func) > return wfx_probe(bus->core); > } > > -static int wfx_spi_remove(struct spi_device *func) > +static void wfx_spi_remove(struct spi_device *func) > { > struct wfx_spi_priv *bus = spi_get_drvdata(func); > > wfx_release(bus->core); > - return 0; > } > > /* For dynamic driver binding, kernel does not use OF to match driver. It only For the wfx driver: Acked-by: Jérôme Pouiller <jerome.pouiller(a)silabs.com> -- Jérôme Pouiller

1 0

[PATCH] kselftest: alsa: Add test case for writing invalid values
by Mark Brown 25 Jan '22

25 Jan '22

Attempt to write various invalid values for control types we know about and check that something sensible happens. The ABI isn't quite as clearly defined as one might like, rather than generating an error when an invalid value is written many devices will silently rewrite the value into one that is valid for the control. The exact value chosen is not predictable so in the case the write succeeds we just check that the value we read back is one that is valid for the control. Signed-off-by: Mark Brown <broonie(a)kernel.org> --- tools/testing/selftests/alsa/mixer-test.c | 222 +++++++++++++++++++++- 1 file changed, 221 insertions(+), 1 deletion(-) diff --git a/tools/testing/selftests/alsa/mixer-test.c b/tools/testing/selftests/alsa/mixer-test.c index 17f158d7a767..15e05b241468 100644 --- a/tools/testing/selftests/alsa/mixer-test.c +++ b/tools/testing/selftests/alsa/mixer-test.c @@ -13,6 +13,7 @@ #include <stdio.h> #include <stdlib.h> #include <stdbool.h> +#include <limits.h> #include <string.h> #include <getopt.h> #include <stdarg.h> @@ -26,7 +27,7 @@ #include "../kselftest.h" -#define TESTS_PER_CONTROL 3 +#define TESTS_PER_CONTROL 4 struct card_data { snd_ctl_t *handle; @@ -679,6 +680,224 @@ void test_ctl_write_valid(struct ctl_data *ctl) ctl->card->card, ctl->elem); } +bool test_ctl_write_invalid_value(struct ctl_data *ctl, + snd_ctl_elem_value_t *val) +{ + int err; + long val_read; + + /* Ideally this will fail... */ + err = snd_ctl_elem_write(ctl->card->handle, val); + if (err < 0) + return false; + + /* ...but some devices will clamp to an in range value */ + err = snd_ctl_elem_read(ctl->card->handle, val); + if (err < 0) { + ksft_print_msg("%s failed to read: %s\n", + ctl->name, snd_strerror(err)); + return true; + } + + return !ctl_value_valid(ctl, val); +} + +bool test_ctl_write_invalid_boolean(struct ctl_data *ctl) +{ + int err, i; + long val_read; + bool fail = false; + snd_ctl_elem_value_t *val; + snd_ctl_elem_value_alloca(&val); + + for (i = 0; i < snd_ctl_elem_info_get_count(ctl->info); i++) { + snd_ctl_elem_value_copy(val, ctl->def_val); + snd_ctl_elem_value_set_boolean(val, i, 2); + + if (test_ctl_write_invalid_value(ctl, val)) + fail = true; + } + + return !fail; +} + +bool test_ctl_write_invalid_integer(struct ctl_data *ctl) +{ + int i; + bool fail = false; + snd_ctl_elem_value_t *val; + snd_ctl_elem_value_alloca(&val); + + for (i = 0; i < snd_ctl_elem_info_get_count(ctl->info); i++) { + if (snd_ctl_elem_info_get_min(ctl->info) != LONG_MIN) { + /* Just under range */ + snd_ctl_elem_value_copy(val, ctl->def_val); + snd_ctl_elem_value_set_integer(val, i, + snd_ctl_elem_info_get_min(ctl->info) - 1); + + if (test_ctl_write_invalid_value(ctl, val)) + fail = true; + + /* Minimum representable value */ + snd_ctl_elem_value_copy(val, ctl->def_val); + snd_ctl_elem_value_set_integer(val, i, LONG_MIN); + + if (test_ctl_write_invalid_value(ctl, val)) + fail = true; + } + + if (snd_ctl_elem_info_get_max(ctl->info) != LONG_MAX) { + /* Just over range */ + snd_ctl_elem_value_copy(val, ctl->def_val); + snd_ctl_elem_value_set_integer(val, i, + snd_ctl_elem_info_get_max(ctl->info) + 1); + + if (test_ctl_write_invalid_value(ctl, val)) + fail = true; + + /* Maximum representable value */ + snd_ctl_elem_value_copy(val, ctl->def_val); + snd_ctl_elem_value_set_integer(val, i, LONG_MAX); + + if (test_ctl_write_invalid_value(ctl, val)) + fail = true; + } + } + + return !fail; +} + +bool test_ctl_write_invalid_integer64(struct ctl_data *ctl) +{ + int i; + bool fail = false; + snd_ctl_elem_value_t *val; + snd_ctl_elem_value_alloca(&val); + + for (i = 0; i < snd_ctl_elem_info_get_count(ctl->info); i++) { + if (snd_ctl_elem_info_get_min64(ctl->info) != LLONG_MIN) { + /* Just under range */ + snd_ctl_elem_value_copy(val, ctl->def_val); + snd_ctl_elem_value_set_integer64(val, i, + snd_ctl_elem_info_get_min64(ctl->info) - 1); + + if (test_ctl_write_invalid_value(ctl, val)) + fail = true; + + /* Minimum representable value */ + snd_ctl_elem_value_copy(val, ctl->def_val); + snd_ctl_elem_value_set_integer(val, i, LLONG_MIN); + + if (test_ctl_write_invalid_value(ctl, val)) + fail = true; + } + + if (snd_ctl_elem_info_get_max64(ctl->info) != LLONG_MAX) { + /* Just over range */ + snd_ctl_elem_value_copy(val, ctl->def_val); + snd_ctl_elem_value_set_integer64(val, i, + snd_ctl_elem_info_get_max64(ctl->info) + 1); + + if (test_ctl_write_invalid_value(ctl, val)) + fail = true; + + /* Maximum representable value */ + snd_ctl_elem_value_copy(val, ctl->def_val); + snd_ctl_elem_value_set_integer(val, i, LLONG_MAX); + + if (test_ctl_write_invalid_value(ctl, val)) + fail = true; + } + } + + return !fail; +} + +bool test_ctl_write_invalid_enumerated(struct ctl_data *ctl) +{ + int err, i; + unsigned int val_read; + bool fail = false; + snd_ctl_elem_value_t *val; + snd_ctl_elem_value_alloca(&val); + + snd_ctl_elem_value_set_id(val, ctl->id); + + for (i = 0; i < snd_ctl_elem_info_get_count(ctl->info); i++) { + /* One beyond maximum */ + snd_ctl_elem_value_copy(val, ctl->def_val); + snd_ctl_elem_value_set_enumerated(val, i, + snd_ctl_elem_info_get_items(ctl->info)); + + if (test_ctl_write_invalid_value(ctl, val)) + fail = true; + + /* Maximum representable value */ + snd_ctl_elem_value_copy(val, ctl->def_val); + snd_ctl_elem_value_set_enumerated(val, i, UINT_MAX); + + if (test_ctl_write_invalid_value(ctl, val)) + fail = true; + + } + + return !fail; +} + + +void test_ctl_write_invalid(struct ctl_data *ctl) +{ + bool pass; + int err; + + /* If the control is turned off let's be polite */ + if (snd_ctl_elem_info_is_inactive(ctl->info)) { + ksft_print_msg("%s is inactive\n", ctl->name); + ksft_test_result_skip("write_invalid.%d.%d\n", + ctl->card->card, ctl->elem); + return; + } + + if (!snd_ctl_elem_info_is_writable(ctl->info)) { + ksft_print_msg("%s is not writeable\n", ctl->name); + ksft_test_result_skip("write_invalid.%d.%d\n", + ctl->card->card, ctl->elem); + return; + } + + switch (snd_ctl_elem_info_get_type(ctl->info)) { + case SND_CTL_ELEM_TYPE_BOOLEAN: + pass = test_ctl_write_invalid_boolean(ctl); + break; + + case SND_CTL_ELEM_TYPE_INTEGER: + pass = test_ctl_write_invalid_integer(ctl); + break; + + case SND_CTL_ELEM_TYPE_INTEGER64: + pass = test_ctl_write_invalid_integer64(ctl); + break; + + case SND_CTL_ELEM_TYPE_ENUMERATED: + pass = test_ctl_write_invalid_enumerated(ctl); + break; + + default: + /* No tests for this yet */ + ksft_test_result_skip("write_invalid.%d.%d\n", + ctl->card->card, ctl->elem); + return; + } + + /* Restore the default value to minimise disruption */ + err = write_and_verify(ctl, ctl->def_val, NULL); + if (err < 0) + pass = false; + + ksft_test_result(pass, "write_invalid.%d.%d\n", + ctl->card->card, ctl->elem); +} + int main(void) { struct ctl_data *ctl; @@ -697,6 +916,7 @@ int main(void) test_ctl_get_value(ctl); test_ctl_write_default(ctl); test_ctl_write_valid(ctl); + test_ctl_write_invalid(ctl); } ksft_exit_pass(); -- 2.30.2

3 4

[PATCH v2][next] ALSA: usb-audio: scarlett2: Use struct_size() helper in scarlett2_usb()
by Gustavo A. R. Silva 25 Jan '22

25 Jan '22

Make use of the struct_size() helper instead of an open-coded version, in order to avoid any potential type mistakes or integer overflows that, in the worst scenario, could lead to heap overflows. Also, address the following sparse warnings: sound/usb/mixer_scarlett_gen2.c:1064:28: warning: using sizeof on a flexible structure sound/usb/mixer_scarlett_gen2.c:1065:29: warning: using sizeof on a flexible structure Link: https://github.com/KSPP/linux/issues/174 Signed-off-by: Gustavo A. R. Silva <gustavoars(a)kernel.org> --- Changes in v2: - Use correct format specifier %zu for type size_t argument. sound/usb/mixer_scarlett_gen2.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sound/usb/mixer_scarlett_gen2.c b/sound/usb/mixer_scarlett_gen2.c index 53ebabf42472..7ff8a4817c67 100644 --- a/sound/usb/mixer_scarlett_gen2.c +++ b/sound/usb/mixer_scarlett_gen2.c @@ -1061,9 +1061,9 @@ static int scarlett2_usb( { struct scarlett2_data *private = mixer->private_data; struct usb_device *dev = mixer->chip->dev; - u16 req_buf_size = sizeof(struct scarlett2_usb_packet) + req_size; - u16 resp_buf_size = sizeof(struct scarlett2_usb_packet) + resp_size; struct scarlett2_usb_packet *req, *resp = NULL; + size_t req_buf_size = struct_size(req, data, req_size); + size_t resp_buf_size = struct_size(resp, data, resp_size); int err; req = kmalloc(req_buf_size, GFP_KERNEL); @@ -1111,7 +1111,7 @@ static int scarlett2_usb( usb_audio_err( mixer->chip, "Scarlett Gen 2/3 USB response result cmd %x was %d " - "expected %d\n", + "expected %zu\n", cmd, err, resp_buf_size); err = -EINVAL; goto unlock; -- 2.27.0

3 2

Re: [PATCH] driver core: platform: Rename platform_get_irq_optional() to platform_get_irq_silent()
by Andy Shevchenko 25 Jan '22

25 Jan '22

On Thu, Jan 20, 2022 at 08:57:18AM +0100, Uwe Kleine-König wrote: > On Wed, Jan 19, 2022 at 08:51:29PM +0200, Andy Shevchenko wrote: > > On Sat, Jan 15, 2022 at 04:45:39PM +0100, Uwe Kleine-König wrote: > > > On Fri, Jan 14, 2022 at 03:04:38PM +0200, Andy Shevchenko wrote: > > > > On Thu, Jan 13, 2022 at 08:43:58PM +0100, Uwe Kleine-König wrote: > > > > > > It'd certainly be good to name anything that doesn't correspond to one > > > > > > of the existing semantics for the API (!) something different rather > > > > > > than adding yet another potentially overloaded meaning. > > > > > > > > > > It seems we're (at least) three who agree about this. Here is a patch > > > > > fixing the name. > > > > > > > > And similar number of people are on the other side. > > > > > > If someone already opposed to the renaming (and not only the name) I > > > must have missed that. > > > > > > So you think it's a good idea to keep the name > > > platform_get_irq_optional() despite the "not found" value returned by it > > > isn't usable as if it were a normal irq number? > > > > I meant that on the other side people who are in favour of Sergey's patch. > > Since that I commented already that I opposed the renaming being a standalone > > change. > > > > Do you agree that we have several issues with platform_get_irq*() APIs? > > > > 1. The unfortunate naming > > unfortunate naming for the currently implemented semantic, yes. Yes. > > 2. The vIRQ0 handling: a) WARN() followed by b) returned value 0 > > I'm happy with the vIRQ0 handling. Today platform_get_irq() and it's > silent variant returns either a valid and usuable irq number or a > negative error value. That's totally fine. It might return 0. Actually it seems that the WARN() can only be issued in two cases: - SPARC with vIRQ0 in one of the array member - fallback to ACPI for GPIO IRQ resource with index 0 But the latter is bogus, because it would mean a bug in the ACPI code. The bottom line here is the SPARC case. Anybody familiar with the platform can shed a light on this. If there is no such case, we may remove warning along with ret = 0 case from platfrom_get_irq(). > > 3. The specific cookie for "IRQ not found, while no error happened" case > > Not sure what you mean here. I have no problem that a situation I can > cope with is called an error for the query function. I just do error > handling and continue happily. So the part "while no error happened" is > irrelevant to me. I meant that instead of using special error code, 0 is very much good for the cases when IRQ is not found. It allows to distinguish -ENXIO from the low layer from -ENXIO with this magic meaning. > Additionally I see the problems: > > 4. The semantic as implemented in Sergey's patch isn't better than the > current one. I disagree on this. See above on why. > platform_get_irq*() is still considerably different from > (clk|gpiod)_get* because the not-found value for the _optional variant > isn't usuable for the irq case. For clk and gpio I get rid of a whole if > branch, for irq I only change the if-condition. (And if that change is > considered good or bad seems to be subjective.) You are mixing up two things: - semantics of the pointer - semantics of the cookie Like I said previously the mistake is in putting an equal sign between apples and oranges (or in terms of Python, which is a good example here, None and False objects, where in both case 0 is magic and Python `if X`, `while `X` will work in the same way, the `typeof(X)` is different semantically). > For the idea to add a warning to platform_get_irq_optional for all but > -ENXIO (and -EPROBE_DEFER), I see the problem: > > 5. platform_get_irq*() issuing an error message is only correct most of > the time and given proper error handling in the caller (which might be > able to handle not only -ENXIO but maybe also -EINVAL[1]) the error message > is irritating. Today platform_get_irq() emits an error message for all > but -EPROBE_DEFER. As soon as we find a driver that handles -EINVAL we > need a function platform_get_irq_variant1 to be silent for -EINVAL, > -EPROBE_DEFER and -ENXIO (or platform_get_irq_variant2 that is only > silent for -EINVAL and -EPROBE_DEFER?) > > IMHO a query function should always be silent and let the caller do the > error handling. And if it's only because > > mydev: IRQ index 0 not found > > is worse than > > mydev: neither TX irq not a muxed RX/TX irq found > > . Also "index 0" is irritating for devices that are expected to have > only a single irq (i.e. the majority of all devices). Yeah, ack the #5. > Yes, I admit, we can safe some code by pushing the error message in a > query function. But that doesn't only have advantages. > [1] Looking through the source I wonder: What are the errors that can happen > in platform_get_irq*()? (calling everything but a valid irq number > an error) Looking at many callers, they only seem to expect "not > found" and some "probe defer" (even platform_get_irq() interprets > everything but -EPROBE_DEFER as "IRQ index %u not found\n".) > IMHO before we should consider to introduce a platform_get_irq*() > variant with improved semantics, some cleanup in the internals of > the irq lookup are necessary. -- With Best Regards, Andy Shevchenko

4 4

Re: Build regressions/improvements in v5.17-rc1
by Geert Uytterhoeven 25 Jan '22

25 Jan '22

On Sun, 23 Jan 2022, Geert Uytterhoeven wrote: > Below is the list of build error/warning regressions/improvements in > v5.17-rc1[1] compared to v5.16[2]. > > Summarized: > - build errors: +17/-2 > - build warnings: +23/-25 > > Note that there may be false regressions, as some logs are incomplete. > Still, they're build errors/warnings. > > Happy fixing! ;-) > > Thanks to the linux-next team for providing the build service. > > [1] http://kisskb.ellerman.id.au/kisskb/branch/linus/head/e783362eb54cd99b2cac8… (all 99 configs) > [2] http://kisskb.ellerman.id.au/kisskb/branch/linus/head/df0cc57e057f18e44dac8… (98 out of 99 configs) > > > *** ERRORS *** > > 17 error regressions: > + /kisskb/src/arch/powerpc/kernel/stacktrace.c: error: implicit declaration of function 'nmi_cpu_backtrace' [-Werror=implicit-function-declaration]: => 171:2 > + /kisskb/src/arch/powerpc/kernel/stacktrace.c: error: implicit declaration of function 'nmi_trigger_cpumask_backtrace' [-Werror=implicit-function-declaration]: => 226:2 powerpc-gcc5/skiroot_defconfig > + /kisskb/src/arch/sparc/mm/srmmu.c: error: cast between incompatible function types from 'void (*)(long unsigned int)' to 'void (*)(long unsigned int, long unsigned int, long unsigned int, long unsigned int, long unsigned int)' [-Werror=cast-function-type]: => 1756:13, 1639:13 > + /kisskb/src/arch/sparc/mm/srmmu.c: error: cast between incompatible function types from 'void (*)(struct mm_struct *)' to 'void (*)(long unsigned int, long unsigned int, long unsigned int, long unsigned int, long unsigned int)' [-Werror=cast-function-type]: => 1674:29, 1662:29 > + /kisskb/src/arch/sparc/mm/srmmu.c: error: cast between incompatible function types from 'void (*)(struct mm_struct *, long unsigned int)' to 'void (*)(long unsigned int, long unsigned int, long unsigned int, long unsigned int, long unsigned int)' [-Werror=cast-function-type]: => 1767:21 > + /kisskb/src/arch/sparc/mm/srmmu.c: error: cast between incompatible function types from 'void (*)(struct vm_area_struct *, long unsigned int)' to 'void (*)(long unsigned int, long unsigned int, long unsigned int, long unsigned int, long unsigned int)' [-Werror=cast-function-type]: => 1741:29, 1726:29 > + /kisskb/src/arch/sparc/mm/srmmu.c: error: cast between incompatible function types from 'void (*)(struct vm_area_struct *, long unsigned int, long unsigned int)' to 'void (*)(long unsigned int, long unsigned int, long unsigned int, long unsigned int, long unsigned int)' [-Werror=cast-function-type]: => 1694:29, 1711:29 sparc64-gcc11/sparc-allmodconfig > + /kisskb/src/arch/um/include/asm/processor-generic.h: error: called object is not a function or function pointer: => 103:18 > + /kisskb/src/drivers/vfio/pci/vfio_pci_rdwr.c: error: assignment makes pointer from integer without a cast [-Werror=int-conversion]: => 324:9, 317:9 > + /kisskb/src/drivers/vfio/pci/vfio_pci_rdwr.c: error: implicit declaration of function 'ioport_map' [-Werror=implicit-function-declaration]: => 317:11 > + /kisskb/src/drivers/vfio/pci/vfio_pci_rdwr.c: error: implicit declaration of function 'ioport_unmap' [-Werror=implicit-function-declaration]: => 338:15 um-x86_64/um-allyesconfig > + /kisskb/src/drivers/gpu/drm/amd/amdgpu/../amdkfd/kfd_topology.c: error: control reaches end of non-void function [-Werror=return-type]: => 1560:1 um-x86_64/um-all{mod,yes}config > + /kisskb/src/drivers/net/ethernet/freescale/fec_mpc52xx.c: error: passing argument 2 of 'mpc52xx_fec_set_paddr' discards 'const' qualifier from pointer target type [-Werror=discarded-qualifiers]: => 659:29 powerpc-gcc5/ppc32_allmodconfig > + /kisskb/src/drivers/pinctrl/pinctrl-thunderbay.c: error: assignment discards 'const' qualifier from pointer target type [-Werror=discarded-qualifiers]: => 815:8, 815:29 arm64-gcc5.4/arm64-allmodconfig arm64-gcc8/arm64-allmodconfig > + /kisskb/src/lib/test_printf.c: error: "PTR" redefined [-Werror]: => 247:0, 247 > + /kisskb/src/sound/pci/ca0106/ca0106.h: error: "PTR" redefined [-Werror]: => 62, 62:0 mips-gcc8/mips-allmodconfig mipsel/mips-allmodconfig > + error: arch/powerpc/kvm/book3s_64_entry.o: relocation truncated to fit: R_PPC64_REL14 (stub) against symbol `machine_check_common' defined in .text section in arch/powerpc/kernel/head_64.o: => (.text+0x3e4) powerpc-gcc5/powerpc-allyesconfig Gr{oetje,eeting}s, Geert -- Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert(a)linux-m68k.org In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that. -- Linus Torvalds

7 9

Re: [PATCH v2] ALSA: core: Fix SSID quirk lookup for subvendor=0
by Myć Race 25 Jan '22

25 Jan '22

Skickat från Yahoo Mail på Android

1 0

Re: [PATCH 5/5] spi: make remove callback a void function
by Geert Uytterhoeven 25 Jan '22

25 Jan '22

On Sun, Jan 23, 2022 at 6:54 PM Uwe Kleine-König <u.kleine-koenig(a)pengutronix.de> wrote: > The value returned by an spi driver's remove function is mostly ignored. > (Only an error message is printed if the value is non-zero that the > error is ignored.) > > So change the prototype of the remove function to return no value. This > way driver authors are not tempted to assume that passing an error to > the upper layer is a good idea. All drivers are adapted accordingly. > There is no intended change of behaviour, all callbacks were prepared to > return 0 before. > > Signed-off-by: Uwe Kleine-König <u.kleine-koenig(a)pengutronix.de> > drivers/spi/spi-slave-system-control.c | 3 +-- > drivers/spi/spi-slave-time.c | 3 +-- > drivers/spi/spi.c | 11 ++--------- > drivers/spi/spidev.c | 4 +--- Reviewed-by: Geert Uytterhoeven <geert+renesas(a)glider.be> Gr{oetje,eeting}s, Geert -- Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert(a)linux-m68k.org In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that. -- Linus Torvalds

1 0

Re: [PATCH 5/5] spi: make remove callback a void function
by Jonathan Cameron 25 Jan '22

25 Jan '22

On Sun, 23 Jan 2022 18:52:01 +0100 Uwe Kleine-König <u.kleine-koenig(a)pengutronix.de> wrote: > The value returned by an spi driver's remove function is mostly ignored. > (Only an error message is printed if the value is non-zero that the > error is ignored.) > > So change the prototype of the remove function to return no value. This > way driver authors are not tempted to assume that passing an error to > the upper layer is a good idea. All drivers are adapted accordingly. > There is no intended change of behaviour, all callbacks were prepared to > return 0 before. > > Signed-off-by: Uwe Kleine-König <u.kleine-koenig(a)pengutronix.de> For iio drivers. Acked-by: Jonathan Cameron <Jonathan.Cameron(a)huawei.com> As you mention in the cover letter we'll be wanting an immutable branch somewhere to pull into subsystem trees. Soon is good if possible as otherwise we'll end up with a bunch of merge conflicts getting resolved in next. Thanks, Jonathan > --- > drivers/bus/moxtet.c | 4 +--- > drivers/char/tpm/st33zp24/spi.c | 4 +--- > drivers/char/tpm/tpm_tis_spi_main.c | 3 +-- > drivers/clk/clk-lmk04832.c | 4 +--- > drivers/gpio/gpio-74x164.c | 4 +--- > drivers/gpio/gpio-max3191x.c | 4 +--- > drivers/gpio/gpio-max7301.c | 4 +--- > drivers/gpio/gpio-mc33880.c | 4 +--- > drivers/gpio/gpio-pisosr.c | 4 +--- > drivers/gpu/drm/panel/panel-abt-y030xx067a.c | 4 +--- > drivers/gpu/drm/panel/panel-ilitek-ili9322.c | 4 +--- > drivers/gpu/drm/panel/panel-ilitek-ili9341.c | 3 +-- > drivers/gpu/drm/panel/panel-innolux-ej030na.c | 4 +--- > drivers/gpu/drm/panel/panel-lg-lb035q02.c | 4 +--- > drivers/gpu/drm/panel/panel-lg-lg4573.c | 4 +--- > drivers/gpu/drm/panel/panel-nec-nl8048hl11.c | 4 +--- > drivers/gpu/drm/panel/panel-novatek-nt39016.c | 4 +--- > drivers/gpu/drm/panel/panel-samsung-db7430.c | 3 +-- > drivers/gpu/drm/panel/panel-samsung-ld9040.c | 4 +--- > drivers/gpu/drm/panel/panel-samsung-s6d27a1.c | 3 +-- > drivers/gpu/drm/panel/panel-samsung-s6e63m0-spi.c | 3 +-- > drivers/gpu/drm/panel/panel-sitronix-st7789v.c | 4 +--- > drivers/gpu/drm/panel/panel-sony-acx565akm.c | 4 +--- > drivers/gpu/drm/panel/panel-tpo-td028ttec1.c | 4 +--- > drivers/gpu/drm/panel/panel-tpo-td043mtea1.c | 4 +--- > drivers/gpu/drm/panel/panel-tpo-tpg110.c | 3 +-- > drivers/gpu/drm/panel/panel-widechips-ws2401.c | 3 +-- > drivers/gpu/drm/tiny/hx8357d.c | 4 +--- > drivers/gpu/drm/tiny/ili9163.c | 4 +--- > drivers/gpu/drm/tiny/ili9225.c | 4 +--- > drivers/gpu/drm/tiny/ili9341.c | 4 +--- > drivers/gpu/drm/tiny/ili9486.c | 4 +--- > drivers/gpu/drm/tiny/mi0283qt.c | 4 +--- > drivers/gpu/drm/tiny/repaper.c | 4 +--- > drivers/gpu/drm/tiny/st7586.c | 4 +--- > drivers/gpu/drm/tiny/st7735r.c | 4 +--- > drivers/hwmon/adcxx.c | 4 +--- > drivers/hwmon/adt7310.c | 3 +-- > drivers/hwmon/max1111.c | 3 +-- > drivers/hwmon/max31722.c | 4 +--- > drivers/iio/accel/bma400_spi.c | 4 +--- > drivers/iio/accel/bmc150-accel-spi.c | 4 +--- > drivers/iio/accel/bmi088-accel-spi.c | 4 +--- > drivers/iio/accel/kxsd9-spi.c | 4 +--- > drivers/iio/accel/mma7455_spi.c | 4 +--- > drivers/iio/accel/sca3000.c | 4 +--- > drivers/iio/adc/ad7266.c | 4 +--- > drivers/iio/adc/ltc2496.c | 4 +--- > drivers/iio/adc/mcp320x.c | 4 +--- > drivers/iio/adc/mcp3911.c | 4 +--- > drivers/iio/adc/ti-adc12138.c | 4 +--- > drivers/iio/adc/ti-ads7950.c | 4 +--- > drivers/iio/adc/ti-ads8688.c | 4 +--- > drivers/iio/adc/ti-tlc4541.c | 4 +--- > drivers/iio/amplifiers/ad8366.c | 4 +--- > drivers/iio/common/ssp_sensors/ssp_dev.c | 4 +--- > drivers/iio/dac/ad5360.c | 4 +--- > drivers/iio/dac/ad5380.c | 4 +--- > drivers/iio/dac/ad5446.c | 4 +--- > drivers/iio/dac/ad5449.c | 4 +--- > drivers/iio/dac/ad5504.c | 4 +--- > drivers/iio/dac/ad5592r.c | 4 +--- > drivers/iio/dac/ad5624r_spi.c | 4 +--- > drivers/iio/dac/ad5686-spi.c | 4 +--- > drivers/iio/dac/ad5761.c | 4 +--- > drivers/iio/dac/ad5764.c | 4 +--- > drivers/iio/dac/ad5791.c | 4 +--- > drivers/iio/dac/ad8801.c | 4 +--- > drivers/iio/dac/ltc1660.c | 4 +--- > drivers/iio/dac/ltc2632.c | 4 +--- > drivers/iio/dac/mcp4922.c | 4 +--- > drivers/iio/dac/ti-dac082s085.c | 4 +--- > drivers/iio/dac/ti-dac7311.c | 3 +-- > drivers/iio/frequency/adf4350.c | 4 +--- > drivers/iio/gyro/bmg160_spi.c | 4 +--- > drivers/iio/gyro/fxas21002c_spi.c | 4 +--- > drivers/iio/health/afe4403.c | 4 +--- > drivers/iio/magnetometer/bmc150_magn_spi.c | 4 +--- > drivers/iio/magnetometer/hmc5843_spi.c | 4 +--- > drivers/iio/potentiometer/max5487.c | 4 +--- > drivers/iio/pressure/ms5611_spi.c | 4 +--- > drivers/iio/pressure/zpa2326_spi.c | 4 +--- > drivers/input/keyboard/applespi.c | 4 +--- > drivers/input/misc/adxl34x-spi.c | 4 +--- > drivers/input/touchscreen/ads7846.c | 4 +--- > drivers/input/touchscreen/cyttsp4_spi.c | 4 +--- > drivers/input/touchscreen/tsc2005.c | 4 +--- > drivers/leds/leds-cr0014114.c | 4 +--- > drivers/leds/leds-dac124s085.c | 4 +--- > drivers/leds/leds-el15203000.c | 4 +--- > drivers/leds/leds-spi-byte.c | 4 +--- > drivers/media/spi/cxd2880-spi.c | 4 +--- > drivers/media/spi/gs1662.c | 4 +--- > drivers/media/tuners/msi001.c | 3 +-- > drivers/mfd/arizona-spi.c | 4 +--- > drivers/mfd/da9052-spi.c | 3 +-- > drivers/mfd/ezx-pcap.c | 4 +--- > drivers/mfd/madera-spi.c | 4 +--- > drivers/mfd/mc13xxx-spi.c | 3 +-- > drivers/mfd/rsmu_spi.c | 4 +--- > drivers/mfd/stmpe-spi.c | 4 +--- > drivers/mfd/tps65912-spi.c | 4 +--- > drivers/misc/ad525x_dpot-spi.c | 3 +-- > drivers/misc/eeprom/eeprom_93xx46.c | 4 +--- > drivers/misc/lattice-ecp3-config.c | 4 +--- > drivers/misc/lis3lv02d/lis3lv02d_spi.c | 4 +--- > drivers/mmc/host/mmc_spi.c | 3 +-- > drivers/mtd/devices/mchp23k256.c | 4 +--- > drivers/mtd/devices/mchp48l640.c | 4 +--- > drivers/mtd/devices/mtd_dataflash.c | 4 +--- > drivers/mtd/devices/sst25l.c | 4 +--- > drivers/net/can/m_can/tcan4x5x-core.c | 4 +--- > drivers/net/can/spi/hi311x.c | 4 +--- > drivers/net/can/spi/mcp251x.c | 4 +--- > drivers/net/can/spi/mcp251xfd/mcp251xfd-core.c | 4 +--- > drivers/net/dsa/b53/b53_spi.c | 4 +--- > drivers/net/dsa/microchip/ksz8795_spi.c | 4 +--- > drivers/net/dsa/microchip/ksz9477_spi.c | 4 +--- > drivers/net/dsa/sja1105/sja1105_main.c | 6 ++---- > drivers/net/dsa/vitesse-vsc73xx-spi.c | 6 ++---- > drivers/net/ethernet/asix/ax88796c_main.c | 4 +--- > drivers/net/ethernet/micrel/ks8851_spi.c | 4 +--- > drivers/net/ethernet/microchip/enc28j60.c | 4 +--- > drivers/net/ethernet/microchip/encx24j600.c | 4 +--- > drivers/net/ethernet/qualcomm/qca_spi.c | 4 +--- > drivers/net/ethernet/vertexcom/mse102x.c | 4 +--- > drivers/net/ethernet/wiznet/w5100-spi.c | 4 +--- > drivers/net/ieee802154/adf7242.c | 4 +--- > drivers/net/ieee802154/at86rf230.c | 4 +--- > drivers/net/ieee802154/ca8210.c | 6 ++---- > drivers/net/ieee802154/cc2520.c | 4 +--- > drivers/net/ieee802154/mcr20a.c | 4 +--- > drivers/net/ieee802154/mrf24j40.c | 4 +--- > drivers/net/phy/spi_ks8995.c | 4 +--- > drivers/net/wan/slic_ds26522.c | 3 +-- > drivers/net/wireless/intersil/p54/p54spi.c | 4 +--- > drivers/net/wireless/marvell/libertas/if_spi.c | 4 +--- > drivers/net/wireless/microchip/wilc1000/spi.c | 4 +--- > drivers/net/wireless/st/cw1200/cw1200_spi.c | 4 +--- > drivers/net/wireless/ti/wl1251/spi.c | 4 +--- > drivers/net/wireless/ti/wlcore/spi.c | 4 +--- > drivers/nfc/nfcmrvl/spi.c | 3 +-- > drivers/nfc/st-nci/spi.c | 4 +--- > drivers/nfc/st95hf/core.c | 4 +--- > drivers/nfc/trf7970a.c | 4 +--- > drivers/platform/chrome/cros_ec_spi.c | 4 +--- > drivers/platform/olpc/olpc-xo175-ec.c | 4 +--- > drivers/rtc/rtc-ds1302.c | 3 +-- > drivers/rtc/rtc-ds1305.c | 4 +--- > drivers/rtc/rtc-ds1343.c | 4 +--- > drivers/spi/spi-mem.c | 6 ++---- > drivers/spi/spi-slave-system-control.c | 3 +-- > drivers/spi/spi-slave-time.c | 3 +-- > drivers/spi/spi-tle62x0.c | 3 +-- > drivers/spi/spi.c | 11 ++--------- > drivers/spi/spidev.c | 4 +--- > drivers/staging/fbtft/fbtft.h | 3 +-- > drivers/staging/pi433/pi433_if.c | 4 +--- > drivers/staging/wfx/bus_spi.c | 3 +-- > drivers/tty/serial/max3100.c | 5 ++--- > drivers/tty/serial/max310x.c | 3 +-- > drivers/tty/serial/sc16is7xx.c | 4 +--- > drivers/usb/gadget/udc/max3420_udc.c | 4 +--- > drivers/usb/host/max3421-hcd.c | 3 +-- > drivers/video/backlight/ams369fg06.c | 3 +-- > drivers/video/backlight/corgi_lcd.c | 3 +-- > drivers/video/backlight/ili922x.c | 3 +-- > drivers/video/backlight/l4f00242t03.c | 3 +-- > drivers/video/backlight/lms501kf03.c | 3 +-- > drivers/video/backlight/ltv350qv.c | 3 +-- > drivers/video/backlight/tdo24m.c | 3 +-- > drivers/video/backlight/tosa_lcd.c | 4 +--- > drivers/video/backlight/vgg2432a4.c | 4 +--- > drivers/video/fbdev/omap/lcd_mipid.c | 4 +--- > .../omap2/omapfb/displays/panel-lgphilips-lb035q02.c | 4 +--- > .../omap2/omapfb/displays/panel-nec-nl8048hl11.c | 4 +--- > .../omap2/omapfb/displays/panel-sony-acx565akm.c | 4 +--- > .../omap2/omapfb/displays/panel-tpo-td028ttec1.c | 4 +--- > .../omap2/omapfb/displays/panel-tpo-td043mtea1.c | 4 +--- > include/linux/spi/spi.h | 2 +- > sound/pci/hda/cs35l41_hda_spi.c | 4 +--- > sound/soc/codecs/adau1761-spi.c | 3 +-- > sound/soc/codecs/adau1781-spi.c | 3 +-- > sound/soc/codecs/cs35l41-spi.c | 4 +--- > sound/soc/codecs/pcm3168a-spi.c | 4 +--- > sound/soc/codecs/pcm512x-spi.c | 3 +-- > sound/soc/codecs/tlv320aic32x4-spi.c | 4 +--- > sound/soc/codecs/tlv320aic3x-spi.c | 4 +--- > sound/soc/codecs/wm0010.c | 4 +--- > sound/soc/codecs/wm8804-spi.c | 3 +-- > sound/spi/at73c213.c | 4 +--- > 191 files changed, 197 insertions(+), 545 deletions(-) > > diff --git a/drivers/bus/moxtet.c b/drivers/bus/moxtet.c > index fd87a59837fa..5eb0fe73ddc4 100644 > --- a/drivers/bus/moxtet.c > +++ b/drivers/bus/moxtet.c > @@ -815,7 +815,7 @@ static int moxtet_probe(struct spi_device *spi) > return 0; > } > > -static int moxtet_remove(struct spi_device *spi) > +static void moxtet_remove(struct spi_device *spi) > { > struct moxtet *moxtet = spi_get_drvdata(spi); > > @@ -828,8 +828,6 @@ static int moxtet_remove(struct spi_device *spi) > device_for_each_child(moxtet->dev, NULL, __unregister); > > mutex_destroy(&moxtet->lock); > - > - return 0; > } > > static const struct of_device_id moxtet_dt_ids[] = { > diff --git a/drivers/char/tpm/st33zp24/spi.c b/drivers/char/tpm/st33zp24/spi.c > index ccd9e42b8eab..22d184884694 100644 > --- a/drivers/char/tpm/st33zp24/spi.c > +++ b/drivers/char/tpm/st33zp24/spi.c > @@ -381,13 +381,11 @@ static int st33zp24_spi_probe(struct spi_device *dev) > * @param: client, the spi_device description (TPM SPI description). > * @return: 0 in case of success. > */ > -static int st33zp24_spi_remove(struct spi_device *dev) > +static void st33zp24_spi_remove(struct spi_device *dev) > { > struct tpm_chip *chip = spi_get_drvdata(dev); > > st33zp24_remove(chip); > - > - return 0; > } > > static const struct spi_device_id st33zp24_spi_id[] = { > diff --git a/drivers/char/tpm/tpm_tis_spi_main.c b/drivers/char/tpm/tpm_tis_spi_main.c > index aaa59a00eeae..184396b3af50 100644 > --- a/drivers/char/tpm/tpm_tis_spi_main.c > +++ b/drivers/char/tpm/tpm_tis_spi_main.c > @@ -254,13 +254,12 @@ static int tpm_tis_spi_driver_probe(struct spi_device *spi) > > static SIMPLE_DEV_PM_OPS(tpm_tis_pm, tpm_pm_suspend, tpm_tis_spi_resume); > > -static int tpm_tis_spi_remove(struct spi_device *dev) > +static void tpm_tis_spi_remove(struct spi_device *dev) > { > struct tpm_chip *chip = spi_get_drvdata(dev); > > tpm_chip_unregister(chip); > tpm_tis_remove(chip); > - return 0; > } > > static const struct spi_device_id tpm_tis_spi_id[] = { > diff --git a/drivers/clk/clk-lmk04832.c b/drivers/clk/clk-lmk04832.c > index 8f02c0b88000..f416f8bc2898 100644 > --- a/drivers/clk/clk-lmk04832.c > +++ b/drivers/clk/clk-lmk04832.c > @@ -1544,14 +1544,12 @@ static int lmk04832_probe(struct spi_device *spi) > return ret; > } > > -static int lmk04832_remove(struct spi_device *spi) > +static void lmk04832_remove(struct spi_device *spi) > { > struct lmk04832 *lmk = spi_get_drvdata(spi); > > clk_disable_unprepare(lmk->oscin); > of_clk_del_provider(spi->dev.of_node); > - > - return 0; > } > static const struct spi_device_id lmk04832_id[] = { > { "lmk04832", LMK04832 }, > diff --git a/drivers/gpio/gpio-74x164.c b/drivers/gpio/gpio-74x164.c > index 4a55cdf089d6..e00c33310517 100644 > --- a/drivers/gpio/gpio-74x164.c > +++ b/drivers/gpio/gpio-74x164.c > @@ -163,15 +163,13 @@ static int gen_74x164_probe(struct spi_device *spi) > return ret; > } > > -static int gen_74x164_remove(struct spi_device *spi) > +static void gen_74x164_remove(struct spi_device *spi) > { > struct gen_74x164_chip *chip = spi_get_drvdata(spi); > > gpiod_set_value_cansleep(chip->gpiod_oe, 0); > gpiochip_remove(&chip->gpio_chip); > mutex_destroy(&chip->lock); > - > - return 0; > } > > static const struct spi_device_id gen_74x164_spi_ids[] = { > diff --git a/drivers/gpio/gpio-max3191x.c b/drivers/gpio/gpio-max3191x.c > index 51cd6f98d1c7..161c4751c5f7 100644 > --- a/drivers/gpio/gpio-max3191x.c > +++ b/drivers/gpio/gpio-max3191x.c > @@ -443,14 +443,12 @@ static int max3191x_probe(struct spi_device *spi) > return 0; > } > > -static int max3191x_remove(struct spi_device *spi) > +static void max3191x_remove(struct spi_device *spi) > { > struct max3191x_chip *max3191x = spi_get_drvdata(spi); > > gpiochip_remove(&max3191x->gpio); > mutex_destroy(&max3191x->lock); > - > - return 0; > } > > static int __init max3191x_register_driver(struct spi_driver *sdrv) > diff --git a/drivers/gpio/gpio-max7301.c b/drivers/gpio/gpio-max7301.c > index 5862d73bf325..11813f41d460 100644 > --- a/drivers/gpio/gpio-max7301.c > +++ b/drivers/gpio/gpio-max7301.c > @@ -64,11 +64,9 @@ static int max7301_probe(struct spi_device *spi) > return ret; > } > > -static int max7301_remove(struct spi_device *spi) > +static void max7301_remove(struct spi_device *spi) > { > __max730x_remove(&spi->dev); > - > - return 0; > } > > static const struct spi_device_id max7301_id[] = { > diff --git a/drivers/gpio/gpio-mc33880.c b/drivers/gpio/gpio-mc33880.c > index 31d2be1bebc8..cd9b16dbe1a9 100644 > --- a/drivers/gpio/gpio-mc33880.c > +++ b/drivers/gpio/gpio-mc33880.c > @@ -134,7 +134,7 @@ static int mc33880_probe(struct spi_device *spi) > return ret; > } > > -static int mc33880_remove(struct spi_device *spi) > +static void mc33880_remove(struct spi_device *spi) > { > struct mc33880 *mc; > > @@ -142,8 +142,6 @@ static int mc33880_remove(struct spi_device *spi) > > gpiochip_remove(&mc->chip); > mutex_destroy(&mc->lock); > - > - return 0; > } > > static struct spi_driver mc33880_driver = { > diff --git a/drivers/gpio/gpio-pisosr.c b/drivers/gpio/gpio-pisosr.c > index 8e04054cf07e..81a47ae09ff8 100644 > --- a/drivers/gpio/gpio-pisosr.c > +++ b/drivers/gpio/gpio-pisosr.c > @@ -163,15 +163,13 @@ static int pisosr_gpio_probe(struct spi_device *spi) > return 0; > } > > -static int pisosr_gpio_remove(struct spi_device *spi) > +static void pisosr_gpio_remove(struct spi_device *spi) > { > struct pisosr_gpio *gpio = spi_get_drvdata(spi); > > gpiochip_remove(&gpio->chip); > > mutex_destroy(&gpio->lock); > - > - return 0; > } > > static const struct spi_device_id pisosr_gpio_id_table[] = { > diff --git a/drivers/gpu/drm/panel/panel-abt-y030xx067a.c b/drivers/gpu/drm/panel/panel-abt-y030xx067a.c > index f043b484055b..ed626fdc08e8 100644 > --- a/drivers/gpu/drm/panel/panel-abt-y030xx067a.c > +++ b/drivers/gpu/drm/panel/panel-abt-y030xx067a.c > @@ -293,15 +293,13 @@ static int y030xx067a_probe(struct spi_device *spi) > return 0; > } > > -static int y030xx067a_remove(struct spi_device *spi) > +static void y030xx067a_remove(struct spi_device *spi) > { > struct y030xx067a *priv = spi_get_drvdata(spi); > > drm_panel_remove(&priv->panel); > drm_panel_disable(&priv->panel); > drm_panel_unprepare(&priv->panel); > - > - return 0; > } > > static const struct drm_display_mode y030xx067a_modes[] = { > diff --git a/drivers/gpu/drm/panel/panel-ilitek-ili9322.c b/drivers/gpu/drm/panel/panel-ilitek-ili9322.c > index 8e84df9a0033..3dfafa585127 100644 > --- a/drivers/gpu/drm/panel/panel-ilitek-ili9322.c > +++ b/drivers/gpu/drm/panel/panel-ilitek-ili9322.c > @@ -896,14 +896,12 @@ static int ili9322_probe(struct spi_device *spi) > return 0; > } > > -static int ili9322_remove(struct spi_device *spi) > +static void ili9322_remove(struct spi_device *spi) > { > struct ili9322 *ili = spi_get_drvdata(spi); > > ili9322_power_off(ili); > drm_panel_remove(&ili->panel); > - > - return 0; > } > > /* > diff --git a/drivers/gpu/drm/panel/panel-ilitek-ili9341.c b/drivers/gpu/drm/panel/panel-ilitek-ili9341.c > index 2c3378a259b1..a07ef26234e5 100644 > --- a/drivers/gpu/drm/panel/panel-ilitek-ili9341.c > +++ b/drivers/gpu/drm/panel/panel-ilitek-ili9341.c > @@ -728,7 +728,7 @@ static int ili9341_probe(struct spi_device *spi) > return -1; > } > > -static int ili9341_remove(struct spi_device *spi) > +static void ili9341_remove(struct spi_device *spi) > { > const struct spi_device_id *id = spi_get_device_id(spi); > struct ili9341 *ili = spi_get_drvdata(spi); > @@ -741,7 +741,6 @@ static int ili9341_remove(struct spi_device *spi) > drm_dev_unplug(drm); > drm_atomic_helper_shutdown(drm); > } > - return 0; > } > > static void ili9341_shutdown(struct spi_device *spi) > diff --git a/drivers/gpu/drm/panel/panel-innolux-ej030na.c b/drivers/gpu/drm/panel/panel-innolux-ej030na.c > index c558de3f99be..e3b1daa0cb72 100644 > --- a/drivers/gpu/drm/panel/panel-innolux-ej030na.c > +++ b/drivers/gpu/drm/panel/panel-innolux-ej030na.c > @@ -219,15 +219,13 @@ static int ej030na_probe(struct spi_device *spi) > return 0; > } > > -static int ej030na_remove(struct spi_device *spi) > +static void ej030na_remove(struct spi_device *spi) > { > struct ej030na *priv = spi_get_drvdata(spi); > > drm_panel_remove(&priv->panel); > drm_panel_disable(&priv->panel); > drm_panel_unprepare(&priv->panel); > - > - return 0; > } > > static const struct drm_display_mode ej030na_modes[] = { > diff --git a/drivers/gpu/drm/panel/panel-lg-lb035q02.c b/drivers/gpu/drm/panel/panel-lg-lb035q02.c > index f3183b68704f..9d0d4faa3f58 100644 > --- a/drivers/gpu/drm/panel/panel-lg-lb035q02.c > +++ b/drivers/gpu/drm/panel/panel-lg-lb035q02.c > @@ -203,14 +203,12 @@ static int lb035q02_probe(struct spi_device *spi) > return 0; > } > > -static int lb035q02_remove(struct spi_device *spi) > +static void lb035q02_remove(struct spi_device *spi) > { > struct lb035q02_device *lcd = spi_get_drvdata(spi); > > drm_panel_remove(&lcd->panel); > drm_panel_disable(&lcd->panel); > - > - return 0; > } > > static const struct of_device_id lb035q02_of_match[] = { > diff --git a/drivers/gpu/drm/panel/panel-lg-lg4573.c b/drivers/gpu/drm/panel/panel-lg-lg4573.c > index 8e5160af1de5..cf246d15b7b6 100644 > --- a/drivers/gpu/drm/panel/panel-lg-lg4573.c > +++ b/drivers/gpu/drm/panel/panel-lg-lg4573.c > @@ -266,14 +266,12 @@ static int lg4573_probe(struct spi_device *spi) > return 0; > } > > -static int lg4573_remove(struct spi_device *spi) > +static void lg4573_remove(struct spi_device *spi) > { > struct lg4573 *ctx = spi_get_drvdata(spi); > > lg4573_display_off(ctx); > drm_panel_remove(&ctx->panel); > - > - return 0; > } > > static const struct of_device_id lg4573_of_match[] = { > diff --git a/drivers/gpu/drm/panel/panel-nec-nl8048hl11.c b/drivers/gpu/drm/panel/panel-nec-nl8048hl11.c > index 6e5ab1debc8b..81c5c541a351 100644 > --- a/drivers/gpu/drm/panel/panel-nec-nl8048hl11.c > +++ b/drivers/gpu/drm/panel/panel-nec-nl8048hl11.c > @@ -212,15 +212,13 @@ static int nl8048_probe(struct spi_device *spi) > return 0; > } > > -static int nl8048_remove(struct spi_device *spi) > +static void nl8048_remove(struct spi_device *spi) > { > struct nl8048_panel *lcd = spi_get_drvdata(spi); > > drm_panel_remove(&lcd->panel); > drm_panel_disable(&lcd->panel); > drm_panel_unprepare(&lcd->panel); > - > - return 0; > } > > static const struct of_device_id nl8048_of_match[] = { > diff --git a/drivers/gpu/drm/panel/panel-novatek-nt39016.c b/drivers/gpu/drm/panel/panel-novatek-nt39016.c > index d036853db865..f58cfb10b58a 100644 > --- a/drivers/gpu/drm/panel/panel-novatek-nt39016.c > +++ b/drivers/gpu/drm/panel/panel-novatek-nt39016.c > @@ -292,7 +292,7 @@ static int nt39016_probe(struct spi_device *spi) > return 0; > } > > -static int nt39016_remove(struct spi_device *spi) > +static void nt39016_remove(struct spi_device *spi) > { > struct nt39016 *panel = spi_get_drvdata(spi); > > @@ -300,8 +300,6 @@ static int nt39016_remove(struct spi_device *spi) > > nt39016_disable(&panel->drm_panel); > nt39016_unprepare(&panel->drm_panel); > - > - return 0; > } > > static const struct drm_display_mode kd035g6_display_modes[] = { > diff --git a/drivers/gpu/drm/panel/panel-samsung-db7430.c b/drivers/gpu/drm/panel/panel-samsung-db7430.c > index ead479719f00..04640c5256a8 100644 > --- a/drivers/gpu/drm/panel/panel-samsung-db7430.c > +++ b/drivers/gpu/drm/panel/panel-samsung-db7430.c > @@ -314,12 +314,11 @@ static int db7430_probe(struct spi_device *spi) > return 0; > } > > -static int db7430_remove(struct spi_device *spi) > +static void db7430_remove(struct spi_device *spi) > { > struct db7430 *db = spi_get_drvdata(spi); > > drm_panel_remove(&db->panel); > - return 0; > } > > /* > diff --git a/drivers/gpu/drm/panel/panel-samsung-ld9040.c b/drivers/gpu/drm/panel/panel-samsung-ld9040.c > index c4b388850a13..01eb211f32f7 100644 > --- a/drivers/gpu/drm/panel/panel-samsung-ld9040.c > +++ b/drivers/gpu/drm/panel/panel-samsung-ld9040.c > @@ -358,14 +358,12 @@ static int ld9040_probe(struct spi_device *spi) > return 0; > } > > -static int ld9040_remove(struct spi_device *spi) > +static void ld9040_remove(struct spi_device *spi) > { > struct ld9040 *ctx = spi_get_drvdata(spi); > > ld9040_power_off(ctx); > drm_panel_remove(&ctx->panel); > - > - return 0; > } > > static const struct of_device_id ld9040_of_match[] = { > diff --git a/drivers/gpu/drm/panel/panel-samsung-s6d27a1.c b/drivers/gpu/drm/panel/panel-samsung-s6d27a1.c > index 1696ceb36aa0..2adb223a895c 100644 > --- a/drivers/gpu/drm/panel/panel-samsung-s6d27a1.c > +++ b/drivers/gpu/drm/panel/panel-samsung-s6d27a1.c > @@ -291,12 +291,11 @@ static int s6d27a1_probe(struct spi_device *spi) > return 0; > } > > -static int s6d27a1_remove(struct spi_device *spi) > +static void s6d27a1_remove(struct spi_device *spi) > { > struct s6d27a1 *ctx = spi_get_drvdata(spi); > > drm_panel_remove(&ctx->panel); > - return 0; > } > > static const struct of_device_id s6d27a1_match[] = { > diff --git a/drivers/gpu/drm/panel/panel-samsung-s6e63m0-spi.c b/drivers/gpu/drm/panel/panel-samsung-s6e63m0-spi.c > index c178d962b0d5..d99afcc672ca 100644 > --- a/drivers/gpu/drm/panel/panel-samsung-s6e63m0-spi.c > +++ b/drivers/gpu/drm/panel/panel-samsung-s6e63m0-spi.c > @@ -62,10 +62,9 @@ static int s6e63m0_spi_probe(struct spi_device *spi) > s6e63m0_spi_dcs_write, false); > } > > -static int s6e63m0_spi_remove(struct spi_device *spi) > +static void s6e63m0_spi_remove(struct spi_device *spi) > { > s6e63m0_remove(&spi->dev); > - return 0; > } > > static const struct of_device_id s6e63m0_spi_of_match[] = { > diff --git a/drivers/gpu/drm/panel/panel-sitronix-st7789v.c b/drivers/gpu/drm/panel/panel-sitronix-st7789v.c > index 61e565524542..bbc4569cbcdc 100644 > --- a/drivers/gpu/drm/panel/panel-sitronix-st7789v.c > +++ b/drivers/gpu/drm/panel/panel-sitronix-st7789v.c > @@ -387,13 +387,11 @@ static int st7789v_probe(struct spi_device *spi) > return 0; > } > > -static int st7789v_remove(struct spi_device *spi) > +static void st7789v_remove(struct spi_device *spi) > { > struct st7789v *ctx = spi_get_drvdata(spi); > > drm_panel_remove(&ctx->panel); > - > - return 0; > } > > static const struct of_device_id st7789v_of_match[] = { > diff --git a/drivers/gpu/drm/panel/panel-sony-acx565akm.c b/drivers/gpu/drm/panel/panel-sony-acx565akm.c > index ba0b3ead150f..0d7541a33f87 100644 > --- a/drivers/gpu/drm/panel/panel-sony-acx565akm.c > +++ b/drivers/gpu/drm/panel/panel-sony-acx565akm.c > @@ -655,7 +655,7 @@ static int acx565akm_probe(struct spi_device *spi) > return 0; > } > > -static int acx565akm_remove(struct spi_device *spi) > +static void acx565akm_remove(struct spi_device *spi) > { > struct acx565akm_panel *lcd = spi_get_drvdata(spi); > > @@ -666,8 +666,6 @@ static int acx565akm_remove(struct spi_device *spi) > > drm_panel_disable(&lcd->panel); > drm_panel_unprepare(&lcd->panel); > - > - return 0; > } > > static const struct of_device_id acx565akm_of_match[] = { > diff --git a/drivers/gpu/drm/panel/panel-tpo-td028ttec1.c b/drivers/gpu/drm/panel/panel-tpo-td028ttec1.c > index ba0c00d1a001..4dbf8b88f264 100644 > --- a/drivers/gpu/drm/panel/panel-tpo-td028ttec1.c > +++ b/drivers/gpu/drm/panel/panel-tpo-td028ttec1.c > @@ -350,15 +350,13 @@ static int td028ttec1_probe(struct spi_device *spi) > return 0; > } > > -static int td028ttec1_remove(struct spi_device *spi) > +static void td028ttec1_remove(struct spi_device *spi) > { > struct td028ttec1_panel *lcd = spi_get_drvdata(spi); > > drm_panel_remove(&lcd->panel); > drm_panel_disable(&lcd->panel); > drm_panel_unprepare(&lcd->panel); > - > - return 0; > } > > static const struct of_device_id td028ttec1_of_match[] = { > diff --git a/drivers/gpu/drm/panel/panel-tpo-td043mtea1.c b/drivers/gpu/drm/panel/panel-tpo-td043mtea1.c > index 1866cdb8f9c1..cf4609bb9b1d 100644 > --- a/drivers/gpu/drm/panel/panel-tpo-td043mtea1.c > +++ b/drivers/gpu/drm/panel/panel-tpo-td043mtea1.c > @@ -463,7 +463,7 @@ static int td043mtea1_probe(struct spi_device *spi) > return 0; > } > > -static int td043mtea1_remove(struct spi_device *spi) > +static void td043mtea1_remove(struct spi_device *spi) > { > struct td043mtea1_panel *lcd = spi_get_drvdata(spi); > > @@ -472,8 +472,6 @@ static int td043mtea1_remove(struct spi_device *spi) > drm_panel_unprepare(&lcd->panel); > > sysfs_remove_group(&spi->dev.kobj, &td043mtea1_attr_group); > - > - return 0; > } > > static const struct of_device_id td043mtea1_of_match[] = { > diff --git a/drivers/gpu/drm/panel/panel-tpo-tpg110.c b/drivers/gpu/drm/panel/panel-tpo-tpg110.c > index e3791dad6830..0b1f5a11a055 100644 > --- a/drivers/gpu/drm/panel/panel-tpo-tpg110.c > +++ b/drivers/gpu/drm/panel/panel-tpo-tpg110.c > @@ -450,12 +450,11 @@ static int tpg110_probe(struct spi_device *spi) > return 0; > } > > -static int tpg110_remove(struct spi_device *spi) > +static void tpg110_remove(struct spi_device *spi) > { > struct tpg110 *tpg = spi_get_drvdata(spi); > > drm_panel_remove(&tpg->panel); > - return 0; > } > > static const struct of_device_id tpg110_match[] = { > diff --git a/drivers/gpu/drm/panel/panel-widechips-ws2401.c b/drivers/gpu/drm/panel/panel-widechips-ws2401.c > index 8bc976f54b80..236f3cb2b594 100644 > --- a/drivers/gpu/drm/panel/panel-widechips-ws2401.c > +++ b/drivers/gpu/drm/panel/panel-widechips-ws2401.c > @@ -407,12 +407,11 @@ static int ws2401_probe(struct spi_device *spi) > return 0; > } > > -static int ws2401_remove(struct spi_device *spi) > +static void ws2401_remove(struct spi_device *spi) > { > struct ws2401 *ws = spi_get_drvdata(spi); > > drm_panel_remove(&ws->panel); > - return 0; > } > > /* > diff --git a/drivers/gpu/drm/tiny/hx8357d.c b/drivers/gpu/drm/tiny/hx8357d.c > index 9b33c05732aa..ebb025543f8d 100644 > --- a/drivers/gpu/drm/tiny/hx8357d.c > +++ b/drivers/gpu/drm/tiny/hx8357d.c > @@ -263,14 +263,12 @@ static int hx8357d_probe(struct spi_device *spi) > return 0; > } > > -static int hx8357d_remove(struct spi_device *spi) > +static void hx8357d_remove(struct spi_device *spi) > { > struct drm_device *drm = spi_get_drvdata(spi); > > drm_dev_unplug(drm); > drm_atomic_helper_shutdown(drm); > - > - return 0; > } > > static void hx8357d_shutdown(struct spi_device *spi) > diff --git a/drivers/gpu/drm/tiny/ili9163.c b/drivers/gpu/drm/tiny/ili9163.c > index bcc181351236..fc8ed245b0bc 100644 > --- a/drivers/gpu/drm/tiny/ili9163.c > +++ b/drivers/gpu/drm/tiny/ili9163.c > @@ -193,14 +193,12 @@ static int ili9163_probe(struct spi_device *spi) > return 0; > } > > -static int ili9163_remove(struct spi_device *spi) > +static void ili9163_remove(struct spi_device *spi) > { > struct drm_device *drm = spi_get_drvdata(spi); > > drm_dev_unplug(drm); > drm_atomic_helper_shutdown(drm); > - > - return 0; > } > > static void ili9163_shutdown(struct spi_device *spi) > diff --git a/drivers/gpu/drm/tiny/ili9225.c b/drivers/gpu/drm/tiny/ili9225.c > index 976d3209f164..cc92eb9f2a07 100644 > --- a/drivers/gpu/drm/tiny/ili9225.c > +++ b/drivers/gpu/drm/tiny/ili9225.c > @@ -411,14 +411,12 @@ static int ili9225_probe(struct spi_device *spi) > return 0; > } > > -static int ili9225_remove(struct spi_device *spi) > +static void ili9225_remove(struct spi_device *spi) > { > struct drm_device *drm = spi_get_drvdata(spi); > > drm_dev_unplug(drm); > drm_atomic_helper_shutdown(drm); > - > - return 0; > } > > static void ili9225_shutdown(struct spi_device *spi) > diff --git a/drivers/gpu/drm/tiny/ili9341.c b/drivers/gpu/drm/tiny/ili9341.c > index 37e0c33399c8..5b8cc770ee7b 100644 > --- a/drivers/gpu/drm/tiny/ili9341.c > +++ b/drivers/gpu/drm/tiny/ili9341.c > @@ -225,14 +225,12 @@ static int ili9341_probe(struct spi_device *spi) > return 0; > } > > -static int ili9341_remove(struct spi_device *spi) > +static void ili9341_remove(struct spi_device *spi) > { > struct drm_device *drm = spi_get_drvdata(spi); > > drm_dev_unplug(drm); > drm_atomic_helper_shutdown(drm); > - > - return 0; > } > > static void ili9341_shutdown(struct spi_device *spi) > diff --git a/drivers/gpu/drm/tiny/ili9486.c b/drivers/gpu/drm/tiny/ili9486.c > index e9a63f4b2993..6d655e18e0aa 100644 > --- a/drivers/gpu/drm/tiny/ili9486.c > +++ b/drivers/gpu/drm/tiny/ili9486.c > @@ -243,14 +243,12 @@ static int ili9486_probe(struct spi_device *spi) > return 0; > } > > -static int ili9486_remove(struct spi_device *spi) > +static void ili9486_remove(struct spi_device *spi) > { > struct drm_device *drm = spi_get_drvdata(spi); > > drm_dev_unplug(drm); > drm_atomic_helper_shutdown(drm); > - > - return 0; > } > > static void ili9486_shutdown(struct spi_device *spi) > diff --git a/drivers/gpu/drm/tiny/mi0283qt.c b/drivers/gpu/drm/tiny/mi0283qt.c > index 023de49e7a8e..5e060f6910bb 100644 > --- a/drivers/gpu/drm/tiny/mi0283qt.c > +++ b/drivers/gpu/drm/tiny/mi0283qt.c > @@ -233,14 +233,12 @@ static int mi0283qt_probe(struct spi_device *spi) > return 0; > } > > -static int mi0283qt_remove(struct spi_device *spi) > +static void mi0283qt_remove(struct spi_device *spi) > { > struct drm_device *drm = spi_get_drvdata(spi); > > drm_dev_unplug(drm); > drm_atomic_helper_shutdown(drm); > - > - return 0; > } > > static void mi0283qt_shutdown(struct spi_device *spi) > diff --git a/drivers/gpu/drm/tiny/repaper.c b/drivers/gpu/drm/tiny/repaper.c > index 97a775c48cea..beeeb170d0b1 100644 > --- a/drivers/gpu/drm/tiny/repaper.c > +++ b/drivers/gpu/drm/tiny/repaper.c > @@ -1140,14 +1140,12 @@ static int repaper_probe(struct spi_device *spi) > return 0; > } > > -static int repaper_remove(struct spi_device *spi) > +static void repaper_remove(struct spi_device *spi) > { > struct drm_device *drm = spi_get_drvdata(spi); > > drm_dev_unplug(drm); > drm_atomic_helper_shutdown(drm); > - > - return 0; > } > > static void repaper_shutdown(struct spi_device *spi) > diff --git a/drivers/gpu/drm/tiny/st7586.c b/drivers/gpu/drm/tiny/st7586.c > index 51b9b9fb3ead..3f38faa1cd8c 100644 > --- a/drivers/gpu/drm/tiny/st7586.c > +++ b/drivers/gpu/drm/tiny/st7586.c > @@ -360,14 +360,12 @@ static int st7586_probe(struct spi_device *spi) > return 0; > } > > -static int st7586_remove(struct spi_device *spi) > +static void st7586_remove(struct spi_device *spi) > { > struct drm_device *drm = spi_get_drvdata(spi); > > drm_dev_unplug(drm); > drm_atomic_helper_shutdown(drm); > - > - return 0; > } > > static void st7586_shutdown(struct spi_device *spi) > diff --git a/drivers/gpu/drm/tiny/st7735r.c b/drivers/gpu/drm/tiny/st7735r.c > index fc40dd10efa8..29d618093e94 100644 > --- a/drivers/gpu/drm/tiny/st7735r.c > +++ b/drivers/gpu/drm/tiny/st7735r.c > @@ -247,14 +247,12 @@ static int st7735r_probe(struct spi_device *spi) > return 0; > } > > -static int st7735r_remove(struct spi_device *spi) > +static void st7735r_remove(struct spi_device *spi) > { > struct drm_device *drm = spi_get_drvdata(spi); > > drm_dev_unplug(drm); > drm_atomic_helper_shutdown(drm); > - > - return 0; > } > > static void st7735r_shutdown(struct spi_device *spi) > diff --git a/drivers/hwmon/adcxx.c b/drivers/hwmon/adcxx.c > index e5bc5ce09f4e..de37bce24fa6 100644 > --- a/drivers/hwmon/adcxx.c > +++ b/drivers/hwmon/adcxx.c > @@ -194,7 +194,7 @@ static int adcxx_probe(struct spi_device *spi) > return status; > } > > -static int adcxx_remove(struct spi_device *spi) > +static void adcxx_remove(struct spi_device *spi) > { > struct adcxx *adc = spi_get_drvdata(spi); > int i; > @@ -205,8 +205,6 @@ static int adcxx_remove(struct spi_device *spi) > device_remove_file(&spi->dev, &ad_input[i].dev_attr); > > mutex_unlock(&adc->lock); > - > - return 0; > } > > static const struct spi_device_id adcxx_ids[] = { > diff --git a/drivers/hwmon/adt7310.c b/drivers/hwmon/adt7310.c > index c40cac16af68..832d9ec64934 100644 > --- a/drivers/hwmon/adt7310.c > +++ b/drivers/hwmon/adt7310.c > @@ -88,10 +88,9 @@ static int adt7310_spi_probe(struct spi_device *spi) > &adt7310_spi_ops); > } > > -static int adt7310_spi_remove(struct spi_device *spi) > +static void adt7310_spi_remove(struct spi_device *spi) > { > adt7x10_remove(&spi->dev, spi->irq); > - return 0; > } > > static const struct spi_device_id adt7310_id[] = { > diff --git a/drivers/hwmon/max1111.c b/drivers/hwmon/max1111.c > index 5fcfd57df61e..4c5487aeb3cf 100644 > --- a/drivers/hwmon/max1111.c > +++ b/drivers/hwmon/max1111.c > @@ -254,7 +254,7 @@ static int max1111_probe(struct spi_device *spi) > return err; > } > > -static int max1111_remove(struct spi_device *spi) > +static void max1111_remove(struct spi_device *spi) > { > struct max1111_data *data = spi_get_drvdata(spi); > > @@ -265,7 +265,6 @@ static int max1111_remove(struct spi_device *spi) > sysfs_remove_group(&spi->dev.kobj, &max1110_attr_group); > sysfs_remove_group(&spi->dev.kobj, &max1111_attr_group); > mutex_destroy(&data->drvdata_lock); > - return 0; > } > > static const struct spi_device_id max1111_ids[] = { > diff --git a/drivers/hwmon/max31722.c b/drivers/hwmon/max31722.c > index 4cf4fe6809a3..93e048ee4955 100644 > --- a/drivers/hwmon/max31722.c > +++ b/drivers/hwmon/max31722.c > @@ -100,7 +100,7 @@ static int max31722_probe(struct spi_device *spi) > return 0; > } > > -static int max31722_remove(struct spi_device *spi) > +static void max31722_remove(struct spi_device *spi) > { > struct max31722_data *data = spi_get_drvdata(spi); > int ret; > @@ -111,8 +111,6 @@ static int max31722_remove(struct spi_device *spi) > if (ret) > /* There is nothing we can do about this ... */ > dev_warn(&spi->dev, "Failed to put device in stand-by mode\n"); > - > - return 0; > } > > static int __maybe_unused max31722_suspend(struct device *dev) > diff --git a/drivers/iio/accel/bma400_spi.c b/drivers/iio/accel/bma400_spi.c > index 9f622e37477b..9040a717b247 100644 > --- a/drivers/iio/accel/bma400_spi.c > +++ b/drivers/iio/accel/bma400_spi.c > @@ -87,11 +87,9 @@ static int bma400_spi_probe(struct spi_device *spi) > return bma400_probe(&spi->dev, regmap, id->name); > } > > -static int bma400_spi_remove(struct spi_device *spi) > +static void bma400_spi_remove(struct spi_device *spi) > { > bma400_remove(&spi->dev); > - > - return 0; > } > > static const struct spi_device_id bma400_spi_ids[] = { > diff --git a/drivers/iio/accel/bmc150-accel-spi.c b/drivers/iio/accel/bmc150-accel-spi.c > index 11559567cb39..80007cc2d044 100644 > --- a/drivers/iio/accel/bmc150-accel-spi.c > +++ b/drivers/iio/accel/bmc150-accel-spi.c > @@ -35,11 +35,9 @@ static int bmc150_accel_probe(struct spi_device *spi) > true); > } > > -static int bmc150_accel_remove(struct spi_device *spi) > +static void bmc150_accel_remove(struct spi_device *spi) > { > bmc150_accel_core_remove(&spi->dev); > - > - return 0; > } > > static const struct acpi_device_id bmc150_accel_acpi_match[] = { > diff --git a/drivers/iio/accel/bmi088-accel-spi.c b/drivers/iio/accel/bmi088-accel-spi.c > index 758ad2f12896..06d99d9949f3 100644 > --- a/drivers/iio/accel/bmi088-accel-spi.c > +++ b/drivers/iio/accel/bmi088-accel-spi.c > @@ -56,11 +56,9 @@ static int bmi088_accel_probe(struct spi_device *spi) > true); > } > > -static int bmi088_accel_remove(struct spi_device *spi) > +static void bmi088_accel_remove(struct spi_device *spi) > { > bmi088_accel_core_remove(&spi->dev); > - > - return 0; > } > > static const struct spi_device_id bmi088_accel_id[] = { > diff --git a/drivers/iio/accel/kxsd9-spi.c b/drivers/iio/accel/kxsd9-spi.c > index 441e6b764281..57c451cfb9e5 100644 > --- a/drivers/iio/accel/kxsd9-spi.c > +++ b/drivers/iio/accel/kxsd9-spi.c > @@ -32,11 +32,9 @@ static int kxsd9_spi_probe(struct spi_device *spi) > spi_get_device_id(spi)->name); > } > > -static int kxsd9_spi_remove(struct spi_device *spi) > +static void kxsd9_spi_remove(struct spi_device *spi) > { > kxsd9_common_remove(&spi->dev); > - > - return 0; > } > > static const struct spi_device_id kxsd9_spi_id[] = { > diff --git a/drivers/iio/accel/mma7455_spi.c b/drivers/iio/accel/mma7455_spi.c > index ecf690692dcc..b746031551a3 100644 > --- a/drivers/iio/accel/mma7455_spi.c > +++ b/drivers/iio/accel/mma7455_spi.c > @@ -22,11 +22,9 @@ static int mma7455_spi_probe(struct spi_device *spi) > return mma7455_core_probe(&spi->dev, regmap, id->name); > } > > -static int mma7455_spi_remove(struct spi_device *spi) > +static void mma7455_spi_remove(struct spi_device *spi) > { > mma7455_core_remove(&spi->dev); > - > - return 0; > } > > static const struct spi_device_id mma7455_spi_ids[] = { > diff --git a/drivers/iio/accel/sca3000.c b/drivers/iio/accel/sca3000.c > index 43ecacbdc95a..83c81072511e 100644 > --- a/drivers/iio/accel/sca3000.c > +++ b/drivers/iio/accel/sca3000.c > @@ -1524,7 +1524,7 @@ static int sca3000_stop_all_interrupts(struct sca3000_state *st) > return ret; > } > > -static int sca3000_remove(struct spi_device *spi) > +static void sca3000_remove(struct spi_device *spi) > { > struct iio_dev *indio_dev = spi_get_drvdata(spi); > struct sca3000_state *st = iio_priv(indio_dev); > @@ -1535,8 +1535,6 @@ static int sca3000_remove(struct spi_device *spi) > sca3000_stop_all_interrupts(st); > if (spi->irq) > free_irq(spi->irq, indio_dev); > - > - return 0; > } > > static const struct spi_device_id sca3000_id[] = { > diff --git a/drivers/iio/adc/ad7266.c b/drivers/iio/adc/ad7266.c > index 1d345d66742d..c17d9b5fbaf6 100644 > --- a/drivers/iio/adc/ad7266.c > +++ b/drivers/iio/adc/ad7266.c > @@ -479,7 +479,7 @@ static int ad7266_probe(struct spi_device *spi) > return ret; > } > > -static int ad7266_remove(struct spi_device *spi) > +static void ad7266_remove(struct spi_device *spi) > { > struct iio_dev *indio_dev = spi_get_drvdata(spi); > struct ad7266_state *st = iio_priv(indio_dev); > @@ -488,8 +488,6 @@ static int ad7266_remove(struct spi_device *spi) > iio_triggered_buffer_cleanup(indio_dev); > if (!IS_ERR(st->reg)) > regulator_disable(st->reg); > - > - return 0; > } > > static const struct spi_device_id ad7266_id[] = { > diff --git a/drivers/iio/adc/ltc2496.c b/drivers/iio/adc/ltc2496.c > index dd956a7c216e..5a55f79f2574 100644 > --- a/drivers/iio/adc/ltc2496.c > +++ b/drivers/iio/adc/ltc2496.c > @@ -78,13 +78,11 @@ static int ltc2496_probe(struct spi_device *spi) > return ltc2497core_probe(dev, indio_dev); > } > > -static int ltc2496_remove(struct spi_device *spi) > +static void ltc2496_remove(struct spi_device *spi) > { > struct iio_dev *indio_dev = spi_get_drvdata(spi); > > ltc2497core_remove(indio_dev); > - > - return 0; > } > > static const struct of_device_id ltc2496_of_match[] = { > diff --git a/drivers/iio/adc/mcp320x.c b/drivers/iio/adc/mcp320x.c > index 8d1cff28cae0..b4c69acb33e3 100644 > --- a/drivers/iio/adc/mcp320x.c > +++ b/drivers/iio/adc/mcp320x.c > @@ -459,15 +459,13 @@ static int mcp320x_probe(struct spi_device *spi) > return ret; > } > > -static int mcp320x_remove(struct spi_device *spi) > +static void mcp320x_remove(struct spi_device *spi) > { > struct iio_dev *indio_dev = spi_get_drvdata(spi); > struct mcp320x *adc = iio_priv(indio_dev); > > iio_device_unregister(indio_dev); > regulator_disable(adc->reg); > - > - return 0; > } > > static const struct of_device_id mcp320x_dt_ids[] = { > diff --git a/drivers/iio/adc/mcp3911.c b/drivers/iio/adc/mcp3911.c > index 13535f148c4c..1cb4590fe412 100644 > --- a/drivers/iio/adc/mcp3911.c > +++ b/drivers/iio/adc/mcp3911.c > @@ -321,7 +321,7 @@ static int mcp3911_probe(struct spi_device *spi) > return ret; > } > > -static int mcp3911_remove(struct spi_device *spi) > +static void mcp3911_remove(struct spi_device *spi) > { > struct iio_dev *indio_dev = spi_get_drvdata(spi); > struct mcp3911 *adc = iio_priv(indio_dev); > @@ -331,8 +331,6 @@ static int mcp3911_remove(struct spi_device *spi) > clk_disable_unprepare(adc->clki); > if (adc->vref) > regulator_disable(adc->vref); > - > - return 0; > } > > static const struct of_device_id mcp3911_dt_ids[] = { > diff --git a/drivers/iio/adc/ti-adc12138.c b/drivers/iio/adc/ti-adc12138.c > index 6eb62b564dae..59d75d09604f 100644 > --- a/drivers/iio/adc/ti-adc12138.c > +++ b/drivers/iio/adc/ti-adc12138.c > @@ -503,7 +503,7 @@ static int adc12138_probe(struct spi_device *spi) > return ret; > } > > -static int adc12138_remove(struct spi_device *spi) > +static void adc12138_remove(struct spi_device *spi) > { > struct iio_dev *indio_dev = spi_get_drvdata(spi); > struct adc12138 *adc = iio_priv(indio_dev); > @@ -514,8 +514,6 @@ static int adc12138_remove(struct spi_device *spi) > regulator_disable(adc->vref_n); > regulator_disable(adc->vref_p); > clk_disable_unprepare(adc->cclk); > - > - return 0; > } > > static const struct of_device_id adc12138_dt_ids[] = { > diff --git a/drivers/iio/adc/ti-ads7950.c b/drivers/iio/adc/ti-ads7950.c > index a7efa3eada2c..e3658b969c5b 100644 > --- a/drivers/iio/adc/ti-ads7950.c > +++ b/drivers/iio/adc/ti-ads7950.c > @@ -662,7 +662,7 @@ static int ti_ads7950_probe(struct spi_device *spi) > return ret; > } > > -static int ti_ads7950_remove(struct spi_device *spi) > +static void ti_ads7950_remove(struct spi_device *spi) > { > struct iio_dev *indio_dev = spi_get_drvdata(spi); > struct ti_ads7950_state *st = iio_priv(indio_dev); > @@ -672,8 +672,6 @@ static int ti_ads7950_remove(struct spi_device *spi) > iio_triggered_buffer_cleanup(indio_dev); > regulator_disable(st->reg); > mutex_destroy(&st->slock); > - > - return 0; > } > > static const struct spi_device_id ti_ads7950_id[] = { > diff --git a/drivers/iio/adc/ti-ads8688.c b/drivers/iio/adc/ti-ads8688.c > index 2e24717d7f55..22c2583eedd0 100644 > --- a/drivers/iio/adc/ti-ads8688.c > +++ b/drivers/iio/adc/ti-ads8688.c > @@ -479,7 +479,7 @@ static int ads8688_probe(struct spi_device *spi) > return ret; > } > > -static int ads8688_remove(struct spi_device *spi) > +static void ads8688_remove(struct spi_device *spi) > { > struct iio_dev *indio_dev = spi_get_drvdata(spi); > struct ads8688_state *st = iio_priv(indio_dev); > @@ -489,8 +489,6 @@ static int ads8688_remove(struct spi_device *spi) > > if (!IS_ERR(st->reg)) > regulator_disable(st->reg); > - > - return 0; > } > > static const struct spi_device_id ads8688_id[] = { > diff --git a/drivers/iio/adc/ti-tlc4541.c b/drivers/iio/adc/ti-tlc4541.c > index 403b787f9f7e..2406eda9dfc6 100644 > --- a/drivers/iio/adc/ti-tlc4541.c > +++ b/drivers/iio/adc/ti-tlc4541.c > @@ -224,7 +224,7 @@ static int tlc4541_probe(struct spi_device *spi) > return ret; > } > > -static int tlc4541_remove(struct spi_device *spi) > +static void tlc4541_remove(struct spi_device *spi) > { > struct iio_dev *indio_dev = spi_get_drvdata(spi); > struct tlc4541_state *st = iio_priv(indio_dev); > @@ -232,8 +232,6 @@ static int tlc4541_remove(struct spi_device *spi) > iio_device_unregister(indio_dev); > iio_triggered_buffer_cleanup(indio_dev); > regulator_disable(st->reg); > - > - return 0; > } > > static const struct of_device_id tlc4541_dt_ids[] = { > diff --git a/drivers/iio/amplifiers/ad8366.c b/drivers/iio/amplifiers/ad8366.c > index cfcf18a0bce8..1134ae12e531 100644 > --- a/drivers/iio/amplifiers/ad8366.c > +++ b/drivers/iio/amplifiers/ad8366.c > @@ -298,7 +298,7 @@ static int ad8366_probe(struct spi_device *spi) > return ret; > } > > -static int ad8366_remove(struct spi_device *spi) > +static void ad8366_remove(struct spi_device *spi) > { > struct iio_dev *indio_dev = spi_get_drvdata(spi); > struct ad8366_state *st = iio_priv(indio_dev); > @@ -308,8 +308,6 @@ static int ad8366_remove(struct spi_device *spi) > > if (!IS_ERR(reg)) > regulator_disable(reg); > - > - return 0; > } > > static const struct spi_device_id ad8366_id[] = { > diff --git a/drivers/iio/common/ssp_sensors/ssp_dev.c b/drivers/iio/common/ssp_sensors/ssp_dev.c > index 1aee87100038..eafaf4529df5 100644 > --- a/drivers/iio/common/ssp_sensors/ssp_dev.c > +++ b/drivers/iio/common/ssp_sensors/ssp_dev.c > @@ -586,7 +586,7 @@ static int ssp_probe(struct spi_device *spi) > return ret; > } > > -static int ssp_remove(struct spi_device *spi) > +static void ssp_remove(struct spi_device *spi) > { > struct ssp_data *data = spi_get_drvdata(spi); > > @@ -608,8 +608,6 @@ static int ssp_remove(struct spi_device *spi) > mutex_destroy(&data->pending_lock); > > mfd_remove_devices(&spi->dev); > - > - return 0; > } > > #ifdef CONFIG_PM_SLEEP > diff --git a/drivers/iio/dac/ad5360.c b/drivers/iio/dac/ad5360.c > index 2d3b14c407d8..ecbc6a51d60f 100644 > --- a/drivers/iio/dac/ad5360.c > +++ b/drivers/iio/dac/ad5360.c > @@ -521,7 +521,7 @@ static int ad5360_probe(struct spi_device *spi) > return ret; > } > > -static int ad5360_remove(struct spi_device *spi) > +static void ad5360_remove(struct spi_device *spi) > { > struct iio_dev *indio_dev = spi_get_drvdata(spi); > struct ad5360_state *st = iio_priv(indio_dev); > @@ -531,8 +531,6 @@ static int ad5360_remove(struct spi_device *spi) > kfree(indio_dev->channels); > > regulator_bulk_disable(st->chip_info->num_vrefs, st->vref_reg); > - > - return 0; > } > > static const struct spi_device_id ad5360_ids[] = { > diff --git a/drivers/iio/dac/ad5380.c b/drivers/iio/dac/ad5380.c > index e38860a6a9f3..82e1d9bd773e 100644 > --- a/drivers/iio/dac/ad5380.c > +++ b/drivers/iio/dac/ad5380.c > @@ -488,11 +488,9 @@ static int ad5380_spi_probe(struct spi_device *spi) > return ad5380_probe(&spi->dev, regmap, id->driver_data, id->name); > } > > -static int ad5380_spi_remove(struct spi_device *spi) > +static void ad5380_spi_remove(struct spi_device *spi) > { > ad5380_remove(&spi->dev); > - > - return 0; > } > > static const struct spi_device_id ad5380_spi_ids[] = { > diff --git a/drivers/iio/dac/ad5446.c b/drivers/iio/dac/ad5446.c > index 1c9b54c012a7..14cfabacbea5 100644 > --- a/drivers/iio/dac/ad5446.c > +++ b/drivers/iio/dac/ad5446.c > @@ -491,11 +491,9 @@ static int ad5446_spi_probe(struct spi_device *spi) > &ad5446_spi_chip_info[id->driver_data]); > } > > -static int ad5446_spi_remove(struct spi_device *spi) > +static void ad5446_spi_remove(struct spi_device *spi) > { > ad5446_remove(&spi->dev); > - > - return 0; > } > > static struct spi_driver ad5446_spi_driver = { > diff --git a/drivers/iio/dac/ad5449.c b/drivers/iio/dac/ad5449.c > index f5e93c6acc9d..bad9bdaafa94 100644 > --- a/drivers/iio/dac/ad5449.c > +++ b/drivers/iio/dac/ad5449.c > @@ -330,7 +330,7 @@ static int ad5449_spi_probe(struct spi_device *spi) > return ret; > } > > -static int ad5449_spi_remove(struct spi_device *spi) > +static void ad5449_spi_remove(struct spi_device *spi) > { > struct iio_dev *indio_dev = spi_get_drvdata(spi); > struct ad5449 *st = iio_priv(indio_dev); > @@ -338,8 +338,6 @@ static int ad5449_spi_remove(struct spi_device *spi) > iio_device_unregister(indio_dev); > > regulator_bulk_disable(st->chip_info->num_channels, st->vref_reg); > - > - return 0; > } > > static const struct spi_device_id ad5449_spi_ids[] = { > diff --git a/drivers/iio/dac/ad5504.c b/drivers/iio/dac/ad5504.c > index b631261efa97..8507573aa13e 100644 > --- a/drivers/iio/dac/ad5504.c > +++ b/drivers/iio/dac/ad5504.c > @@ -336,7 +336,7 @@ static int ad5504_probe(struct spi_device *spi) > return ret; > } > > -static int ad5504_remove(struct spi_device *spi) > +static void ad5504_remove(struct spi_device *spi) > { > struct iio_dev *indio_dev = spi_get_drvdata(spi); > struct ad5504_state *st = iio_priv(indio_dev); > @@ -345,8 +345,6 @@ static int ad5504_remove(struct spi_device *spi) > > if (!IS_ERR(st->reg)) > regulator_disable(st->reg); > - > - return 0; > } > > static const struct spi_device_id ad5504_id[] = { > diff --git a/drivers/iio/dac/ad5592r.c b/drivers/iio/dac/ad5592r.c > index 6bfd7951e18c..0f7abfa75bec 100644 > --- a/drivers/iio/dac/ad5592r.c > +++ b/drivers/iio/dac/ad5592r.c > @@ -130,11 +130,9 @@ static int ad5592r_spi_probe(struct spi_device *spi) > return ad5592r_probe(&spi->dev, id->name, &ad5592r_rw_ops); > } > > -static int ad5592r_spi_remove(struct spi_device *spi) > +static void ad5592r_spi_remove(struct spi_device *spi) > { > ad5592r_remove(&spi->dev); > - > - return 0; > } > > static const struct spi_device_id ad5592r_spi_ids[] = { > diff --git a/drivers/iio/dac/ad5624r_spi.c b/drivers/iio/dac/ad5624r_spi.c > index 3c98941b9f99..371e812850eb 100644 > --- a/drivers/iio/dac/ad5624r_spi.c > +++ b/drivers/iio/dac/ad5624r_spi.c > @@ -293,7 +293,7 @@ static int ad5624r_probe(struct spi_device *spi) > return ret; > } > > -static int ad5624r_remove(struct spi_device *spi) > +static void ad5624r_remove(struct spi_device *spi) > { > struct iio_dev *indio_dev = spi_get_drvdata(spi); > struct ad5624r_state *st = iio_priv(indio_dev); > @@ -301,8 +301,6 @@ static int ad5624r_remove(struct spi_device *spi) > iio_device_unregister(indio_dev); > if (!IS_ERR(st->reg)) > regulator_disable(st->reg); > - > - return 0; > } > > static const struct spi_device_id ad5624r_id[] = { > diff --git a/drivers/iio/dac/ad5686-spi.c b/drivers/iio/dac/ad5686-spi.c > index 2628810fdbb1..d26fb29b6b04 100644 > --- a/drivers/iio/dac/ad5686-spi.c > +++ b/drivers/iio/dac/ad5686-spi.c > @@ -95,11 +95,9 @@ static int ad5686_spi_probe(struct spi_device *spi) > ad5686_spi_write, ad5686_spi_read); > } > > -static int ad5686_spi_remove(struct spi_device *spi) > +static void ad5686_spi_remove(struct spi_device *spi) > { > ad5686_remove(&spi->dev); > - > - return 0; > } > > static const struct spi_device_id ad5686_spi_id[] = { > diff --git a/drivers/iio/dac/ad5761.c b/drivers/iio/dac/ad5761.c > index e37e095e94fc..4cb8471db81e 100644 > --- a/drivers/iio/dac/ad5761.c > +++ b/drivers/iio/dac/ad5761.c > @@ -394,7 +394,7 @@ static int ad5761_probe(struct spi_device *spi) > return ret; > } > > -static int ad5761_remove(struct spi_device *spi) > +static void ad5761_remove(struct spi_device *spi) > { > struct iio_dev *iio_dev = spi_get_drvdata(spi); > struct ad5761_state *st = iio_priv(iio_dev); > @@ -403,8 +403,6 @@ static int ad5761_remove(struct spi_device *spi) > > if (!IS_ERR_OR_NULL(st->vref_reg)) > regulator_disable(st->vref_reg); > - > - return 0; > } > > static const struct spi_device_id ad5761_id[] = { > diff --git a/drivers/iio/dac/ad5764.c b/drivers/iio/dac/ad5764.c > index ae089b9145cb..d235a8047ba0 100644 > --- a/drivers/iio/dac/ad5764.c > +++ b/drivers/iio/dac/ad5764.c > @@ -332,7 +332,7 @@ static int ad5764_probe(struct spi_device *spi) > return ret; > } > > -static int ad5764_remove(struct spi_device *spi) > +static void ad5764_remove(struct spi_device *spi) > { > struct iio_dev *indio_dev = spi_get_drvdata(spi); > struct ad5764_state *st = iio_priv(indio_dev); > @@ -341,8 +341,6 @@ static int ad5764_remove(struct spi_device *spi) > > if (st->chip_info->int_vref == 0) > regulator_bulk_disable(ARRAY_SIZE(st->vref_reg), st->vref_reg); > - > - return 0; > } > > static const struct spi_device_id ad5764_ids[] = { > diff --git a/drivers/iio/dac/ad5791.c b/drivers/iio/dac/ad5791.c > index 7b4579d73d18..2b14914b4050 100644 > --- a/drivers/iio/dac/ad5791.c > +++ b/drivers/iio/dac/ad5791.c > @@ -428,7 +428,7 @@ static int ad5791_probe(struct spi_device *spi) > return ret; > } > > -static int ad5791_remove(struct spi_device *spi) > +static void ad5791_remove(struct spi_device *spi) > { > struct iio_dev *indio_dev = spi_get_drvdata(spi); > struct ad5791_state *st = iio_priv(indio_dev); > @@ -439,8 +439,6 @@ static int ad5791_remove(struct spi_device *spi) > > if (!IS_ERR(st->reg_vss)) > regulator_disable(st->reg_vss); > - > - return 0; > } > > static const struct spi_device_id ad5791_id[] = { > diff --git a/drivers/iio/dac/ad8801.c b/drivers/iio/dac/ad8801.c > index 5ecfdad54dec..6be35c92d435 100644 > --- a/drivers/iio/dac/ad8801.c > +++ b/drivers/iio/dac/ad8801.c > @@ -193,7 +193,7 @@ static int ad8801_probe(struct spi_device *spi) > return ret; > } > > -static int ad8801_remove(struct spi_device *spi) > +static void ad8801_remove(struct spi_device *spi) > { > struct iio_dev *indio_dev = spi_get_drvdata(spi); > struct ad8801_state *state = iio_priv(indio_dev); > @@ -202,8 +202,6 @@ static int ad8801_remove(struct spi_device *spi) > if (state->vrefl_reg) > regulator_disable(state->vrefl_reg); > regulator_disable(state->vrefh_reg); > - > - return 0; > } > > static const struct spi_device_id ad8801_ids[] = { > diff --git a/drivers/iio/dac/ltc1660.c b/drivers/iio/dac/ltc1660.c > index f6ec9bf5815e..c76233c9bb72 100644 > --- a/drivers/iio/dac/ltc1660.c > +++ b/drivers/iio/dac/ltc1660.c > @@ -206,15 +206,13 @@ static int ltc1660_probe(struct spi_device *spi) > return ret; > } > > -static int ltc1660_remove(struct spi_device *spi) > +static void ltc1660_remove(struct spi_device *spi) > { > struct iio_dev *indio_dev = spi_get_drvdata(spi); > struct ltc1660_priv *priv = iio_priv(indio_dev); > > iio_device_unregister(indio_dev); > regulator_disable(priv->vref_reg); > - > - return 0; > } > > static const struct of_device_id ltc1660_dt_ids[] = { > diff --git a/drivers/iio/dac/ltc2632.c b/drivers/iio/dac/ltc2632.c > index 53e4b887d372..aed46c80757e 100644 > --- a/drivers/iio/dac/ltc2632.c > +++ b/drivers/iio/dac/ltc2632.c > @@ -372,7 +372,7 @@ static int ltc2632_probe(struct spi_device *spi) > return iio_device_register(indio_dev); > } > > -static int ltc2632_remove(struct spi_device *spi) > +static void ltc2632_remove(struct spi_device *spi) > { > struct iio_dev *indio_dev = spi_get_drvdata(spi); > struct ltc2632_state *st = iio_priv(indio_dev); > @@ -381,8 +381,6 @@ static int ltc2632_remove(struct spi_device *spi) > > if (st->vref_reg) > regulator_disable(st->vref_reg); > - > - return 0; > } > > static const struct spi_device_id ltc2632_id[] = { > diff --git a/drivers/iio/dac/mcp4922.c b/drivers/iio/dac/mcp4922.c > index 0ae414ee1716..cb9e60e71b91 100644 > --- a/drivers/iio/dac/mcp4922.c > +++ b/drivers/iio/dac/mcp4922.c > @@ -172,7 +172,7 @@ static int mcp4922_probe(struct spi_device *spi) > return ret; > } > > -static int mcp4922_remove(struct spi_device *spi) > +static void mcp4922_remove(struct spi_device *spi) > { > struct iio_dev *indio_dev = spi_get_drvdata(spi); > struct mcp4922_state *state; > @@ -180,8 +180,6 @@ static int mcp4922_remove(struct spi_device *spi) > iio_device_unregister(indio_dev); > state = iio_priv(indio_dev); > regulator_disable(state->vref_reg); > - > - return 0; > } > > static const struct spi_device_id mcp4922_id[] = { > diff --git a/drivers/iio/dac/ti-dac082s085.c b/drivers/iio/dac/ti-dac082s085.c > index 6beda2193683..4e1156e6deb2 100644 > --- a/drivers/iio/dac/ti-dac082s085.c > +++ b/drivers/iio/dac/ti-dac082s085.c > @@ -313,7 +313,7 @@ static int ti_dac_probe(struct spi_device *spi) > return ret; > } > > -static int ti_dac_remove(struct spi_device *spi) > +static void ti_dac_remove(struct spi_device *spi) > { > struct iio_dev *indio_dev = spi_get_drvdata(spi); > struct ti_dac_chip *ti_dac = iio_priv(indio_dev); > @@ -321,8 +321,6 @@ static int ti_dac_remove(struct spi_device *spi) > iio_device_unregister(indio_dev); > mutex_destroy(&ti_dac->lock); > regulator_disable(ti_dac->vref); > - > - return 0; > } > > static const struct of_device_id ti_dac_of_id[] = { > diff --git a/drivers/iio/dac/ti-dac7311.c b/drivers/iio/dac/ti-dac7311.c > index 99f275829ec2..e10d17e60ed3 100644 > --- a/drivers/iio/dac/ti-dac7311.c > +++ b/drivers/iio/dac/ti-dac7311.c > @@ -292,7 +292,7 @@ static int ti_dac_probe(struct spi_device *spi) > return ret; > } > > -static int ti_dac_remove(struct spi_device *spi) > +static void ti_dac_remove(struct spi_device *spi) > { > struct iio_dev *indio_dev = spi_get_drvdata(spi); > struct ti_dac_chip *ti_dac = iio_priv(indio_dev); > @@ -300,7 +300,6 @@ static int ti_dac_remove(struct spi_device *spi) > iio_device_unregister(indio_dev); > mutex_destroy(&ti_dac->lock); > regulator_disable(ti_dac->vref); > - return 0; > } > > static const struct of_device_id ti_dac_of_id[] = { > diff --git a/drivers/iio/frequency/adf4350.c b/drivers/iio/frequency/adf4350.c > index 3d9eba716b69..f3521330f6fb 100644 > --- a/drivers/iio/frequency/adf4350.c > +++ b/drivers/iio/frequency/adf4350.c > @@ -589,7 +589,7 @@ static int adf4350_probe(struct spi_device *spi) > return ret; > } > > -static int adf4350_remove(struct spi_device *spi) > +static void adf4350_remove(struct spi_device *spi) > { > struct iio_dev *indio_dev = spi_get_drvdata(spi); > struct adf4350_state *st = iio_priv(indio_dev); > @@ -604,8 +604,6 @@ static int adf4350_remove(struct spi_device *spi) > > if (!IS_ERR(reg)) > regulator_disable(reg); > - > - return 0; > } > > static const struct of_device_id adf4350_of_match[] = { > diff --git a/drivers/iio/gyro/bmg160_spi.c b/drivers/iio/gyro/bmg160_spi.c > index 745962e1e423..fc2e453527b9 100644 > --- a/drivers/iio/gyro/bmg160_spi.c > +++ b/drivers/iio/gyro/bmg160_spi.c > @@ -27,11 +27,9 @@ static int bmg160_spi_probe(struct spi_device *spi) > return bmg160_core_probe(&spi->dev, regmap, spi->irq, id->name); > } > > -static int bmg160_spi_remove(struct spi_device *spi) > +static void bmg160_spi_remove(struct spi_device *spi) > { > bmg160_core_remove(&spi->dev); > - > - return 0; > } > > static const struct spi_device_id bmg160_spi_id[] = { > diff --git a/drivers/iio/gyro/fxas21002c_spi.c b/drivers/iio/gyro/fxas21002c_spi.c > index 77ceebef4e34..c3ac169facf9 100644 > --- a/drivers/iio/gyro/fxas21002c_spi.c > +++ b/drivers/iio/gyro/fxas21002c_spi.c > @@ -34,11 +34,9 @@ static int fxas21002c_spi_probe(struct spi_device *spi) > return fxas21002c_core_probe(&spi->dev, regmap, spi->irq, id->name); > } > > -static int fxas21002c_spi_remove(struct spi_device *spi) > +static void fxas21002c_spi_remove(struct spi_device *spi) > { > fxas21002c_core_remove(&spi->dev); > - > - return 0; > } > > static const struct spi_device_id fxas21002c_spi_id[] = { > diff --git a/drivers/iio/health/afe4403.c b/drivers/iio/health/afe4403.c > index 273f16dcaff8..856ec901b091 100644 > --- a/drivers/iio/health/afe4403.c > +++ b/drivers/iio/health/afe4403.c > @@ -570,7 +570,7 @@ static int afe4403_probe(struct spi_device *spi) > return ret; > } > > -static int afe4403_remove(struct spi_device *spi) > +static void afe4403_remove(struct spi_device *spi) > { > struct iio_dev *indio_dev = spi_get_drvdata(spi); > struct afe4403_data *afe = iio_priv(indio_dev); > @@ -586,8 +586,6 @@ static int afe4403_remove(struct spi_device *spi) > ret = regulator_disable(afe->regulator); > if (ret) > dev_warn(afe->dev, "Unable to disable regulator\n"); > - > - return 0; > } > > static const struct spi_device_id afe4403_ids[] = { > diff --git a/drivers/iio/magnetometer/bmc150_magn_spi.c b/drivers/iio/magnetometer/bmc150_magn_spi.c > index c6ed3ea8460a..4c570412d65c 100644 > --- a/drivers/iio/magnetometer/bmc150_magn_spi.c > +++ b/drivers/iio/magnetometer/bmc150_magn_spi.c > @@ -29,11 +29,9 @@ static int bmc150_magn_spi_probe(struct spi_device *spi) > return bmc150_magn_probe(&spi->dev, regmap, spi->irq, id->name); > } > > -static int bmc150_magn_spi_remove(struct spi_device *spi) > +static void bmc150_magn_spi_remove(struct spi_device *spi) > { > bmc150_magn_remove(&spi->dev); > - > - return 0; > } > > static const struct spi_device_id bmc150_magn_spi_id[] = { > diff --git a/drivers/iio/magnetometer/hmc5843_spi.c b/drivers/iio/magnetometer/hmc5843_spi.c > index 89cf59a62c28..a99dd9b33e95 100644 > --- a/drivers/iio/magnetometer/hmc5843_spi.c > +++ b/drivers/iio/magnetometer/hmc5843_spi.c > @@ -74,11 +74,9 @@ static int hmc5843_spi_probe(struct spi_device *spi) > id->driver_data, id->name); > } > > -static int hmc5843_spi_remove(struct spi_device *spi) > +static void hmc5843_spi_remove(struct spi_device *spi) > { > hmc5843_common_remove(&spi->dev); > - > - return 0; > } > > static const struct spi_device_id hmc5843_id[] = { > diff --git a/drivers/iio/potentiometer/max5487.c b/drivers/iio/potentiometer/max5487.c > index 007c2bd324cb..42723c996c9f 100644 > --- a/drivers/iio/potentiometer/max5487.c > +++ b/drivers/iio/potentiometer/max5487.c > @@ -112,7 +112,7 @@ static int max5487_spi_probe(struct spi_device *spi) > return iio_device_register(indio_dev); > } > > -static int max5487_spi_remove(struct spi_device *spi) > +static void max5487_spi_remove(struct spi_device *spi) > { > struct iio_dev *indio_dev = spi_get_drvdata(spi); > int ret; > @@ -123,8 +123,6 @@ static int max5487_spi_remove(struct spi_device *spi) > ret = max5487_write_cmd(spi, MAX5487_COPY_AB_TO_NV); > if (ret) > dev_warn(&spi->dev, "Failed to save wiper regs to NV regs\n"); > - > - return 0; > } > > static const struct spi_device_id max5487_id[] = { > diff --git a/drivers/iio/pressure/ms5611_spi.c b/drivers/iio/pressure/ms5611_spi.c > index 9fa2dcd71760..7ccd960ced5d 100644 > --- a/drivers/iio/pressure/ms5611_spi.c > +++ b/drivers/iio/pressure/ms5611_spi.c > @@ -107,11 +107,9 @@ static int ms5611_spi_probe(struct spi_device *spi) > spi_get_device_id(spi)->driver_data); > } > > -static int ms5611_spi_remove(struct spi_device *spi) > +static void ms5611_spi_remove(struct spi_device *spi) > { > ms5611_remove(spi_get_drvdata(spi)); > - > - return 0; > } > > static const struct of_device_id ms5611_spi_matches[] = { > diff --git a/drivers/iio/pressure/zpa2326_spi.c b/drivers/iio/pressure/zpa2326_spi.c > index 85201a4bae44..ee8ed77536ca 100644 > --- a/drivers/iio/pressure/zpa2326_spi.c > +++ b/drivers/iio/pressure/zpa2326_spi.c > @@ -57,11 +57,9 @@ static int zpa2326_probe_spi(struct spi_device *spi) > spi->irq, ZPA2326_DEVICE_ID, regmap); > } > > -static int zpa2326_remove_spi(struct spi_device *spi) > +static void zpa2326_remove_spi(struct spi_device *spi) > { > zpa2326_remove(&spi->dev); > - > - return 0; > } > > static const struct spi_device_id zpa2326_spi_ids[] = { > diff --git a/drivers/input/keyboard/applespi.c b/drivers/input/keyboard/applespi.c > index eda1b23002b5..d1f5354d5ea2 100644 > --- a/drivers/input/keyboard/applespi.c > +++ b/drivers/input/keyboard/applespi.c > @@ -1858,7 +1858,7 @@ static void applespi_drain_reads(struct applespi_data *applespi) > spin_unlock_irqrestore(&applespi->cmd_msg_lock, flags); > } > > -static int applespi_remove(struct spi_device *spi) > +static void applespi_remove(struct spi_device *spi) > { > struct applespi_data *applespi = spi_get_drvdata(spi); > > @@ -1871,8 +1871,6 @@ static int applespi_remove(struct spi_device *spi) > applespi_drain_reads(applespi); > > debugfs_remove_recursive(applespi->debugfs_root); > - > - return 0; > } > > static void applespi_shutdown(struct spi_device *spi) > diff --git a/drivers/input/misc/adxl34x-spi.c b/drivers/input/misc/adxl34x-spi.c > index 6e51c9bc619f..91e44d4c66f7 100644 > --- a/drivers/input/misc/adxl34x-spi.c > +++ b/drivers/input/misc/adxl34x-spi.c > @@ -87,13 +87,11 @@ static int adxl34x_spi_probe(struct spi_device *spi) > return 0; > } > > -static int adxl34x_spi_remove(struct spi_device *spi) > +static void adxl34x_spi_remove(struct spi_device *spi) > { > struct adxl34x *ac = spi_get_drvdata(spi); > > adxl34x_remove(ac); > - > - return 0; > } > > static int __maybe_unused adxl34x_spi_suspend(struct device *dev) > diff --git a/drivers/input/touchscreen/ads7846.c b/drivers/input/touchscreen/ads7846.c > index a25a77dd9a32..bed68a68f330 100644 > --- a/drivers/input/touchscreen/ads7846.c > +++ b/drivers/input/touchscreen/ads7846.c > @@ -1411,13 +1411,11 @@ static int ads7846_probe(struct spi_device *spi) > return 0; > } > > -static int ads7846_remove(struct spi_device *spi) > +static void ads7846_remove(struct spi_device *spi) > { > struct ads7846 *ts = spi_get_drvdata(spi); > > ads7846_stop(ts); > - > - return 0; > } > > static struct spi_driver ads7846_driver = { > diff --git a/drivers/input/touchscreen/cyttsp4_spi.c b/drivers/input/touchscreen/cyttsp4_spi.c > index 2aec41eb76b7..5d7db84f2749 100644 > --- a/drivers/input/touchscreen/cyttsp4_spi.c > +++ b/drivers/input/touchscreen/cyttsp4_spi.c > @@ -164,12 +164,10 @@ static int cyttsp4_spi_probe(struct spi_device *spi) > return PTR_ERR_OR_ZERO(ts); > } > > -static int cyttsp4_spi_remove(struct spi_device *spi) > +static void cyttsp4_spi_remove(struct spi_device *spi) > { > struct cyttsp4 *ts = spi_get_drvdata(spi); > cyttsp4_remove(ts); > - > - return 0; > } > > static struct spi_driver cyttsp4_spi_driver = { > diff --git a/drivers/input/touchscreen/tsc2005.c b/drivers/input/touchscreen/tsc2005.c > index a2f55920b9b2..555dfe98b3c4 100644 > --- a/drivers/input/touchscreen/tsc2005.c > +++ b/drivers/input/touchscreen/tsc2005.c > @@ -64,11 +64,9 @@ static int tsc2005_probe(struct spi_device *spi) > tsc2005_cmd); > } > > -static int tsc2005_remove(struct spi_device *spi) > +static void tsc2005_remove(struct spi_device *spi) > { > tsc200x_remove(&spi->dev); > - > - return 0; > } > > #ifdef CONFIG_OF > diff --git a/drivers/leds/leds-cr0014114.c b/drivers/leds/leds-cr0014114.c > index d03cfd3c0bfb..c87686bd7c18 100644 > --- a/drivers/leds/leds-cr0014114.c > +++ b/drivers/leds/leds-cr0014114.c > @@ -266,14 +266,12 @@ static int cr0014114_probe(struct spi_device *spi) > return 0; > } > > -static int cr0014114_remove(struct spi_device *spi) > +static void cr0014114_remove(struct spi_device *spi) > { > struct cr0014114 *priv = spi_get_drvdata(spi); > > cancel_delayed_work_sync(&priv->work); > mutex_destroy(&priv->lock); > - > - return 0; > } > > static const struct of_device_id cr0014114_dt_ids[] = { > diff --git a/drivers/leds/leds-dac124s085.c b/drivers/leds/leds-dac124s085.c > index 20dc9b9d7dea..cf5fb1195f87 100644 > --- a/drivers/leds/leds-dac124s085.c > +++ b/drivers/leds/leds-dac124s085.c > @@ -85,15 +85,13 @@ static int dac124s085_probe(struct spi_device *spi) > return ret; > } > > -static int dac124s085_remove(struct spi_device *spi) > +static void dac124s085_remove(struct spi_device *spi) > { > struct dac124s085 *dac = spi_get_drvdata(spi); > int i; > > for (i = 0; i < ARRAY_SIZE(dac->leds); i++) > led_classdev_unregister(&dac->leds[i].ldev); > - > - return 0; > } > > static struct spi_driver dac124s085_driver = { > diff --git a/drivers/leds/leds-el15203000.c b/drivers/leds/leds-el15203000.c > index f9eb59a25570..7e7b617bcd56 100644 > --- a/drivers/leds/leds-el15203000.c > +++ b/drivers/leds/leds-el15203000.c > @@ -315,13 +315,11 @@ static int el15203000_probe(struct spi_device *spi) > return el15203000_probe_dt(priv); > } > > -static int el15203000_remove(struct spi_device *spi) > +static void el15203000_remove(struct spi_device *spi) > { > struct el15203000 *priv = spi_get_drvdata(spi); > > mutex_destroy(&priv->lock); > - > - return 0; > } > > static const struct of_device_id el15203000_dt_ids[] = { > diff --git a/drivers/leds/leds-spi-byte.c b/drivers/leds/leds-spi-byte.c > index f1964c96fb15..2bc5c99daf51 100644 > --- a/drivers/leds/leds-spi-byte.c > +++ b/drivers/leds/leds-spi-byte.c > @@ -130,13 +130,11 @@ static int spi_byte_probe(struct spi_device *spi) > return 0; > } > > -static int spi_byte_remove(struct spi_device *spi) > +static void spi_byte_remove(struct spi_device *spi) > { > struct spi_byte_led *led = spi_get_drvdata(spi); > > mutex_destroy(&led->mutex); > - > - return 0; > } > > static struct spi_driver spi_byte_driver = { > diff --git a/drivers/media/spi/cxd2880-spi.c b/drivers/media/spi/cxd2880-spi.c > index 6f2a66bc87fb..6be4e5528879 100644 > --- a/drivers/media/spi/cxd2880-spi.c > +++ b/drivers/media/spi/cxd2880-spi.c > @@ -625,7 +625,7 @@ cxd2880_spi_probe(struct spi_device *spi) > return ret; > } > > -static int > +static void > cxd2880_spi_remove(struct spi_device *spi) > { > struct cxd2880_dvb_spi *dvb_spi = spi_get_drvdata(spi); > @@ -643,8 +643,6 @@ cxd2880_spi_remove(struct spi_device *spi) > > kfree(dvb_spi); > pr_info("cxd2880_spi remove ok.\n"); > - > - return 0; > } > > static const struct spi_device_id cxd2880_spi_id[] = { > diff --git a/drivers/media/spi/gs1662.c b/drivers/media/spi/gs1662.c > index f86ef1ca1288..75c21a93e6d0 100644 > --- a/drivers/media/spi/gs1662.c > +++ b/drivers/media/spi/gs1662.c > @@ -458,13 +458,11 @@ static int gs_probe(struct spi_device *spi) > return ret; > } > > -static int gs_remove(struct spi_device *spi) > +static void gs_remove(struct spi_device *spi) > { > struct v4l2_subdev *sd = spi_get_drvdata(spi); > > v4l2_device_unregister_subdev(sd); > - > - return 0; > } > > static struct spi_driver gs_driver = { > diff --git a/drivers/media/tuners/msi001.c b/drivers/media/tuners/msi001.c > index 44247049a319..ad6c72c1ed04 100644 > --- a/drivers/media/tuners/msi001.c > +++ b/drivers/media/tuners/msi001.c > @@ -472,7 +472,7 @@ static int msi001_probe(struct spi_device *spi) > return ret; > } > > -static int msi001_remove(struct spi_device *spi) > +static void msi001_remove(struct spi_device *spi) > { > struct v4l2_subdev *sd = spi_get_drvdata(spi); > struct msi001_dev *dev = sd_to_msi001_dev(sd); > @@ -486,7 +486,6 @@ static int msi001_remove(struct spi_device *spi) > v4l2_device_unregister_subdev(&dev->sd); > v4l2_ctrl_handler_free(&dev->hdl); > kfree(dev); > - return 0; > } > > static const struct spi_device_id msi001_id_table[] = { > diff --git a/drivers/mfd/arizona-spi.c b/drivers/mfd/arizona-spi.c > index 9fe06dda3782..03620c8efe34 100644 > --- a/drivers/mfd/arizona-spi.c > +++ b/drivers/mfd/arizona-spi.c > @@ -206,13 +206,11 @@ static int arizona_spi_probe(struct spi_device *spi) > return arizona_dev_init(arizona); > } > > -static int arizona_spi_remove(struct spi_device *spi) > +static void arizona_spi_remove(struct spi_device *spi) > { > struct arizona *arizona = spi_get_drvdata(spi); > > arizona_dev_exit(arizona); > - > - return 0; > } > > static const struct spi_device_id arizona_spi_ids[] = { > diff --git a/drivers/mfd/da9052-spi.c b/drivers/mfd/da9052-spi.c > index 5faf3766a5e2..b79a57b45c1e 100644 > --- a/drivers/mfd/da9052-spi.c > +++ b/drivers/mfd/da9052-spi.c > @@ -55,12 +55,11 @@ static int da9052_spi_probe(struct spi_device *spi) > return da9052_device_init(da9052, id->driver_data); > } > > -static int da9052_spi_remove(struct spi_device *spi) > +static void da9052_spi_remove(struct spi_device *spi) > { > struct da9052 *da9052 = spi_get_drvdata(spi); > > da9052_device_exit(da9052); > - return 0; > } > > static const struct spi_device_id da9052_spi_id[] = { > diff --git a/drivers/mfd/ezx-pcap.c b/drivers/mfd/ezx-pcap.c > index 70fa18b04ad2..2280f756f422 100644 > --- a/drivers/mfd/ezx-pcap.c > +++ b/drivers/mfd/ezx-pcap.c > @@ -392,7 +392,7 @@ static int pcap_add_subdev(struct pcap_chip *pcap, > return ret; > } > > -static int ezx_pcap_remove(struct spi_device *spi) > +static void ezx_pcap_remove(struct spi_device *spi) > { > struct pcap_chip *pcap = spi_get_drvdata(spi); > unsigned long flags; > @@ -412,8 +412,6 @@ static int ezx_pcap_remove(struct spi_device *spi) > irq_set_chip_and_handler(i, NULL, NULL); > > destroy_workqueue(pcap->workqueue); > - > - return 0; > } > > static int ezx_pcap_probe(struct spi_device *spi) > diff --git a/drivers/mfd/madera-spi.c b/drivers/mfd/madera-spi.c > index e860f5ff0933..da84eb50e53a 100644 > --- a/drivers/mfd/madera-spi.c > +++ b/drivers/mfd/madera-spi.c > @@ -112,13 +112,11 @@ static int madera_spi_probe(struct spi_device *spi) > return madera_dev_init(madera); > } > > -static int madera_spi_remove(struct spi_device *spi) > +static void madera_spi_remove(struct spi_device *spi) > { > struct madera *madera = spi_get_drvdata(spi); > > madera_dev_exit(madera); > - > - return 0; > } > > static const struct spi_device_id madera_spi_ids[] = { > diff --git a/drivers/mfd/mc13xxx-spi.c b/drivers/mfd/mc13xxx-spi.c > index 4d8913d647e6..f803527e5819 100644 > --- a/drivers/mfd/mc13xxx-spi.c > +++ b/drivers/mfd/mc13xxx-spi.c > @@ -166,10 +166,9 @@ static int mc13xxx_spi_probe(struct spi_device *spi) > return mc13xxx_common_init(&spi->dev); > } > > -static int mc13xxx_spi_remove(struct spi_device *spi) > +static void mc13xxx_spi_remove(struct spi_device *spi) > { > mc13xxx_common_exit(&spi->dev); > - return 0; > } > > static struct spi_driver mc13xxx_spi_driver = { > diff --git a/drivers/mfd/rsmu_spi.c b/drivers/mfd/rsmu_spi.c > index fec2b4ec477c..d2f3d8f1e05a 100644 > --- a/drivers/mfd/rsmu_spi.c > +++ b/drivers/mfd/rsmu_spi.c > @@ -220,13 +220,11 @@ static int rsmu_spi_probe(struct spi_device *client) > return rsmu_core_init(rsmu); > } > > -static int rsmu_spi_remove(struct spi_device *client) > +static void rsmu_spi_remove(struct spi_device *client) > { > struct rsmu_ddata *rsmu = spi_get_drvdata(client); > > rsmu_core_exit(rsmu); > - > - return 0; > } > > static const struct spi_device_id rsmu_spi_id[] = { > diff --git a/drivers/mfd/stmpe-spi.c b/drivers/mfd/stmpe-spi.c > index 6c5915016be5..ad8055a0e286 100644 > --- a/drivers/mfd/stmpe-spi.c > +++ b/drivers/mfd/stmpe-spi.c > @@ -102,13 +102,11 @@ stmpe_spi_probe(struct spi_device *spi) > return stmpe_probe(&spi_ci, id->driver_data); > } > > -static int stmpe_spi_remove(struct spi_device *spi) > +static void stmpe_spi_remove(struct spi_device *spi) > { > struct stmpe *stmpe = spi_get_drvdata(spi); > > stmpe_remove(stmpe); > - > - return 0; > } > > static const struct of_device_id stmpe_spi_of_match[] = { > diff --git a/drivers/mfd/tps65912-spi.c b/drivers/mfd/tps65912-spi.c > index d701926aa46e..bba38fbc781d 100644 > --- a/drivers/mfd/tps65912-spi.c > +++ b/drivers/mfd/tps65912-spi.c > @@ -50,13 +50,11 @@ static int tps65912_spi_probe(struct spi_device *spi) > return tps65912_device_init(tps); > } > > -static int tps65912_spi_remove(struct spi_device *spi) > +static void tps65912_spi_remove(struct spi_device *spi) > { > struct tps65912 *tps = spi_get_drvdata(spi); > > tps65912_device_exit(tps); > - > - return 0; > } > > static const struct spi_device_id tps65912_spi_id_table[] = { > diff --git a/drivers/misc/ad525x_dpot-spi.c b/drivers/misc/ad525x_dpot-spi.c > index a9e75d80ad36..263055bda48b 100644 > --- a/drivers/misc/ad525x_dpot-spi.c > +++ b/drivers/misc/ad525x_dpot-spi.c > @@ -90,10 +90,9 @@ static int ad_dpot_spi_probe(struct spi_device *spi) > spi_get_device_id(spi)->name); > } > > -static int ad_dpot_spi_remove(struct spi_device *spi) > +static void ad_dpot_spi_remove(struct spi_device *spi) > { > ad_dpot_remove(&spi->dev); > - return 0; > } > > static const struct spi_device_id ad_dpot_spi_id[] = { > diff --git a/drivers/misc/eeprom/eeprom_93xx46.c b/drivers/misc/eeprom/eeprom_93xx46.c > index 1f15399e5cb4..b630625b3024 100644 > --- a/drivers/misc/eeprom/eeprom_93xx46.c > +++ b/drivers/misc/eeprom/eeprom_93xx46.c > @@ -555,14 +555,12 @@ static int eeprom_93xx46_probe(struct spi_device *spi) > return 0; > } > > -static int eeprom_93xx46_remove(struct spi_device *spi) > +static void eeprom_93xx46_remove(struct spi_device *spi) > { > struct eeprom_93xx46_dev *edev = spi_get_drvdata(spi); > > if (!(edev->pdata->flags & EE_READONLY)) > device_remove_file(&spi->dev, &dev_attr_erase); > - > - return 0; > } > > static struct spi_driver eeprom_93xx46_driver = { > diff --git a/drivers/misc/lattice-ecp3-config.c b/drivers/misc/lattice-ecp3-config.c > index 98828030b5a4..bac4df2e5231 100644 > --- a/drivers/misc/lattice-ecp3-config.c > +++ b/drivers/misc/lattice-ecp3-config.c > @@ -211,13 +211,11 @@ static int lattice_ecp3_probe(struct spi_device *spi) > return 0; > } > > -static int lattice_ecp3_remove(struct spi_device *spi) > +static void lattice_ecp3_remove(struct spi_device *spi) > { > struct fpga_data *data = spi_get_drvdata(spi); > > wait_for_completion(&data->fw_loaded); > - > - return 0; > } > > static const struct spi_device_id lattice_ecp3_id[] = { > diff --git a/drivers/misc/lis3lv02d/lis3lv02d_spi.c b/drivers/misc/lis3lv02d/lis3lv02d_spi.c > index 9e40dfb60742..203a108b8883 100644 > --- a/drivers/misc/lis3lv02d/lis3lv02d_spi.c > +++ b/drivers/misc/lis3lv02d/lis3lv02d_spi.c > @@ -96,15 +96,13 @@ static int lis302dl_spi_probe(struct spi_device *spi) > return lis3lv02d_init_device(&lis3_dev); > } > > -static int lis302dl_spi_remove(struct spi_device *spi) > +static void lis302dl_spi_remove(struct spi_device *spi) > { > struct lis3lv02d *lis3 = spi_get_drvdata(spi); > lis3lv02d_joystick_disable(lis3); > lis3lv02d_poweroff(lis3); > > lis3lv02d_remove_fs(&lis3_dev); > - > - return 0; > } > > #ifdef CONFIG_PM_SLEEP > diff --git a/drivers/mmc/host/mmc_spi.c b/drivers/mmc/host/mmc_spi.c > index a576181e9db0..106dd204b1a7 100644 > --- a/drivers/mmc/host/mmc_spi.c > +++ b/drivers/mmc/host/mmc_spi.c > @@ -1489,7 +1489,7 @@ static int mmc_spi_probe(struct spi_device *spi) > } > > > -static int mmc_spi_remove(struct spi_device *spi) > +static void mmc_spi_remove(struct spi_device *spi) > { > struct mmc_host *mmc = dev_get_drvdata(&spi->dev); > struct mmc_spi_host *host = mmc_priv(mmc); > @@ -1507,7 +1507,6 @@ static int mmc_spi_remove(struct spi_device *spi) > spi->max_speed_hz = mmc->f_max; > mmc_spi_put_pdata(spi); > mmc_free_host(mmc); > - return 0; > } > > static const struct spi_device_id mmc_spi_dev_ids[] = { > diff --git a/drivers/mtd/devices/mchp23k256.c b/drivers/mtd/devices/mchp23k256.c > index a8b31bddf14b..008df9d8898d 100644 > --- a/drivers/mtd/devices/mchp23k256.c > +++ b/drivers/mtd/devices/mchp23k256.c > @@ -209,13 +209,11 @@ static int mchp23k256_probe(struct spi_device *spi) > return 0; > } > > -static int mchp23k256_remove(struct spi_device *spi) > +static void mchp23k256_remove(struct spi_device *spi) > { > struct mchp23k256_flash *flash = spi_get_drvdata(spi); > > WARN_ON(mtd_device_unregister(&flash->mtd)); > - > - return 0; > } > > static const struct of_device_id mchp23k256_of_table[] = { > diff --git a/drivers/mtd/devices/mchp48l640.c b/drivers/mtd/devices/mchp48l640.c > index 231a10790196..a3fd426df74b 100644 > --- a/drivers/mtd/devices/mchp48l640.c > +++ b/drivers/mtd/devices/mchp48l640.c > @@ -341,13 +341,11 @@ static int mchp48l640_probe(struct spi_device *spi) > return 0; > } > > -static int mchp48l640_remove(struct spi_device *spi) > +static void mchp48l640_remove(struct spi_device *spi) > { > struct mchp48l640_flash *flash = spi_get_drvdata(spi); > > WARN_ON(mtd_device_unregister(&flash->mtd)); > - > - return 0; > } > > static const struct of_device_id mchp48l640_of_table[] = { > diff --git a/drivers/mtd/devices/mtd_dataflash.c b/drivers/mtd/devices/mtd_dataflash.c > index 734878abaa23..134e27328597 100644 > --- a/drivers/mtd/devices/mtd_dataflash.c > +++ b/drivers/mtd/devices/mtd_dataflash.c > @@ -916,7 +916,7 @@ static int dataflash_probe(struct spi_device *spi) > return status; > } > > -static int dataflash_remove(struct spi_device *spi) > +static void dataflash_remove(struct spi_device *spi) > { > struct dataflash *flash = spi_get_drvdata(spi); > > @@ -925,8 +925,6 @@ static int dataflash_remove(struct spi_device *spi) > WARN_ON(mtd_device_unregister(&flash->mtd)); > > kfree(flash); > - > - return 0; > } > > static struct spi_driver dataflash_driver = { > diff --git a/drivers/mtd/devices/sst25l.c b/drivers/mtd/devices/sst25l.c > index 7f124c1bfa40..8813994ce9f4 100644 > --- a/drivers/mtd/devices/sst25l.c > +++ b/drivers/mtd/devices/sst25l.c > @@ -398,13 +398,11 @@ static int sst25l_probe(struct spi_device *spi) > return 0; > } > > -static int sst25l_remove(struct spi_device *spi) > +static void sst25l_remove(struct spi_device *spi) > { > struct sst25l_flash *flash = spi_get_drvdata(spi); > > WARN_ON(mtd_device_unregister(&flash->mtd)); > - > - return 0; > } > > static struct spi_driver sst25l_driver = { > diff --git a/drivers/net/can/m_can/tcan4x5x-core.c b/drivers/net/can/m_can/tcan4x5x-core.c > index 04687b15b250..41645a24384c 100644 > --- a/drivers/net/can/m_can/tcan4x5x-core.c > +++ b/drivers/net/can/m_can/tcan4x5x-core.c > @@ -388,7 +388,7 @@ static int tcan4x5x_can_probe(struct spi_device *spi) > return ret; > } > > -static int tcan4x5x_can_remove(struct spi_device *spi) > +static void tcan4x5x_can_remove(struct spi_device *spi) > { > struct tcan4x5x_priv *priv = spi_get_drvdata(spi); > > @@ -397,8 +397,6 @@ static int tcan4x5x_can_remove(struct spi_device *spi) > tcan4x5x_power_enable(priv->power, 0); > > m_can_class_free_dev(priv->cdev.net); > - > - return 0; > } > > static const struct of_device_id tcan4x5x_of_match[] = { > diff --git a/drivers/net/can/spi/hi311x.c b/drivers/net/can/spi/hi311x.c > index cfcc14fe3e42..664b8f14d7b0 100644 > --- a/drivers/net/can/spi/hi311x.c > +++ b/drivers/net/can/spi/hi311x.c > @@ -948,7 +948,7 @@ static int hi3110_can_probe(struct spi_device *spi) > return dev_err_probe(dev, ret, "Probe failed\n"); > } > > -static int hi3110_can_remove(struct spi_device *spi) > +static void hi3110_can_remove(struct spi_device *spi) > { > struct hi3110_priv *priv = spi_get_drvdata(spi); > struct net_device *net = priv->net; > @@ -960,8 +960,6 @@ static int hi3110_can_remove(struct spi_device *spi) > clk_disable_unprepare(priv->clk); > > free_candev(net); > - > - return 0; > } > > static int __maybe_unused hi3110_can_suspend(struct device *dev) > diff --git a/drivers/net/can/spi/mcp251x.c b/drivers/net/can/spi/mcp251x.c > index 025e07cb7439..d23edaf22420 100644 > --- a/drivers/net/can/spi/mcp251x.c > +++ b/drivers/net/can/spi/mcp251x.c > @@ -1427,7 +1427,7 @@ static int mcp251x_can_probe(struct spi_device *spi) > return ret; > } > > -static int mcp251x_can_remove(struct spi_device *spi) > +static void mcp251x_can_remove(struct spi_device *spi) > { > struct mcp251x_priv *priv = spi_get_drvdata(spi); > struct net_device *net = priv->net; > @@ -1442,8 +1442,6 @@ static int mcp251x_can_remove(struct spi_device *spi) > clk_disable_unprepare(priv->clk); > > free_candev(net); > - > - return 0; > } > > static int __maybe_unused mcp251x_can_suspend(struct device *dev) > diff --git a/drivers/net/can/spi/mcp251xfd/mcp251xfd-core.c b/drivers/net/can/spi/mcp251xfd/mcp251xfd-core.c > index b5986df6eca0..65c9b31666a6 100644 > --- a/drivers/net/can/spi/mcp251xfd/mcp251xfd-core.c > +++ b/drivers/net/can/spi/mcp251xfd/mcp251xfd-core.c > @@ -1966,7 +1966,7 @@ static int mcp251xfd_probe(struct spi_device *spi) > return err; > } > > -static int mcp251xfd_remove(struct spi_device *spi) > +static void mcp251xfd_remove(struct spi_device *spi) > { > struct mcp251xfd_priv *priv = spi_get_drvdata(spi); > struct net_device *ndev = priv->ndev; > @@ -1975,8 +1975,6 @@ static int mcp251xfd_remove(struct spi_device *spi) > mcp251xfd_unregister(priv); > spi->max_speed_hz = priv->spi_max_speed_hz_orig; > free_candev(ndev); > - > - return 0; > } > > static int __maybe_unused mcp251xfd_runtime_suspend(struct device *device) > diff --git a/drivers/net/dsa/b53/b53_spi.c b/drivers/net/dsa/b53/b53_spi.c > index 2b88f03e5252..0e54b2a0c211 100644 > --- a/drivers/net/dsa/b53/b53_spi.c > +++ b/drivers/net/dsa/b53/b53_spi.c > @@ -314,7 +314,7 @@ static int b53_spi_probe(struct spi_device *spi) > return 0; > } > > -static int b53_spi_remove(struct spi_device *spi) > +static void b53_spi_remove(struct spi_device *spi) > { > struct b53_device *dev = spi_get_drvdata(spi); > > @@ -322,8 +322,6 @@ static int b53_spi_remove(struct spi_device *spi) > b53_switch_remove(dev); > > spi_set_drvdata(spi, NULL); > - > - return 0; > } > > static void b53_spi_shutdown(struct spi_device *spi) > diff --git a/drivers/net/dsa/microchip/ksz8795_spi.c b/drivers/net/dsa/microchip/ksz8795_spi.c > index 866767b70d65..673589dc88ab 100644 > --- a/drivers/net/dsa/microchip/ksz8795_spi.c > +++ b/drivers/net/dsa/microchip/ksz8795_spi.c > @@ -87,7 +87,7 @@ static int ksz8795_spi_probe(struct spi_device *spi) > return 0; > } > > -static int ksz8795_spi_remove(struct spi_device *spi) > +static void ksz8795_spi_remove(struct spi_device *spi) > { > struct ksz_device *dev = spi_get_drvdata(spi); > > @@ -95,8 +95,6 @@ static int ksz8795_spi_remove(struct spi_device *spi) > ksz_switch_remove(dev); > > spi_set_drvdata(spi, NULL); > - > - return 0; > } > > static void ksz8795_spi_shutdown(struct spi_device *spi) > diff --git a/drivers/net/dsa/microchip/ksz9477_spi.c b/drivers/net/dsa/microchip/ksz9477_spi.c > index e3cb0e6c9f6f..940bb9665f15 100644 > --- a/drivers/net/dsa/microchip/ksz9477_spi.c > +++ b/drivers/net/dsa/microchip/ksz9477_spi.c > @@ -65,7 +65,7 @@ static int ksz9477_spi_probe(struct spi_device *spi) > return 0; > } > > -static int ksz9477_spi_remove(struct spi_device *spi) > +static void ksz9477_spi_remove(struct spi_device *spi) > { > struct ksz_device *dev = spi_get_drvdata(spi); > > @@ -73,8 +73,6 @@ static int ksz9477_spi_remove(struct spi_device *spi) > ksz_switch_remove(dev); > > spi_set_drvdata(spi, NULL); > - > - return 0; > } > > static void ksz9477_spi_shutdown(struct spi_device *spi) > diff --git a/drivers/net/dsa/sja1105/sja1105_main.c b/drivers/net/dsa/sja1105/sja1105_main.c > index b513713be610..c2a47c6693b8 100644 > --- a/drivers/net/dsa/sja1105/sja1105_main.c > +++ b/drivers/net/dsa/sja1105/sja1105_main.c > @@ -3346,18 +3346,16 @@ static int sja1105_probe(struct spi_device *spi) > return dsa_register_switch(priv->ds); > } > > -static int sja1105_remove(struct spi_device *spi) > +static void sja1105_remove(struct spi_device *spi) > { > struct sja1105_private *priv = spi_get_drvdata(spi); > > if (!priv) > - return 0; > + return; > > dsa_unregister_switch(priv->ds); > > spi_set_drvdata(spi, NULL); > - > - return 0; > } > > static void sja1105_shutdown(struct spi_device *spi) > diff --git a/drivers/net/dsa/vitesse-vsc73xx-spi.c b/drivers/net/dsa/vitesse-vsc73xx-spi.c > index 645398901e05..3110895358d8 100644 > --- a/drivers/net/dsa/vitesse-vsc73xx-spi.c > +++ b/drivers/net/dsa/vitesse-vsc73xx-spi.c > @@ -159,18 +159,16 @@ static int vsc73xx_spi_probe(struct spi_device *spi) > return vsc73xx_probe(&vsc_spi->vsc); > } > > -static int vsc73xx_spi_remove(struct spi_device *spi) > +static void vsc73xx_spi_remove(struct spi_device *spi) > { > struct vsc73xx_spi *vsc_spi = spi_get_drvdata(spi); > > if (!vsc_spi) > - return 0; > + return; > > vsc73xx_remove(&vsc_spi->vsc); > > spi_set_drvdata(spi, NULL); > - > - return 0; > } > > static void vsc73xx_spi_shutdown(struct spi_device *spi) > diff --git a/drivers/net/ethernet/asix/ax88796c_main.c b/drivers/net/ethernet/asix/ax88796c_main.c > index e7a9f9863258..bf70481bb1ca 100644 > --- a/drivers/net/ethernet/asix/ax88796c_main.c > +++ b/drivers/net/ethernet/asix/ax88796c_main.c > @@ -1102,7 +1102,7 @@ static int ax88796c_probe(struct spi_device *spi) > return ret; > } > > -static int ax88796c_remove(struct spi_device *spi) > +static void ax88796c_remove(struct spi_device *spi) > { > struct ax88796c_device *ax_local = dev_get_drvdata(&spi->dev); > struct net_device *ndev = ax_local->ndev; > @@ -1112,8 +1112,6 @@ static int ax88796c_remove(struct spi_device *spi) > netif_info(ax_local, probe, ndev, "removing network device %s %s\n", > dev_driver_string(&spi->dev), > dev_name(&spi->dev)); > - > - return 0; > } > > #ifdef CONFIG_OF > diff --git a/drivers/net/ethernet/micrel/ks8851_spi.c b/drivers/net/ethernet/micrel/ks8851_spi.c > index 0303e727e99f..d167d93e4c12 100644 > --- a/drivers/net/ethernet/micrel/ks8851_spi.c > +++ b/drivers/net/ethernet/micrel/ks8851_spi.c > @@ -452,11 +452,9 @@ static int ks8851_probe_spi(struct spi_device *spi) > return ks8851_probe_common(netdev, dev, msg_enable); > } > > -static int ks8851_remove_spi(struct spi_device *spi) > +static void ks8851_remove_spi(struct spi_device *spi) > { > ks8851_remove_common(&spi->dev); > - > - return 0; > } > > static const struct of_device_id ks8851_match_table[] = { > diff --git a/drivers/net/ethernet/microchip/enc28j60.c b/drivers/net/ethernet/microchip/enc28j60.c > index 634ac7649c43..db5a3edb4c3c 100644 > --- a/drivers/net/ethernet/microchip/enc28j60.c > +++ b/drivers/net/ethernet/microchip/enc28j60.c > @@ -1612,15 +1612,13 @@ static int enc28j60_probe(struct spi_device *spi) > return ret; > } > > -static int enc28j60_remove(struct spi_device *spi) > +static void enc28j60_remove(struct spi_device *spi) > { > struct enc28j60_net *priv = spi_get_drvdata(spi); > > unregister_netdev(priv->netdev); > free_irq(spi->irq, priv); > free_netdev(priv->netdev); > - > - return 0; > } > > static const struct of_device_id enc28j60_dt_ids[] = { > diff --git a/drivers/net/ethernet/microchip/encx24j600.c b/drivers/net/ethernet/microchip/encx24j600.c > index b90efc80fb59..dc1840cb5b10 100644 > --- a/drivers/net/ethernet/microchip/encx24j600.c > +++ b/drivers/net/ethernet/microchip/encx24j600.c > @@ -1093,7 +1093,7 @@ static int encx24j600_spi_probe(struct spi_device *spi) > return ret; > } > > -static int encx24j600_spi_remove(struct spi_device *spi) > +static void encx24j600_spi_remove(struct spi_device *spi) > { > struct encx24j600_priv *priv = dev_get_drvdata(&spi->dev); > > @@ -1101,8 +1101,6 @@ static int encx24j600_spi_remove(struct spi_device *spi) > kthread_stop(priv->kworker_task); > > free_netdev(priv->ndev); > - > - return 0; > } > > static const struct spi_device_id encx24j600_spi_id_table[] = { > diff --git a/drivers/net/ethernet/qualcomm/qca_spi.c b/drivers/net/ethernet/qualcomm/qca_spi.c > index 955cce644392..3c5494afd3c0 100644 > --- a/drivers/net/ethernet/qualcomm/qca_spi.c > +++ b/drivers/net/ethernet/qualcomm/qca_spi.c > @@ -1001,7 +1001,7 @@ qca_spi_probe(struct spi_device *spi) > return 0; > } > > -static int > +static void > qca_spi_remove(struct spi_device *spi) > { > struct net_device *qcaspi_devs = spi_get_drvdata(spi); > @@ -1011,8 +1011,6 @@ qca_spi_remove(struct spi_device *spi) > > unregister_netdev(qcaspi_devs); > free_netdev(qcaspi_devs); > - > - return 0; > } > > static const struct spi_device_id qca_spi_id[] = { > diff --git a/drivers/net/ethernet/vertexcom/mse102x.c b/drivers/net/ethernet/vertexcom/mse102x.c > index 89a31783fbb4..25739b182ac7 100644 > --- a/drivers/net/ethernet/vertexcom/mse102x.c > +++ b/drivers/net/ethernet/vertexcom/mse102x.c > @@ -731,7 +731,7 @@ static int mse102x_probe_spi(struct spi_device *spi) > return 0; > } > > -static int mse102x_remove_spi(struct spi_device *spi) > +static void mse102x_remove_spi(struct spi_device *spi) > { > struct mse102x_net *mse = dev_get_drvdata(&spi->dev); > struct mse102x_net_spi *mses = to_mse102x_spi(mse); > @@ -741,8 +741,6 @@ static int mse102x_remove_spi(struct spi_device *spi) > > mse102x_remove_device_debugfs(mses); > unregister_netdev(mse->ndev); > - > - return 0; > } > > static const struct of_device_id mse102x_match_table[] = { > diff --git a/drivers/net/ethernet/wiznet/w5100-spi.c b/drivers/net/ethernet/wiznet/w5100-spi.c > index 7779a36da3c8..7c52796273a4 100644 > --- a/drivers/net/ethernet/wiznet/w5100-spi.c > +++ b/drivers/net/ethernet/wiznet/w5100-spi.c > @@ -461,11 +461,9 @@ static int w5100_spi_probe(struct spi_device *spi) > return w5100_probe(&spi->dev, ops, priv_size, mac, spi->irq, -EINVAL); > } > > -static int w5100_spi_remove(struct spi_device *spi) > +static void w5100_spi_remove(struct spi_device *spi) > { > w5100_remove(&spi->dev); > - > - return 0; > } > > static const struct spi_device_id w5100_spi_ids[] = { > diff --git a/drivers/net/ieee802154/adf7242.c b/drivers/net/ieee802154/adf7242.c > index 7db9cbd0f5de..6afdf1622944 100644 > --- a/drivers/net/ieee802154/adf7242.c > +++ b/drivers/net/ieee802154/adf7242.c > @@ -1304,7 +1304,7 @@ static int adf7242_probe(struct spi_device *spi) > return ret; > } > > -static int adf7242_remove(struct spi_device *spi) > +static void adf7242_remove(struct spi_device *spi) > { > struct adf7242_local *lp = spi_get_drvdata(spi); > > @@ -1316,8 +1316,6 @@ static int adf7242_remove(struct spi_device *spi) > ieee802154_unregister_hw(lp->hw); > mutex_destroy(&lp->bmux); > ieee802154_free_hw(lp->hw); > - > - return 0; > } > > static const struct of_device_id adf7242_of_match[] = { > diff --git a/drivers/net/ieee802154/at86rf230.c b/drivers/net/ieee802154/at86rf230.c > index 7d67f41387f5..a4734323dc29 100644 > --- a/drivers/net/ieee802154/at86rf230.c > +++ b/drivers/net/ieee802154/at86rf230.c > @@ -1759,7 +1759,7 @@ static int at86rf230_probe(struct spi_device *spi) > return rc; > } > > -static int at86rf230_remove(struct spi_device *spi) > +static void at86rf230_remove(struct spi_device *spi) > { > struct at86rf230_local *lp = spi_get_drvdata(spi); > > @@ -1769,8 +1769,6 @@ static int at86rf230_remove(struct spi_device *spi) > ieee802154_free_hw(lp->hw); > at86rf230_debugfs_remove(); > dev_dbg(&spi->dev, "unregistered at86rf230\n"); > - > - return 0; > } > > static const struct of_device_id at86rf230_of_match[] = { > diff --git a/drivers/net/ieee802154/ca8210.c b/drivers/net/ieee802154/ca8210.c > index ece6ff6049f6..b499bbe4d48f 100644 > --- a/drivers/net/ieee802154/ca8210.c > +++ b/drivers/net/ieee802154/ca8210.c > @@ -831,7 +831,7 @@ static void ca8210_rx_done(struct cas_control *cas_ctl) > finish:; > } > > -static int ca8210_remove(struct spi_device *spi_device); > +static void ca8210_remove(struct spi_device *spi_device); > > /** > * ca8210_spi_transfer_complete() - Called when a single spi transfer has > @@ -3048,7 +3048,7 @@ static void ca8210_test_interface_clear(struct ca8210_priv *priv) > * > * Return: 0 or linux error code > */ > -static int ca8210_remove(struct spi_device *spi_device) > +static void ca8210_remove(struct spi_device *spi_device) > { > struct ca8210_priv *priv; > struct ca8210_platform_data *pdata; > @@ -3088,8 +3088,6 @@ static int ca8210_remove(struct spi_device *spi_device) > if (IS_ENABLED(CONFIG_IEEE802154_CA8210_DEBUGFS)) > ca8210_test_interface_clear(priv); > } > - > - return 0; > } > > /** > diff --git a/drivers/net/ieee802154/cc2520.c b/drivers/net/ieee802154/cc2520.c > index 89c046b204e0..1e1f40f628a0 100644 > --- a/drivers/net/ieee802154/cc2520.c > +++ b/drivers/net/ieee802154/cc2520.c > @@ -1213,7 +1213,7 @@ static int cc2520_probe(struct spi_device *spi) > return ret; > } > > -static int cc2520_remove(struct spi_device *spi) > +static void cc2520_remove(struct spi_device *spi) > { > struct cc2520_private *priv = spi_get_drvdata(spi); > > @@ -1222,8 +1222,6 @@ static int cc2520_remove(struct spi_device *spi) > > ieee802154_unregister_hw(priv->hw); > ieee802154_free_hw(priv->hw); > - > - return 0; > } > > static const struct spi_device_id cc2520_ids[] = { > diff --git a/drivers/net/ieee802154/mcr20a.c b/drivers/net/ieee802154/mcr20a.c > index 8dc04e2590b1..a3af52a8e6dd 100644 > --- a/drivers/net/ieee802154/mcr20a.c > +++ b/drivers/net/ieee802154/mcr20a.c > @@ -1335,7 +1335,7 @@ mcr20a_probe(struct spi_device *spi) > return ret; > } > > -static int mcr20a_remove(struct spi_device *spi) > +static void mcr20a_remove(struct spi_device *spi) > { > struct mcr20a_local *lp = spi_get_drvdata(spi); > > @@ -1343,8 +1343,6 @@ static int mcr20a_remove(struct spi_device *spi) > > ieee802154_unregister_hw(lp->hw); > ieee802154_free_hw(lp->hw); > - > - return 0; > } > > static const struct of_device_id mcr20a_of_match[] = { > diff --git a/drivers/net/ieee802154/mrf24j40.c b/drivers/net/ieee802154/mrf24j40.c > index ff83e00b77af..ee4cfbf2c5cc 100644 > --- a/drivers/net/ieee802154/mrf24j40.c > +++ b/drivers/net/ieee802154/mrf24j40.c > @@ -1356,7 +1356,7 @@ static int mrf24j40_probe(struct spi_device *spi) > return ret; > } > > -static int mrf24j40_remove(struct spi_device *spi) > +static void mrf24j40_remove(struct spi_device *spi) > { > struct mrf24j40 *devrec = spi_get_drvdata(spi); > > @@ -1366,8 +1366,6 @@ static int mrf24j40_remove(struct spi_device *spi) > ieee802154_free_hw(devrec->hw); > /* TODO: Will ieee802154_free_device() wait until ->xmit() is > * complete? */ > - > - return 0; > } > > static const struct of_device_id mrf24j40_of_match[] = { > diff --git a/drivers/net/phy/spi_ks8995.c b/drivers/net/phy/spi_ks8995.c > index 8b5445a724ce..ff37f8ba6758 100644 > --- a/drivers/net/phy/spi_ks8995.c > +++ b/drivers/net/phy/spi_ks8995.c > @@ -517,7 +517,7 @@ static int ks8995_probe(struct spi_device *spi) > return 0; > } > > -static int ks8995_remove(struct spi_device *spi) > +static void ks8995_remove(struct spi_device *spi) > { > struct ks8995_switch *ks = spi_get_drvdata(spi); > > @@ -526,8 +526,6 @@ static int ks8995_remove(struct spi_device *spi) > /* assert reset */ > if (ks->pdata && gpio_is_valid(ks->pdata->reset_gpio)) > gpiod_set_value(gpio_to_desc(ks->pdata->reset_gpio), 1); > - > - return 0; > } > > /* ------------------------------------------------------------------------ */ > diff --git a/drivers/net/wan/slic_ds26522.c b/drivers/net/wan/slic_ds26522.c > index 8e3b1c717c10..6063552cea9b 100644 > --- a/drivers/net/wan/slic_ds26522.c > +++ b/drivers/net/wan/slic_ds26522.c > @@ -194,10 +194,9 @@ static int slic_ds26522_init_configure(struct spi_device *spi) > return 0; > } > > -static int slic_ds26522_remove(struct spi_device *spi) > +static void slic_ds26522_remove(struct spi_device *spi) > { > pr_info("DS26522 module uninstalled\n"); > - return 0; > } > > static int slic_ds26522_probe(struct spi_device *spi) > diff --git a/drivers/net/wireless/intersil/p54/p54spi.c b/drivers/net/wireless/intersil/p54/p54spi.c > index ab0fe8565851..f99b7ba69fc3 100644 > --- a/drivers/net/wireless/intersil/p54/p54spi.c > +++ b/drivers/net/wireless/intersil/p54/p54spi.c > @@ -669,7 +669,7 @@ static int p54spi_probe(struct spi_device *spi) > return ret; > } > > -static int p54spi_remove(struct spi_device *spi) > +static void p54spi_remove(struct spi_device *spi) > { > struct p54s_priv *priv = spi_get_drvdata(spi); > > @@ -684,8 +684,6 @@ static int p54spi_remove(struct spi_device *spi) > mutex_destroy(&priv->mutex); > > p54_free_common(priv->hw); > - > - return 0; > } > > > diff --git a/drivers/net/wireless/marvell/libertas/if_spi.c b/drivers/net/wireless/marvell/libertas/if_spi.c > index cd9f8ecf171f..ff1c7ec8c450 100644 > --- a/drivers/net/wireless/marvell/libertas/if_spi.c > +++ b/drivers/net/wireless/marvell/libertas/if_spi.c > @@ -1195,7 +1195,7 @@ static int if_spi_probe(struct spi_device *spi) > return err; > } > > -static int libertas_spi_remove(struct spi_device *spi) > +static void libertas_spi_remove(struct spi_device *spi) > { > struct if_spi_card *card = spi_get_drvdata(spi); > struct lbs_private *priv = card->priv; > @@ -1212,8 +1212,6 @@ static int libertas_spi_remove(struct spi_device *spi) > if (card->pdata->teardown) > card->pdata->teardown(spi); > free_if_spi_card(card); > - > - return 0; > } > > static int if_spi_suspend(struct device *dev) > diff --git a/drivers/net/wireless/microchip/wilc1000/spi.c b/drivers/net/wireless/microchip/wilc1000/spi.c > index 2c2ed4b09efd..d2db52289399 100644 > --- a/drivers/net/wireless/microchip/wilc1000/spi.c > +++ b/drivers/net/wireless/microchip/wilc1000/spi.c > @@ -240,7 +240,7 @@ static int wilc_bus_probe(struct spi_device *spi) > return ret; > } > > -static int wilc_bus_remove(struct spi_device *spi) > +static void wilc_bus_remove(struct spi_device *spi) > { > struct wilc *wilc = spi_get_drvdata(spi); > struct wilc_spi *spi_priv = wilc->bus_data; > @@ -248,8 +248,6 @@ static int wilc_bus_remove(struct spi_device *spi) > clk_disable_unprepare(wilc->rtc_clk); > wilc_netdev_cleanup(wilc); > kfree(spi_priv); > - > - return 0; > } > > static const struct of_device_id wilc_of_match[] = { > diff --git a/drivers/net/wireless/st/cw1200/cw1200_spi.c b/drivers/net/wireless/st/cw1200/cw1200_spi.c > index 271ed2ce2d7f..fe0d220da44d 100644 > --- a/drivers/net/wireless/st/cw1200/cw1200_spi.c > +++ b/drivers/net/wireless/st/cw1200/cw1200_spi.c > @@ -423,7 +423,7 @@ static int cw1200_spi_probe(struct spi_device *func) > } > > /* Disconnect Function to be called by SPI stack when device is disconnected */ > -static int cw1200_spi_disconnect(struct spi_device *func) > +static void cw1200_spi_disconnect(struct spi_device *func) > { > struct hwbus_priv *self = spi_get_drvdata(func); > > @@ -435,8 +435,6 @@ static int cw1200_spi_disconnect(struct spi_device *func) > } > } > cw1200_spi_off(dev_get_platdata(&func->dev)); > - > - return 0; > } > > static int __maybe_unused cw1200_spi_suspend(struct device *dev) > diff --git a/drivers/net/wireless/ti/wl1251/spi.c b/drivers/net/wireless/ti/wl1251/spi.c > index 5b894bd6237e..9df38726e8b0 100644 > --- a/drivers/net/wireless/ti/wl1251/spi.c > +++ b/drivers/net/wireless/ti/wl1251/spi.c > @@ -327,14 +327,12 @@ static int wl1251_spi_probe(struct spi_device *spi) > return ret; > } > > -static int wl1251_spi_remove(struct spi_device *spi) > +static void wl1251_spi_remove(struct spi_device *spi) > { > struct wl1251 *wl = spi_get_drvdata(spi); > > wl1251_free_hw(wl); > regulator_disable(wl->vio); > - > - return 0; > } > > static struct spi_driver wl1251_spi_driver = { > diff --git a/drivers/net/wireless/ti/wlcore/spi.c b/drivers/net/wireless/ti/wlcore/spi.c > index 354a7e1c3315..7eae1ec2eb2b 100644 > --- a/drivers/net/wireless/ti/wlcore/spi.c > +++ b/drivers/net/wireless/ti/wlcore/spi.c > @@ -546,13 +546,11 @@ static int wl1271_probe(struct spi_device *spi) > return ret; > } > > -static int wl1271_remove(struct spi_device *spi) > +static void wl1271_remove(struct spi_device *spi) > { > struct wl12xx_spi_glue *glue = spi_get_drvdata(spi); > > platform_device_unregister(glue->core); > - > - return 0; > } > > static struct spi_driver wl1271_spi_driver = { > diff --git a/drivers/nfc/nfcmrvl/spi.c b/drivers/nfc/nfcmrvl/spi.c > index 5b833a9a83f8..a38e2fcdfd39 100644 > --- a/drivers/nfc/nfcmrvl/spi.c > +++ b/drivers/nfc/nfcmrvl/spi.c > @@ -174,12 +174,11 @@ static int nfcmrvl_spi_probe(struct spi_device *spi) > return 0; > } > > -static int nfcmrvl_spi_remove(struct spi_device *spi) > +static void nfcmrvl_spi_remove(struct spi_device *spi) > { > struct nfcmrvl_spi_drv_data *drv_data = spi_get_drvdata(spi); > > nfcmrvl_nci_unregister_dev(drv_data->priv); > - return 0; > } > > static const struct of_device_id of_nfcmrvl_spi_match[] __maybe_unused = { > diff --git a/drivers/nfc/st-nci/spi.c b/drivers/nfc/st-nci/spi.c > index 4e723992e74c..169eacc0a32a 100644 > --- a/drivers/nfc/st-nci/spi.c > +++ b/drivers/nfc/st-nci/spi.c > @@ -263,13 +263,11 @@ static int st_nci_spi_probe(struct spi_device *dev) > return r; > } > > -static int st_nci_spi_remove(struct spi_device *dev) > +static void st_nci_spi_remove(struct spi_device *dev) > { > struct st_nci_spi_phy *phy = spi_get_drvdata(dev); > > ndlc_remove(phy->ndlc); > - > - return 0; > } > > static struct spi_device_id st_nci_spi_id_table[] = { > diff --git a/drivers/nfc/st95hf/core.c b/drivers/nfc/st95hf/core.c > index b23f47936473..ed704bb77226 100644 > --- a/drivers/nfc/st95hf/core.c > +++ b/drivers/nfc/st95hf/core.c > @@ -1198,7 +1198,7 @@ static int st95hf_probe(struct spi_device *nfc_spi_dev) > return ret; > } > > -static int st95hf_remove(struct spi_device *nfc_spi_dev) > +static void st95hf_remove(struct spi_device *nfc_spi_dev) > { > int result = 0; > unsigned char reset_cmd = ST95HF_COMMAND_RESET; > @@ -1236,8 +1236,6 @@ static int st95hf_remove(struct spi_device *nfc_spi_dev) > /* disable regulator */ > if (stcontext->st95hf_supply) > regulator_disable(stcontext->st95hf_supply); > - > - return 0; > } > > /* Register as SPI protocol driver */ > diff --git a/drivers/nfc/trf7970a.c b/drivers/nfc/trf7970a.c > index 29ca9c328df2..21d68664fe08 100644 > --- a/drivers/nfc/trf7970a.c > +++ b/drivers/nfc/trf7970a.c > @@ -2144,7 +2144,7 @@ static int trf7970a_probe(struct spi_device *spi) > return ret; > } > > -static int trf7970a_remove(struct spi_device *spi) > +static void trf7970a_remove(struct spi_device *spi) > { > struct trf7970a *trf = spi_get_drvdata(spi); > > @@ -2160,8 +2160,6 @@ static int trf7970a_remove(struct spi_device *spi) > regulator_disable(trf->regulator); > > mutex_destroy(&trf->lock); > - > - return 0; > } > > #ifdef CONFIG_PM_SLEEP > diff --git a/drivers/platform/chrome/cros_ec_spi.c b/drivers/platform/chrome/cros_ec_spi.c > index 713c58687721..8493af0f680e 100644 > --- a/drivers/platform/chrome/cros_ec_spi.c > +++ b/drivers/platform/chrome/cros_ec_spi.c > @@ -786,13 +786,11 @@ static int cros_ec_spi_probe(struct spi_device *spi) > return 0; > } > > -static int cros_ec_spi_remove(struct spi_device *spi) > +static void cros_ec_spi_remove(struct spi_device *spi) > { > struct cros_ec_device *ec_dev = spi_get_drvdata(spi); > > cros_ec_unregister(ec_dev); > - > - return 0; > } > > #ifdef CONFIG_PM_SLEEP > diff --git a/drivers/platform/olpc/olpc-xo175-ec.c b/drivers/platform/olpc/olpc-xo175-ec.c > index 0d46706afd2d..4823bd2819f6 100644 > --- a/drivers/platform/olpc/olpc-xo175-ec.c > +++ b/drivers/platform/olpc/olpc-xo175-ec.c > @@ -648,7 +648,7 @@ static struct olpc_ec_driver olpc_xo175_ec_driver = { > .ec_cmd = olpc_xo175_ec_cmd, > }; > > -static int olpc_xo175_ec_remove(struct spi_device *spi) > +static void olpc_xo175_ec_remove(struct spi_device *spi) > { > if (pm_power_off == olpc_xo175_ec_power_off) > pm_power_off = NULL; > @@ -657,8 +657,6 @@ static int olpc_xo175_ec_remove(struct spi_device *spi) > > platform_device_unregister(olpc_ec); > olpc_ec = NULL; > - > - return 0; > } > > static int olpc_xo175_ec_probe(struct spi_device *spi) > diff --git a/drivers/rtc/rtc-ds1302.c b/drivers/rtc/rtc-ds1302.c > index 2f83adef966e..6d66ab5a8b17 100644 > --- a/drivers/rtc/rtc-ds1302.c > +++ b/drivers/rtc/rtc-ds1302.c > @@ -185,10 +185,9 @@ static int ds1302_probe(struct spi_device *spi) > return 0; > } > > -static int ds1302_remove(struct spi_device *spi) > +static void ds1302_remove(struct spi_device *spi) > { > spi_set_drvdata(spi, NULL); > - return 0; > } > > #ifdef CONFIG_OF > diff --git a/drivers/rtc/rtc-ds1305.c b/drivers/rtc/rtc-ds1305.c > index 9ef107b99b65..ed9360486953 100644 > --- a/drivers/rtc/rtc-ds1305.c > +++ b/drivers/rtc/rtc-ds1305.c > @@ -720,7 +720,7 @@ static int ds1305_probe(struct spi_device *spi) > return 0; > } > > -static int ds1305_remove(struct spi_device *spi) > +static void ds1305_remove(struct spi_device *spi) > { > struct ds1305 *ds1305 = spi_get_drvdata(spi); > > @@ -730,8 +730,6 @@ static int ds1305_remove(struct spi_device *spi) > devm_free_irq(&spi->dev, spi->irq, ds1305); > cancel_work_sync(&ds1305->work); > } > - > - return 0; > } > > static struct spi_driver ds1305_driver = { > diff --git a/drivers/rtc/rtc-ds1343.c b/drivers/rtc/rtc-ds1343.c > index f14ed6c96437..ed5a6ba89a3e 100644 > --- a/drivers/rtc/rtc-ds1343.c > +++ b/drivers/rtc/rtc-ds1343.c > @@ -434,11 +434,9 @@ static int ds1343_probe(struct spi_device *spi) > return 0; > } > > -static int ds1343_remove(struct spi_device *spi) > +static void ds1343_remove(struct spi_device *spi) > { > dev_pm_clear_wake_irq(&spi->dev); > - > - return 0; > } > > #ifdef CONFIG_PM_SLEEP > diff --git a/drivers/spi/spi-mem.c b/drivers/spi/spi-mem.c > index 37f4443ce9a0..e9d83d65873b 100644 > --- a/drivers/spi/spi-mem.c > +++ b/drivers/spi/spi-mem.c > @@ -854,15 +854,13 @@ static int spi_mem_probe(struct spi_device *spi) > return memdrv->probe(mem); > } > > -static int spi_mem_remove(struct spi_device *spi) > +static void spi_mem_remove(struct spi_device *spi) > { > struct spi_mem_driver *memdrv = to_spi_mem_drv(spi->dev.driver); > struct spi_mem *mem = spi_get_drvdata(spi); > > if (memdrv->remove) > - return memdrv->remove(mem); > - > - return 0; > + memdrv->remove(mem); > } > > static void spi_mem_shutdown(struct spi_device *spi) > diff --git a/drivers/spi/spi-slave-system-control.c b/drivers/spi/spi-slave-system-control.c > index 169f3d595f60..d37cfe995a63 100644 > --- a/drivers/spi/spi-slave-system-control.c > +++ b/drivers/spi/spi-slave-system-control.c > @@ -132,13 +132,12 @@ static int spi_slave_system_control_probe(struct spi_device *spi) > return 0; > } > > -static int spi_slave_system_control_remove(struct spi_device *spi) > +static void spi_slave_system_control_remove(struct spi_device *spi) > { > struct spi_slave_system_control_priv *priv = spi_get_drvdata(spi); > > spi_slave_abort(spi); > wait_for_completion(&priv->finished); > - return 0; > } > > static struct spi_driver spi_slave_system_control_driver = { > diff --git a/drivers/spi/spi-slave-time.c b/drivers/spi/spi-slave-time.c > index f2e07a392d68..f56c1afb8534 100644 > --- a/drivers/spi/spi-slave-time.c > +++ b/drivers/spi/spi-slave-time.c > @@ -106,13 +106,12 @@ static int spi_slave_time_probe(struct spi_device *spi) > return 0; > } > > -static int spi_slave_time_remove(struct spi_device *spi) > +static void spi_slave_time_remove(struct spi_device *spi) > { > struct spi_slave_time_priv *priv = spi_get_drvdata(spi); > > spi_slave_abort(spi); > wait_for_completion(&priv->finished); > - return 0; > } > > static struct spi_driver spi_slave_time_driver = { > diff --git a/drivers/spi/spi-tle62x0.c b/drivers/spi/spi-tle62x0.c > index f8ad0709d015..a565352f6381 100644 > --- a/drivers/spi/spi-tle62x0.c > +++ b/drivers/spi/spi-tle62x0.c > @@ -288,7 +288,7 @@ static int tle62x0_probe(struct spi_device *spi) > return ret; > } > > -static int tle62x0_remove(struct spi_device *spi) > +static void tle62x0_remove(struct spi_device *spi) > { > struct tle62x0_state *st = spi_get_drvdata(spi); > int ptr; > @@ -298,7 +298,6 @@ static int tle62x0_remove(struct spi_device *spi) > > device_remove_file(&spi->dev, &dev_attr_status_show); > kfree(st); > - return 0; > } > > static struct spi_driver tle62x0_driver = { > diff --git a/drivers/spi/spi.c b/drivers/spi/spi.c > index 4599b121d744..ead9a132dcb9 100644 > --- a/drivers/spi/spi.c > +++ b/drivers/spi/spi.c > @@ -404,15 +404,8 @@ static void spi_remove(struct device *dev) > { > const struct spi_driver *sdrv = to_spi_driver(dev->driver); > > - if (sdrv->remove) { > - int ret; > - > - ret = sdrv->remove(to_spi_device(dev)); > - if (ret) > - dev_warn(dev, > - "Failed to unbind driver (%pe), ignoring\n", > - ERR_PTR(ret)); > - } > + if (sdrv->remove) > + sdrv->remove(to_spi_device(dev)); > > dev_pm_domain_detach(dev, true); > } > diff --git a/drivers/spi/spidev.c b/drivers/spi/spidev.c > index a5cceca8b82b..9468f74308bd 100644 > --- a/drivers/spi/spidev.c > +++ b/drivers/spi/spidev.c > @@ -803,7 +803,7 @@ static int spidev_probe(struct spi_device *spi) > return status; > } > > -static int spidev_remove(struct spi_device *spi) > +static void spidev_remove(struct spi_device *spi) > { > struct spidev_data *spidev = spi_get_drvdata(spi); > > @@ -820,8 +820,6 @@ static int spidev_remove(struct spi_device *spi) > if (spidev->users == 0) > kfree(spidev); > mutex_unlock(&device_list_lock); > - > - return 0; > } > > static struct spi_driver spidev_spi_driver = { > diff --git a/drivers/staging/fbtft/fbtft.h b/drivers/staging/fbtft/fbtft.h > index 6a7545b5bcd2..b68f5f9b7c78 100644 > --- a/drivers/staging/fbtft/fbtft.h > +++ b/drivers/staging/fbtft/fbtft.h > @@ -286,12 +286,11 @@ static int fbtft_driver_probe_spi(struct spi_device *spi) \ > return fbtft_probe_common(_display, spi, NULL); \ > } \ > \ > -static int fbtft_driver_remove_spi(struct spi_device *spi) \ > +static void fbtft_driver_remove_spi(struct spi_device *spi) \ > { \ > struct fb_info *info = spi_get_drvdata(spi); \ > \ > fbtft_remove_common(&spi->dev, info); \ > - return 0; \ > } \ > \ > static struct spi_driver fbtft_driver_spi_driver = { \ > diff --git a/drivers/staging/pi433/pi433_if.c b/drivers/staging/pi433/pi433_if.c > index 68c09fa016ed..1d31c35875e3 100644 > --- a/drivers/staging/pi433/pi433_if.c > +++ b/drivers/staging/pi433/pi433_if.c > @@ -1264,7 +1264,7 @@ static int pi433_probe(struct spi_device *spi) > return retval; > } > > -static int pi433_remove(struct spi_device *spi) > +static void pi433_remove(struct spi_device *spi) > { > struct pi433_device *device = spi_get_drvdata(spi); > > @@ -1284,8 +1284,6 @@ static int pi433_remove(struct spi_device *spi) > > kfree(device->rx_buffer); > kfree(device); > - > - return 0; > } > > static const struct of_device_id pi433_dt_ids[] = { > diff --git a/drivers/staging/wfx/bus_spi.c b/drivers/staging/wfx/bus_spi.c > index 55ffcd7c42e2..fa0ff66a457d 100644 > --- a/drivers/staging/wfx/bus_spi.c > +++ b/drivers/staging/wfx/bus_spi.c > @@ -232,12 +232,11 @@ static int wfx_spi_probe(struct spi_device *func) > return wfx_probe(bus->core); > } > > -static int wfx_spi_remove(struct spi_device *func) > +static void wfx_spi_remove(struct spi_device *func) > { > struct wfx_spi_priv *bus = spi_get_drvdata(func); > > wfx_release(bus->core); > - return 0; > } > > /* For dynamic driver binding, kernel does not use OF to match driver. It only > diff --git a/drivers/tty/serial/max3100.c b/drivers/tty/serial/max3100.c > index 3c92d4e01488..516cff362434 100644 > --- a/drivers/tty/serial/max3100.c > +++ b/drivers/tty/serial/max3100.c > @@ -805,7 +805,7 @@ static int max3100_probe(struct spi_device *spi) > return 0; > } > > -static int max3100_remove(struct spi_device *spi) > +static void max3100_remove(struct spi_device *spi) > { > struct max3100_port *s = spi_get_drvdata(spi); > int i; > @@ -828,13 +828,12 @@ static int max3100_remove(struct spi_device *spi) > for (i = 0; i < MAX_MAX3100; i++) > if (max3100s[i]) { > mutex_unlock(&max3100s_lock); > - return 0; > + return; > } > pr_debug("removing max3100 driver\n"); > uart_unregister_driver(&max3100_uart_driver); > > mutex_unlock(&max3100s_lock); > - return 0; > } > > #ifdef CONFIG_PM_SLEEP > diff --git a/drivers/tty/serial/max310x.c b/drivers/tty/serial/max310x.c > index dde0824b2fa5..3112b4a05448 100644 > --- a/drivers/tty/serial/max310x.c > +++ b/drivers/tty/serial/max310x.c > @@ -1487,10 +1487,9 @@ static int max310x_spi_probe(struct spi_device *spi) > return max310x_probe(&spi->dev, devtype, regmap, spi->irq); > } > > -static int max310x_spi_remove(struct spi_device *spi) > +static void max310x_spi_remove(struct spi_device *spi) > { > max310x_remove(&spi->dev); > - return 0; > } > > static const struct spi_device_id max310x_id_table[] = { > diff --git a/drivers/tty/serial/sc16is7xx.c b/drivers/tty/serial/sc16is7xx.c > index 64e7e6c8145f..25d67b8c4db7 100644 > --- a/drivers/tty/serial/sc16is7xx.c > +++ b/drivers/tty/serial/sc16is7xx.c > @@ -1440,11 +1440,9 @@ static int sc16is7xx_spi_probe(struct spi_device *spi) > return sc16is7xx_probe(&spi->dev, devtype, regmap, spi->irq); > } > > -static int sc16is7xx_spi_remove(struct spi_device *spi) > +static void sc16is7xx_spi_remove(struct spi_device *spi) > { > sc16is7xx_remove(&spi->dev); > - > - return 0; > } > > static const struct spi_device_id sc16is7xx_spi_id_table[] = { > diff --git a/drivers/usb/gadget/udc/max3420_udc.c b/drivers/usb/gadget/udc/max3420_udc.c > index d2a2b20cc1ad..7d9bd16190c0 100644 > --- a/drivers/usb/gadget/udc/max3420_udc.c > +++ b/drivers/usb/gadget/udc/max3420_udc.c > @@ -1292,7 +1292,7 @@ static int max3420_probe(struct spi_device *spi) > return err; > } > > -static int max3420_remove(struct spi_device *spi) > +static void max3420_remove(struct spi_device *spi) > { > struct max3420_udc *udc = spi_get_drvdata(spi); > unsigned long flags; > @@ -1304,8 +1304,6 @@ static int max3420_remove(struct spi_device *spi) > kthread_stop(udc->thread_task); > > spin_unlock_irqrestore(&udc->lock, flags); > - > - return 0; > } > > static const struct of_device_id max3420_udc_of_match[] = { > diff --git a/drivers/usb/host/max3421-hcd.c b/drivers/usb/host/max3421-hcd.c > index 30de85a707fe..99a5523a79fb 100644 > --- a/drivers/usb/host/max3421-hcd.c > +++ b/drivers/usb/host/max3421-hcd.c > @@ -1926,7 +1926,7 @@ max3421_probe(struct spi_device *spi) > return retval; > } > > -static int > +static void > max3421_remove(struct spi_device *spi) > { > struct max3421_hcd *max3421_hcd; > @@ -1947,7 +1947,6 @@ max3421_remove(struct spi_device *spi) > free_irq(spi->irq, hcd); > > usb_put_hcd(hcd); > - return 0; > } > > static const struct of_device_id max3421_of_match_table[] = { > diff --git a/drivers/video/backlight/ams369fg06.c b/drivers/video/backlight/ams369fg06.c > index 8a4361e95a11..522dd81110b8 100644 > --- a/drivers/video/backlight/ams369fg06.c > +++ b/drivers/video/backlight/ams369fg06.c > @@ -506,12 +506,11 @@ static int ams369fg06_probe(struct spi_device *spi) > return 0; > } > > -static int ams369fg06_remove(struct spi_device *spi) > +static void ams369fg06_remove(struct spi_device *spi) > { > struct ams369fg06 *lcd = spi_get_drvdata(spi); > > ams369fg06_power(lcd, FB_BLANK_POWERDOWN); > - return 0; > } > > #ifdef CONFIG_PM_SLEEP > diff --git a/drivers/video/backlight/corgi_lcd.c b/drivers/video/backlight/corgi_lcd.c > index 33f5d80495e6..0a57033ae31d 100644 > --- a/drivers/video/backlight/corgi_lcd.c > +++ b/drivers/video/backlight/corgi_lcd.c > @@ -542,7 +542,7 @@ static int corgi_lcd_probe(struct spi_device *spi) > return 0; > } > > -static int corgi_lcd_remove(struct spi_device *spi) > +static void corgi_lcd_remove(struct spi_device *spi) > { > struct corgi_lcd *lcd = spi_get_drvdata(spi); > > @@ -550,7 +550,6 @@ static int corgi_lcd_remove(struct spi_device *spi) > lcd->bl_dev->props.brightness = 0; > backlight_update_status(lcd->bl_dev); > corgi_lcd_set_power(lcd->lcd_dev, FB_BLANK_POWERDOWN); > - return 0; > } > > static struct spi_driver corgi_lcd_driver = { > diff --git a/drivers/video/backlight/ili922x.c b/drivers/video/backlight/ili922x.c > index 328aba9cddad..e7b6bd827986 100644 > --- a/drivers/video/backlight/ili922x.c > +++ b/drivers/video/backlight/ili922x.c > @@ -526,10 +526,9 @@ static int ili922x_probe(struct spi_device *spi) > return 0; > } > > -static int ili922x_remove(struct spi_device *spi) > +static void ili922x_remove(struct spi_device *spi) > { > ili922x_poweroff(spi); > - return 0; > } > > static struct spi_driver ili922x_driver = { > diff --git a/drivers/video/backlight/l4f00242t03.c b/drivers/video/backlight/l4f00242t03.c > index 46f97d1c3d21..cc763cf15f53 100644 > --- a/drivers/video/backlight/l4f00242t03.c > +++ b/drivers/video/backlight/l4f00242t03.c > @@ -223,12 +223,11 @@ static int l4f00242t03_probe(struct spi_device *spi) > return 0; > } > > -static int l4f00242t03_remove(struct spi_device *spi) > +static void l4f00242t03_remove(struct spi_device *spi) > { > struct l4f00242t03_priv *priv = spi_get_drvdata(spi); > > l4f00242t03_lcd_power_set(priv->ld, FB_BLANK_POWERDOWN); > - return 0; > } > > static void l4f00242t03_shutdown(struct spi_device *spi) > diff --git a/drivers/video/backlight/lms501kf03.c b/drivers/video/backlight/lms501kf03.c > index f949b66dce1b..5c46df8022bf 100644 > --- a/drivers/video/backlight/lms501kf03.c > +++ b/drivers/video/backlight/lms501kf03.c > @@ -364,12 +364,11 @@ static int lms501kf03_probe(struct spi_device *spi) > return 0; > } > > -static int lms501kf03_remove(struct spi_device *spi) > +static void lms501kf03_remove(struct spi_device *spi) > { > struct lms501kf03 *lcd = spi_get_drvdata(spi); > > lms501kf03_power(lcd, FB_BLANK_POWERDOWN); > - return 0; > } > > #ifdef CONFIG_PM_SLEEP > diff --git a/drivers/video/backlight/ltv350qv.c b/drivers/video/backlight/ltv350qv.c > index 5cbf621e48bd..b6d373af6e3f 100644 > --- a/drivers/video/backlight/ltv350qv.c > +++ b/drivers/video/backlight/ltv350qv.c > @@ -255,12 +255,11 @@ static int ltv350qv_probe(struct spi_device *spi) > return 0; > } > > -static int ltv350qv_remove(struct spi_device *spi) > +static void ltv350qv_remove(struct spi_device *spi) > { > struct ltv350qv *lcd = spi_get_drvdata(spi); > > ltv350qv_power(lcd, FB_BLANK_POWERDOWN); > - return 0; > } > > #ifdef CONFIG_PM_SLEEP > diff --git a/drivers/video/backlight/tdo24m.c b/drivers/video/backlight/tdo24m.c > index 0de044dcafd5..fc6fbaf85594 100644 > --- a/drivers/video/backlight/tdo24m.c > +++ b/drivers/video/backlight/tdo24m.c > @@ -397,12 +397,11 @@ static int tdo24m_probe(struct spi_device *spi) > return 0; > } > > -static int tdo24m_remove(struct spi_device *spi) > +static void tdo24m_remove(struct spi_device *spi) > { > struct tdo24m *lcd = spi_get_drvdata(spi); > > tdo24m_power(lcd, FB_BLANK_POWERDOWN); > - return 0; > } > > #ifdef CONFIG_PM_SLEEP > diff --git a/drivers/video/backlight/tosa_lcd.c b/drivers/video/backlight/tosa_lcd.c > index 38765544345b..23d6c6bf0f54 100644 > --- a/drivers/video/backlight/tosa_lcd.c > +++ b/drivers/video/backlight/tosa_lcd.c > @@ -232,15 +232,13 @@ static int tosa_lcd_probe(struct spi_device *spi) > return ret; > } > > -static int tosa_lcd_remove(struct spi_device *spi) > +static void tosa_lcd_remove(struct spi_device *spi) > { > struct tosa_lcd_data *data = spi_get_drvdata(spi); > > i2c_unregister_device(data->i2c); > > tosa_lcd_tg_off(data); > - > - return 0; > } > > #ifdef CONFIG_PM_SLEEP > diff --git a/drivers/video/backlight/vgg2432a4.c b/drivers/video/backlight/vgg2432a4.c > index 3567b45f9ba9..bfc1913e8b55 100644 > --- a/drivers/video/backlight/vgg2432a4.c > +++ b/drivers/video/backlight/vgg2432a4.c > @@ -233,11 +233,9 @@ static int vgg2432a4_probe(struct spi_device *spi) > return 0; > } > > -static int vgg2432a4_remove(struct spi_device *spi) > +static void vgg2432a4_remove(struct spi_device *spi) > { > ili9320_remove(spi_get_drvdata(spi)); > - > - return 0; > } > > static void vgg2432a4_shutdown(struct spi_device *spi) > diff --git a/drivers/video/fbdev/omap/lcd_mipid.c b/drivers/video/fbdev/omap/lcd_mipid.c > index a75ae0c9b14c..03cff39d392d 100644 > --- a/drivers/video/fbdev/omap/lcd_mipid.c > +++ b/drivers/video/fbdev/omap/lcd_mipid.c > @@ -570,14 +570,12 @@ static int mipid_spi_probe(struct spi_device *spi) > return 0; > } > > -static int mipid_spi_remove(struct spi_device *spi) > +static void mipid_spi_remove(struct spi_device *spi) > { > struct mipid_device *md = dev_get_drvdata(&spi->dev); > > mipid_disable(&md->panel); > kfree(md); > - > - return 0; > } > > static struct spi_driver mipid_spi_driver = { > diff --git a/drivers/video/fbdev/omap2/omapfb/displays/panel-lgphilips-lb035q02.c b/drivers/video/fbdev/omap2/omapfb/displays/panel-lgphilips-lb035q02.c > index 1bec7a4422e8..aab67721263d 100644 > --- a/drivers/video/fbdev/omap2/omapfb/displays/panel-lgphilips-lb035q02.c > +++ b/drivers/video/fbdev/omap2/omapfb/displays/panel-lgphilips-lb035q02.c > @@ -316,7 +316,7 @@ static int lb035q02_panel_spi_probe(struct spi_device *spi) > return r; > } > > -static int lb035q02_panel_spi_remove(struct spi_device *spi) > +static void lb035q02_panel_spi_remove(struct spi_device *spi) > { > struct panel_drv_data *ddata = spi_get_drvdata(spi); > struct omap_dss_device *dssdev = &ddata->dssdev; > @@ -328,8 +328,6 @@ static int lb035q02_panel_spi_remove(struct spi_device *spi) > lb035q02_disconnect(dssdev); > > omap_dss_put_device(in); > - > - return 0; > } > > static const struct of_device_id lb035q02_of_match[] = { > diff --git a/drivers/video/fbdev/omap2/omapfb/displays/panel-nec-nl8048hl11.c b/drivers/video/fbdev/omap2/omapfb/displays/panel-nec-nl8048hl11.c > index dff9ebbadfc0..be9910ff6e62 100644 > --- a/drivers/video/fbdev/omap2/omapfb/displays/panel-nec-nl8048hl11.c > +++ b/drivers/video/fbdev/omap2/omapfb/displays/panel-nec-nl8048hl11.c > @@ -327,7 +327,7 @@ static int nec_8048_probe(struct spi_device *spi) > return r; > } > > -static int nec_8048_remove(struct spi_device *spi) > +static void nec_8048_remove(struct spi_device *spi) > { > struct panel_drv_data *ddata = dev_get_drvdata(&spi->dev); > struct omap_dss_device *dssdev = &ddata->dssdev; > @@ -341,8 +341,6 @@ static int nec_8048_remove(struct spi_device *spi) > nec_8048_disconnect(dssdev); > > omap_dss_put_device(in); > - > - return 0; > } > > #ifdef CONFIG_PM_SLEEP > diff --git a/drivers/video/fbdev/omap2/omapfb/displays/panel-sony-acx565akm.c b/drivers/video/fbdev/omap2/omapfb/displays/panel-sony-acx565akm.c > index 8d8b5ff7d43c..a909b5385ca5 100644 > --- a/drivers/video/fbdev/omap2/omapfb/displays/panel-sony-acx565akm.c > +++ b/drivers/video/fbdev/omap2/omapfb/displays/panel-sony-acx565akm.c > @@ -857,7 +857,7 @@ static int acx565akm_probe(struct spi_device *spi) > return r; > } > > -static int acx565akm_remove(struct spi_device *spi) > +static void acx565akm_remove(struct spi_device *spi) > { > struct panel_drv_data *ddata = dev_get_drvdata(&spi->dev); > struct omap_dss_device *dssdev = &ddata->dssdev; > @@ -874,8 +874,6 @@ static int acx565akm_remove(struct spi_device *spi) > acx565akm_disconnect(dssdev); > > omap_dss_put_device(in); > - > - return 0; > } > > static const struct of_device_id acx565akm_of_match[] = { > diff --git a/drivers/video/fbdev/omap2/omapfb/displays/panel-tpo-td028ttec1.c b/drivers/video/fbdev/omap2/omapfb/displays/panel-tpo-td028ttec1.c > index 595ebd8bd5dc..3c0f887d3092 100644 > --- a/drivers/video/fbdev/omap2/omapfb/displays/panel-tpo-td028ttec1.c > +++ b/drivers/video/fbdev/omap2/omapfb/displays/panel-tpo-td028ttec1.c > @@ -425,7 +425,7 @@ static int td028ttec1_panel_probe(struct spi_device *spi) > return r; > } > > -static int td028ttec1_panel_remove(struct spi_device *spi) > +static void td028ttec1_panel_remove(struct spi_device *spi) > { > struct panel_drv_data *ddata = dev_get_drvdata(&spi->dev); > struct omap_dss_device *dssdev = &ddata->dssdev; > @@ -439,8 +439,6 @@ static int td028ttec1_panel_remove(struct spi_device *spi) > td028ttec1_panel_disconnect(dssdev); > > omap_dss_put_device(in); > - > - return 0; > } > > static const struct of_device_id td028ttec1_of_match[] = { > diff --git a/drivers/video/fbdev/omap2/omapfb/displays/panel-tpo-td043mtea1.c b/drivers/video/fbdev/omap2/omapfb/displays/panel-tpo-td043mtea1.c > index afac1d9445aa..58bbba7c037f 100644 > --- a/drivers/video/fbdev/omap2/omapfb/displays/panel-tpo-td043mtea1.c > +++ b/drivers/video/fbdev/omap2/omapfb/displays/panel-tpo-td043mtea1.c > @@ -564,7 +564,7 @@ static int tpo_td043_probe(struct spi_device *spi) > return r; > } > > -static int tpo_td043_remove(struct spi_device *spi) > +static void tpo_td043_remove(struct spi_device *spi) > { > struct panel_drv_data *ddata = dev_get_drvdata(&spi->dev); > struct omap_dss_device *dssdev = &ddata->dssdev; > @@ -580,8 +580,6 @@ static int tpo_td043_remove(struct spi_device *spi) > omap_dss_put_device(in); > > sysfs_remove_group(&spi->dev.kobj, &tpo_td043_attr_group); > - > - return 0; > } > > #ifdef CONFIG_PM_SLEEP > diff --git a/include/linux/spi/spi.h b/include/linux/spi/spi.h > index 7ab3fed7b804..c84e61b99c7b 100644 > --- a/include/linux/spi/spi.h > +++ b/include/linux/spi/spi.h > @@ -280,7 +280,7 @@ struct spi_message; > struct spi_driver { > const struct spi_device_id *id_table; > int (*probe)(struct spi_device *spi); > - int (*remove)(struct spi_device *spi); > + void (*remove)(struct spi_device *spi); > void (*shutdown)(struct spi_device *spi); > struct device_driver driver; > }; > diff --git a/sound/pci/hda/cs35l41_hda_spi.c b/sound/pci/hda/cs35l41_hda_spi.c > index 9f8123893cc8..50eb6c0e6658 100644 > --- a/sound/pci/hda/cs35l41_hda_spi.c > +++ b/sound/pci/hda/cs35l41_hda_spi.c > @@ -28,11 +28,9 @@ static int cs35l41_hda_spi_probe(struct spi_device *spi) > devm_regmap_init_spi(spi, &cs35l41_regmap_spi)); > } > > -static int cs35l41_hda_spi_remove(struct spi_device *spi) > +static void cs35l41_hda_spi_remove(struct spi_device *spi) > { > cs35l41_hda_remove(&spi->dev); > - > - return 0; > } > > static const struct spi_device_id cs35l41_hda_spi_id[] = { > diff --git a/sound/soc/codecs/adau1761-spi.c b/sound/soc/codecs/adau1761-spi.c > index 655689c9778a..7c9242c2ff94 100644 > --- a/sound/soc/codecs/adau1761-spi.c > +++ b/sound/soc/codecs/adau1761-spi.c > @@ -45,10 +45,9 @@ static int adau1761_spi_probe(struct spi_device *spi) > id->driver_data, adau1761_spi_switch_mode); > } > > -static int adau1761_spi_remove(struct spi_device *spi) > +static void adau1761_spi_remove(struct spi_device *spi) > { > adau17x1_remove(&spi->dev); > - return 0; > } > > static const struct spi_device_id adau1761_spi_id[] = { > diff --git a/sound/soc/codecs/adau1781-spi.c b/sound/soc/codecs/adau1781-spi.c > index bb5613574786..1a09633d5a88 100644 > --- a/sound/soc/codecs/adau1781-spi.c > +++ b/sound/soc/codecs/adau1781-spi.c > @@ -45,10 +45,9 @@ static int adau1781_spi_probe(struct spi_device *spi) > id->driver_data, adau1781_spi_switch_mode); > } > > -static int adau1781_spi_remove(struct spi_device *spi) > +static void adau1781_spi_remove(struct spi_device *spi) > { > adau17x1_remove(&spi->dev); > - return 0; > } > > static const struct spi_device_id adau1781_spi_id[] = { > diff --git a/sound/soc/codecs/cs35l41-spi.c b/sound/soc/codecs/cs35l41-spi.c > index 6dfd5459aa20..169221a5b09f 100644 > --- a/sound/soc/codecs/cs35l41-spi.c > +++ b/sound/soc/codecs/cs35l41-spi.c > @@ -55,13 +55,11 @@ static int cs35l41_spi_probe(struct spi_device *spi) > return cs35l41_probe(cs35l41, pdata); > } > > -static int cs35l41_spi_remove(struct spi_device *spi) > +static void cs35l41_spi_remove(struct spi_device *spi) > { > struct cs35l41_private *cs35l41 = spi_get_drvdata(spi); > > cs35l41_remove(cs35l41); > - > - return 0; > } > > #ifdef CONFIG_OF > diff --git a/sound/soc/codecs/pcm3168a-spi.c b/sound/soc/codecs/pcm3168a-spi.c > index ecd379f308e6..b5b08046f545 100644 > --- a/sound/soc/codecs/pcm3168a-spi.c > +++ b/sound/soc/codecs/pcm3168a-spi.c > @@ -26,11 +26,9 @@ static int pcm3168a_spi_probe(struct spi_device *spi) > return pcm3168a_probe(&spi->dev, regmap); > } > > -static int pcm3168a_spi_remove(struct spi_device *spi) > +static void pcm3168a_spi_remove(struct spi_device *spi) > { > pcm3168a_remove(&spi->dev); > - > - return 0; > } > > static const struct spi_device_id pcm3168a_spi_id[] = { > diff --git a/sound/soc/codecs/pcm512x-spi.c b/sound/soc/codecs/pcm512x-spi.c > index 7cf559b47e1c..4d29e7196380 100644 > --- a/sound/soc/codecs/pcm512x-spi.c > +++ b/sound/soc/codecs/pcm512x-spi.c > @@ -26,10 +26,9 @@ static int pcm512x_spi_probe(struct spi_device *spi) > return pcm512x_probe(&spi->dev, regmap); > } > > -static int pcm512x_spi_remove(struct spi_device *spi) > +static void pcm512x_spi_remove(struct spi_device *spi) > { > pcm512x_remove(&spi->dev); > - return 0; > } > > static const struct spi_device_id pcm512x_spi_id[] = { > diff --git a/sound/soc/codecs/tlv320aic32x4-spi.c b/sound/soc/codecs/tlv320aic32x4-spi.c > index a8958cd1c692..03cce8d6404f 100644 > --- a/sound/soc/codecs/tlv320aic32x4-spi.c > +++ b/sound/soc/codecs/tlv320aic32x4-spi.c > @@ -46,11 +46,9 @@ static int aic32x4_spi_probe(struct spi_device *spi) > return aic32x4_probe(&spi->dev, regmap); > } > > -static int aic32x4_spi_remove(struct spi_device *spi) > +static void aic32x4_spi_remove(struct spi_device *spi) > { > aic32x4_remove(&spi->dev); > - > - return 0; > } > > static const struct spi_device_id aic32x4_spi_id[] = { > diff --git a/sound/soc/codecs/tlv320aic3x-spi.c b/sound/soc/codecs/tlv320aic3x-spi.c > index 494e84402232..deed6ec7e081 100644 > --- a/sound/soc/codecs/tlv320aic3x-spi.c > +++ b/sound/soc/codecs/tlv320aic3x-spi.c > @@ -35,11 +35,9 @@ static int aic3x_spi_probe(struct spi_device *spi) > return aic3x_probe(&spi->dev, regmap, id->driver_data); > } > > -static int aic3x_spi_remove(struct spi_device *spi) > +static void aic3x_spi_remove(struct spi_device *spi) > { > aic3x_remove(&spi->dev); > - > - return 0; > } > > static const struct spi_device_id aic3x_spi_id[] = { > diff --git a/sound/soc/codecs/wm0010.c b/sound/soc/codecs/wm0010.c > index 28b4656c4e14..1bef1c500c8e 100644 > --- a/sound/soc/codecs/wm0010.c > +++ b/sound/soc/codecs/wm0010.c > @@ -969,7 +969,7 @@ static int wm0010_spi_probe(struct spi_device *spi) > return 0; > } > > -static int wm0010_spi_remove(struct spi_device *spi) > +static void wm0010_spi_remove(struct spi_device *spi) > { > struct wm0010_priv *wm0010 = spi_get_drvdata(spi); > > @@ -980,8 +980,6 @@ static int wm0010_spi_remove(struct spi_device *spi) > > if (wm0010->irq) > free_irq(wm0010->irq, wm0010); > - > - return 0; > } > > static struct spi_driver wm0010_spi_driver = { > diff --git a/sound/soc/codecs/wm8804-spi.c b/sound/soc/codecs/wm8804-spi.c > index 9a8da1511c34..628568724c20 100644 > --- a/sound/soc/codecs/wm8804-spi.c > +++ b/sound/soc/codecs/wm8804-spi.c > @@ -24,10 +24,9 @@ static int wm8804_spi_probe(struct spi_device *spi) > return wm8804_probe(&spi->dev, regmap); > } > > -static int wm8804_spi_remove(struct spi_device *spi) > +static void wm8804_spi_remove(struct spi_device *spi) > { > wm8804_remove(&spi->dev); > - return 0; > } > > static const struct of_device_id wm8804_of_match[] = { > diff --git a/sound/spi/at73c213.c b/sound/spi/at73c213.c > index 76c0e37a838c..56d2c712e257 100644 > --- a/sound/spi/at73c213.c > +++ b/sound/spi/at73c213.c > @@ -1001,7 +1001,7 @@ static int snd_at73c213_probe(struct spi_device *spi) > return retval; > } > > -static int snd_at73c213_remove(struct spi_device *spi) > +static void snd_at73c213_remove(struct spi_device *spi) > { > struct snd_card *card = dev_get_drvdata(&spi->dev); > struct snd_at73c213 *chip = card->private_data; > @@ -1066,8 +1066,6 @@ static int snd_at73c213_remove(struct spi_device *spi) > > ssc_free(chip->ssc); > snd_card_free(card); > - > - return 0; > } > > #ifdef CONFIG_PM_SLEEP

2 1

Re: [PATCH 5/5] spi: make remove callback a void function
by Claudius Heine 25 Jan '22

25 Jan '22

On 2022-01-23 18:52, Uwe Kleine-König wrote: > The value returned by an spi driver's remove function is mostly ignored. > (Only an error message is printed if the value is non-zero that the > error is ignored.) > > So change the prototype of the remove function to return no value. This > way driver authors are not tempted to assume that passing an error to > the upper layer is a good idea. All drivers are adapted accordingly. > There is no intended change of behaviour, all callbacks were prepared to > return 0 before. > > Signed-off-by: Uwe Kleine-König <u.kleine-koenig(a)pengutronix.de> Acked-by: Claudius Heine <ch(a)denx.de> > --- > drivers/bus/moxtet.c | 4 +--- > drivers/char/tpm/st33zp24/spi.c | 4 +--- > drivers/char/tpm/tpm_tis_spi_main.c | 3 +-- > drivers/clk/clk-lmk04832.c | 4 +--- > drivers/gpio/gpio-74x164.c | 4 +--- > drivers/gpio/gpio-max3191x.c | 4 +--- > drivers/gpio/gpio-max7301.c | 4 +--- > drivers/gpio/gpio-mc33880.c | 4 +--- > drivers/gpio/gpio-pisosr.c | 4 +--- > drivers/gpu/drm/panel/panel-abt-y030xx067a.c | 4 +--- > drivers/gpu/drm/panel/panel-ilitek-ili9322.c | 4 +--- > drivers/gpu/drm/panel/panel-ilitek-ili9341.c | 3 +-- > drivers/gpu/drm/panel/panel-innolux-ej030na.c | 4 +--- > drivers/gpu/drm/panel/panel-lg-lb035q02.c | 4 +--- > drivers/gpu/drm/panel/panel-lg-lg4573.c | 4 +--- > drivers/gpu/drm/panel/panel-nec-nl8048hl11.c | 4 +--- > drivers/gpu/drm/panel/panel-novatek-nt39016.c | 4 +--- > drivers/gpu/drm/panel/panel-samsung-db7430.c | 3 +-- > drivers/gpu/drm/panel/panel-samsung-ld9040.c | 4 +--- > drivers/gpu/drm/panel/panel-samsung-s6d27a1.c | 3 +-- > drivers/gpu/drm/panel/panel-samsung-s6e63m0-spi.c | 3 +-- > drivers/gpu/drm/panel/panel-sitronix-st7789v.c | 4 +--- > drivers/gpu/drm/panel/panel-sony-acx565akm.c | 4 +--- > drivers/gpu/drm/panel/panel-tpo-td028ttec1.c | 4 +--- > drivers/gpu/drm/panel/panel-tpo-td043mtea1.c | 4 +--- > drivers/gpu/drm/panel/panel-tpo-tpg110.c | 3 +-- > drivers/gpu/drm/panel/panel-widechips-ws2401.c | 3 +-- > drivers/gpu/drm/tiny/hx8357d.c | 4 +--- > drivers/gpu/drm/tiny/ili9163.c | 4 +--- > drivers/gpu/drm/tiny/ili9225.c | 4 +--- > drivers/gpu/drm/tiny/ili9341.c | 4 +--- > drivers/gpu/drm/tiny/ili9486.c | 4 +--- > drivers/gpu/drm/tiny/mi0283qt.c | 4 +--- > drivers/gpu/drm/tiny/repaper.c | 4 +--- > drivers/gpu/drm/tiny/st7586.c | 4 +--- > drivers/gpu/drm/tiny/st7735r.c | 4 +--- > drivers/hwmon/adcxx.c | 4 +--- > drivers/hwmon/adt7310.c | 3 +-- > drivers/hwmon/max1111.c | 3 +-- > drivers/hwmon/max31722.c | 4 +--- > drivers/iio/accel/bma400_spi.c | 4 +--- > drivers/iio/accel/bmc150-accel-spi.c | 4 +--- > drivers/iio/accel/bmi088-accel-spi.c | 4 +--- > drivers/iio/accel/kxsd9-spi.c | 4 +--- > drivers/iio/accel/mma7455_spi.c | 4 +--- > drivers/iio/accel/sca3000.c | 4 +--- > drivers/iio/adc/ad7266.c | 4 +--- > drivers/iio/adc/ltc2496.c | 4 +--- > drivers/iio/adc/mcp320x.c | 4 +--- > drivers/iio/adc/mcp3911.c | 4 +--- > drivers/iio/adc/ti-adc12138.c | 4 +--- > drivers/iio/adc/ti-ads7950.c | 4 +--- > drivers/iio/adc/ti-ads8688.c | 4 +--- > drivers/iio/adc/ti-tlc4541.c | 4 +--- > drivers/iio/amplifiers/ad8366.c | 4 +--- > drivers/iio/common/ssp_sensors/ssp_dev.c | 4 +--- > drivers/iio/dac/ad5360.c | 4 +--- > drivers/iio/dac/ad5380.c | 4 +--- > drivers/iio/dac/ad5446.c | 4 +--- > drivers/iio/dac/ad5449.c | 4 +--- > drivers/iio/dac/ad5504.c | 4 +--- > drivers/iio/dac/ad5592r.c | 4 +--- > drivers/iio/dac/ad5624r_spi.c | 4 +--- > drivers/iio/dac/ad5686-spi.c | 4 +--- > drivers/iio/dac/ad5761.c | 4 +--- > drivers/iio/dac/ad5764.c | 4 +--- > drivers/iio/dac/ad5791.c | 4 +--- > drivers/iio/dac/ad8801.c | 4 +--- > drivers/iio/dac/ltc1660.c | 4 +--- > drivers/iio/dac/ltc2632.c | 4 +--- > drivers/iio/dac/mcp4922.c | 4 +--- > drivers/iio/dac/ti-dac082s085.c | 4 +--- > drivers/iio/dac/ti-dac7311.c | 3 +-- > drivers/iio/frequency/adf4350.c | 4 +--- > drivers/iio/gyro/bmg160_spi.c | 4 +--- > drivers/iio/gyro/fxas21002c_spi.c | 4 +--- > drivers/iio/health/afe4403.c | 4 +--- > drivers/iio/magnetometer/bmc150_magn_spi.c | 4 +--- > drivers/iio/magnetometer/hmc5843_spi.c | 4 +--- > drivers/iio/potentiometer/max5487.c | 4 +--- > drivers/iio/pressure/ms5611_spi.c | 4 +--- > drivers/iio/pressure/zpa2326_spi.c | 4 +--- > drivers/input/keyboard/applespi.c | 4 +--- > drivers/input/misc/adxl34x-spi.c | 4 +--- > drivers/input/touchscreen/ads7846.c | 4 +--- > drivers/input/touchscreen/cyttsp4_spi.c | 4 +--- > drivers/input/touchscreen/tsc2005.c | 4 +--- > drivers/leds/leds-cr0014114.c | 4 +--- > drivers/leds/leds-dac124s085.c | 4 +--- > drivers/leds/leds-el15203000.c | 4 +--- > drivers/leds/leds-spi-byte.c | 4 +--- > drivers/media/spi/cxd2880-spi.c | 4 +--- > drivers/media/spi/gs1662.c | 4 +--- > drivers/media/tuners/msi001.c | 3 +-- > drivers/mfd/arizona-spi.c | 4 +--- > drivers/mfd/da9052-spi.c | 3 +-- > drivers/mfd/ezx-pcap.c | 4 +--- > drivers/mfd/madera-spi.c | 4 +--- > drivers/mfd/mc13xxx-spi.c | 3 +-- > drivers/mfd/rsmu_spi.c | 4 +--- > drivers/mfd/stmpe-spi.c | 4 +--- > drivers/mfd/tps65912-spi.c | 4 +--- > drivers/misc/ad525x_dpot-spi.c | 3 +-- > drivers/misc/eeprom/eeprom_93xx46.c | 4 +--- > drivers/misc/lattice-ecp3-config.c | 4 +--- > drivers/misc/lis3lv02d/lis3lv02d_spi.c | 4 +--- > drivers/mmc/host/mmc_spi.c | 3 +-- > drivers/mtd/devices/mchp23k256.c | 4 +--- > drivers/mtd/devices/mchp48l640.c | 4 +--- > drivers/mtd/devices/mtd_dataflash.c | 4 +--- > drivers/mtd/devices/sst25l.c | 4 +--- > drivers/net/can/m_can/tcan4x5x-core.c | 4 +--- > drivers/net/can/spi/hi311x.c | 4 +--- > drivers/net/can/spi/mcp251x.c | 4 +--- > drivers/net/can/spi/mcp251xfd/mcp251xfd-core.c | 4 +--- > drivers/net/dsa/b53/b53_spi.c | 4 +--- > drivers/net/dsa/microchip/ksz8795_spi.c | 4 +--- > drivers/net/dsa/microchip/ksz9477_spi.c | 4 +--- > drivers/net/dsa/sja1105/sja1105_main.c | 6 ++---- > drivers/net/dsa/vitesse-vsc73xx-spi.c | 6 ++---- > drivers/net/ethernet/asix/ax88796c_main.c | 4 +--- > drivers/net/ethernet/micrel/ks8851_spi.c | 4 +--- > drivers/net/ethernet/microchip/enc28j60.c | 4 +--- > drivers/net/ethernet/microchip/encx24j600.c | 4 +--- > drivers/net/ethernet/qualcomm/qca_spi.c | 4 +--- > drivers/net/ethernet/vertexcom/mse102x.c | 4 +--- > drivers/net/ethernet/wiznet/w5100-spi.c | 4 +--- > drivers/net/ieee802154/adf7242.c | 4 +--- > drivers/net/ieee802154/at86rf230.c | 4 +--- > drivers/net/ieee802154/ca8210.c | 6 ++---- > drivers/net/ieee802154/cc2520.c | 4 +--- > drivers/net/ieee802154/mcr20a.c | 4 +--- > drivers/net/ieee802154/mrf24j40.c | 4 +--- > drivers/net/phy/spi_ks8995.c | 4 +--- > drivers/net/wan/slic_ds26522.c | 3 +-- > drivers/net/wireless/intersil/p54/p54spi.c | 4 +--- > drivers/net/wireless/marvell/libertas/if_spi.c | 4 +--- > drivers/net/wireless/microchip/wilc1000/spi.c | 4 +--- > drivers/net/wireless/st/cw1200/cw1200_spi.c | 4 +--- > drivers/net/wireless/ti/wl1251/spi.c | 4 +--- > drivers/net/wireless/ti/wlcore/spi.c | 4 +--- > drivers/nfc/nfcmrvl/spi.c | 3 +-- > drivers/nfc/st-nci/spi.c | 4 +--- > drivers/nfc/st95hf/core.c | 4 +--- > drivers/nfc/trf7970a.c | 4 +--- > drivers/platform/chrome/cros_ec_spi.c | 4 +--- > drivers/platform/olpc/olpc-xo175-ec.c | 4 +--- > drivers/rtc/rtc-ds1302.c | 3 +-- > drivers/rtc/rtc-ds1305.c | 4 +--- > drivers/rtc/rtc-ds1343.c | 4 +--- > drivers/spi/spi-mem.c | 6 ++---- > drivers/spi/spi-slave-system-control.c | 3 +-- > drivers/spi/spi-slave-time.c | 3 +-- > drivers/spi/spi-tle62x0.c | 3 +-- > drivers/spi/spi.c | 11 ++--------- > drivers/spi/spidev.c | 4 +--- > drivers/staging/fbtft/fbtft.h | 3 +-- > drivers/staging/pi433/pi433_if.c | 4 +--- > drivers/staging/wfx/bus_spi.c | 3 +-- > drivers/tty/serial/max3100.c | 5 ++--- > drivers/tty/serial/max310x.c | 3 +-- > drivers/tty/serial/sc16is7xx.c | 4 +--- > drivers/usb/gadget/udc/max3420_udc.c | 4 +--- > drivers/usb/host/max3421-hcd.c | 3 +-- > drivers/video/backlight/ams369fg06.c | 3 +-- > drivers/video/backlight/corgi_lcd.c | 3 +-- > drivers/video/backlight/ili922x.c | 3 +-- > drivers/video/backlight/l4f00242t03.c | 3 +-- > drivers/video/backlight/lms501kf03.c | 3 +-- > drivers/video/backlight/ltv350qv.c | 3 +-- > drivers/video/backlight/tdo24m.c | 3 +-- > drivers/video/backlight/tosa_lcd.c | 4 +--- > drivers/video/backlight/vgg2432a4.c | 4 +--- > drivers/video/fbdev/omap/lcd_mipid.c | 4 +--- > .../omap2/omapfb/displays/panel-lgphilips-lb035q02.c | 4 +--- > .../omap2/omapfb/displays/panel-nec-nl8048hl11.c | 4 +--- > .../omap2/omapfb/displays/panel-sony-acx565akm.c | 4 +--- > .../omap2/omapfb/displays/panel-tpo-td028ttec1.c | 4 +--- > .../omap2/omapfb/displays/panel-tpo-td043mtea1.c | 4 +--- > include/linux/spi/spi.h | 2 +- > sound/pci/hda/cs35l41_hda_spi.c | 4 +--- > sound/soc/codecs/adau1761-spi.c | 3 +-- > sound/soc/codecs/adau1781-spi.c | 3 +-- > sound/soc/codecs/cs35l41-spi.c | 4 +--- > sound/soc/codecs/pcm3168a-spi.c | 4 +--- > sound/soc/codecs/pcm512x-spi.c | 3 +-- > sound/soc/codecs/tlv320aic32x4-spi.c | 4 +--- > sound/soc/codecs/tlv320aic3x-spi.c | 4 +--- > sound/soc/codecs/wm0010.c | 4 +--- > sound/soc/codecs/wm8804-spi.c | 3 +-- > sound/spi/at73c213.c | 4 +--- > 191 files changed, 197 insertions(+), 545 deletions(-) > > diff --git a/drivers/bus/moxtet.c b/drivers/bus/moxtet.c > index fd87a59837fa..5eb0fe73ddc4 100644 > --- a/drivers/bus/moxtet.c > +++ b/drivers/bus/moxtet.c > @@ -815,7 +815,7 @@ static int moxtet_probe(struct spi_device *spi) > return 0; > } > > -static int moxtet_remove(struct spi_device *spi) > +static void moxtet_remove(struct spi_device *spi) > { > struct moxtet *moxtet = spi_get_drvdata(spi); > > @@ -828,8 +828,6 @@ static int moxtet_remove(struct spi_device *spi) > device_for_each_child(moxtet->dev, NULL, __unregister); > > mutex_destroy(&moxtet->lock); > - > - return 0; > } > > static const struct of_device_id moxtet_dt_ids[] = { > diff --git a/drivers/char/tpm/st33zp24/spi.c b/drivers/char/tpm/st33zp24/spi.c > index ccd9e42b8eab..22d184884694 100644 > --- a/drivers/char/tpm/st33zp24/spi.c > +++ b/drivers/char/tpm/st33zp24/spi.c > @@ -381,13 +381,11 @@ static int st33zp24_spi_probe(struct spi_device *dev) > * @param: client, the spi_device description (TPM SPI description). > * @return: 0 in case of success. > */ > -static int st33zp24_spi_remove(struct spi_device *dev) > +static void st33zp24_spi_remove(struct spi_device *dev) > { > struct tpm_chip *chip = spi_get_drvdata(dev); > > st33zp24_remove(chip); > - > - return 0; > } > > static const struct spi_device_id st33zp24_spi_id[] = { > diff --git a/drivers/char/tpm/tpm_tis_spi_main.c b/drivers/char/tpm/tpm_tis_spi_main.c > index aaa59a00eeae..184396b3af50 100644 > --- a/drivers/char/tpm/tpm_tis_spi_main.c > +++ b/drivers/char/tpm/tpm_tis_spi_main.c > @@ -254,13 +254,12 @@ static int tpm_tis_spi_driver_probe(struct spi_device *spi) > > static SIMPLE_DEV_PM_OPS(tpm_tis_pm, tpm_pm_suspend, tpm_tis_spi_resume); > > -static int tpm_tis_spi_remove(struct spi_device *dev) > +static void tpm_tis_spi_remove(struct spi_device *dev) > { > struct tpm_chip *chip = spi_get_drvdata(dev); > > tpm_chip_unregister(chip); > tpm_tis_remove(chip); > - return 0; > } > > static const struct spi_device_id tpm_tis_spi_id[] = { > diff --git a/drivers/clk/clk-lmk04832.c b/drivers/clk/clk-lmk04832.c > index 8f02c0b88000..f416f8bc2898 100644 > --- a/drivers/clk/clk-lmk04832.c > +++ b/drivers/clk/clk-lmk04832.c > @@ -1544,14 +1544,12 @@ static int lmk04832_probe(struct spi_device *spi) > return ret; > } > > -static int lmk04832_remove(struct spi_device *spi) > +static void lmk04832_remove(struct spi_device *spi) > { > struct lmk04832 *lmk = spi_get_drvdata(spi); > > clk_disable_unprepare(lmk->oscin); > of_clk_del_provider(spi->dev.of_node); > - > - return 0; > } > static const struct spi_device_id lmk04832_id[] = { > { "lmk04832", LMK04832 }, > diff --git a/drivers/gpio/gpio-74x164.c b/drivers/gpio/gpio-74x164.c > index 4a55cdf089d6..e00c33310517 100644 > --- a/drivers/gpio/gpio-74x164.c > +++ b/drivers/gpio/gpio-74x164.c > @@ -163,15 +163,13 @@ static int gen_74x164_probe(struct spi_device *spi) > return ret; > } > > -static int gen_74x164_remove(struct spi_device *spi) > +static void gen_74x164_remove(struct spi_device *spi) > { > struct gen_74x164_chip *chip = spi_get_drvdata(spi); > > gpiod_set_value_cansleep(chip->gpiod_oe, 0); > gpiochip_remove(&chip->gpio_chip); > mutex_destroy(&chip->lock); > - > - return 0; > } > > static const struct spi_device_id gen_74x164_spi_ids[] = { > diff --git a/drivers/gpio/gpio-max3191x.c b/drivers/gpio/gpio-max3191x.c > index 51cd6f98d1c7..161c4751c5f7 100644 > --- a/drivers/gpio/gpio-max3191x.c > +++ b/drivers/gpio/gpio-max3191x.c > @@ -443,14 +443,12 @@ static int max3191x_probe(struct spi_device *spi) > return 0; > } > > -static int max3191x_remove(struct spi_device *spi) > +static void max3191x_remove(struct spi_device *spi) > { > struct max3191x_chip *max3191x = spi_get_drvdata(spi); > > gpiochip_remove(&max3191x->gpio); > mutex_destroy(&max3191x->lock); > - > - return 0; > } > > static int __init max3191x_register_driver(struct spi_driver *sdrv) > diff --git a/drivers/gpio/gpio-max7301.c b/drivers/gpio/gpio-max7301.c > index 5862d73bf325..11813f41d460 100644 > --- a/drivers/gpio/gpio-max7301.c > +++ b/drivers/gpio/gpio-max7301.c > @@ -64,11 +64,9 @@ static int max7301_probe(struct spi_device *spi) > return ret; > } > > -static int max7301_remove(struct spi_device *spi) > +static void max7301_remove(struct spi_device *spi) > { > __max730x_remove(&spi->dev); > - > - return 0; > } > > static const struct spi_device_id max7301_id[] = { > diff --git a/drivers/gpio/gpio-mc33880.c b/drivers/gpio/gpio-mc33880.c > index 31d2be1bebc8..cd9b16dbe1a9 100644 > --- a/drivers/gpio/gpio-mc33880.c > +++ b/drivers/gpio/gpio-mc33880.c > @@ -134,7 +134,7 @@ static int mc33880_probe(struct spi_device *spi) > return ret; > } > > -static int mc33880_remove(struct spi_device *spi) > +static void mc33880_remove(struct spi_device *spi) > { > struct mc33880 *mc; > > @@ -142,8 +142,6 @@ static int mc33880_remove(struct spi_device *spi) > > gpiochip_remove(&mc->chip); > mutex_destroy(&mc->lock); > - > - return 0; > } > > static struct spi_driver mc33880_driver = { > diff --git a/drivers/gpio/gpio-pisosr.c b/drivers/gpio/gpio-pisosr.c > index 8e04054cf07e..81a47ae09ff8 100644 > --- a/drivers/gpio/gpio-pisosr.c > +++ b/drivers/gpio/gpio-pisosr.c > @@ -163,15 +163,13 @@ static int pisosr_gpio_probe(struct spi_device *spi) > return 0; > } > > -static int pisosr_gpio_remove(struct spi_device *spi) > +static void pisosr_gpio_remove(struct spi_device *spi) > { > struct pisosr_gpio *gpio = spi_get_drvdata(spi); > > gpiochip_remove(&gpio->chip); > > mutex_destroy(&gpio->lock); > - > - return 0; > } > > static const struct spi_device_id pisosr_gpio_id_table[] = { > diff --git a/drivers/gpu/drm/panel/panel-abt-y030xx067a.c b/drivers/gpu/drm/panel/panel-abt-y030xx067a.c > index f043b484055b..ed626fdc08e8 100644 > --- a/drivers/gpu/drm/panel/panel-abt-y030xx067a.c > +++ b/drivers/gpu/drm/panel/panel-abt-y030xx067a.c > @@ -293,15 +293,13 @@ static int y030xx067a_probe(struct spi_device *spi) > return 0; > } > > -static int y030xx067a_remove(struct spi_device *spi) > +static void y030xx067a_remove(struct spi_device *spi) > { > struct y030xx067a *priv = spi_get_drvdata(spi); > > drm_panel_remove(&priv->panel); > drm_panel_disable(&priv->panel); > drm_panel_unprepare(&priv->panel); > - > - return 0; > } > > static const struct drm_display_mode y030xx067a_modes[] = { > diff --git a/drivers/gpu/drm/panel/panel-ilitek-ili9322.c b/drivers/gpu/drm/panel/panel-ilitek-ili9322.c > index 8e84df9a0033..3dfafa585127 100644 > --- a/drivers/gpu/drm/panel/panel-ilitek-ili9322.c > +++ b/drivers/gpu/drm/panel/panel-ilitek-ili9322.c > @@ -896,14 +896,12 @@ static int ili9322_probe(struct spi_device *spi) > return 0; > } > > -static int ili9322_remove(struct spi_device *spi) > +static void ili9322_remove(struct spi_device *spi) > { > struct ili9322 *ili = spi_get_drvdata(spi); > > ili9322_power_off(ili); > drm_panel_remove(&ili->panel); > - > - return 0; > } > > /* > diff --git a/drivers/gpu/drm/panel/panel-ilitek-ili9341.c b/drivers/gpu/drm/panel/panel-ilitek-ili9341.c > index 2c3378a259b1..a07ef26234e5 100644 > --- a/drivers/gpu/drm/panel/panel-ilitek-ili9341.c > +++ b/drivers/gpu/drm/panel/panel-ilitek-ili9341.c > @@ -728,7 +728,7 @@ static int ili9341_probe(struct spi_device *spi) > return -1; > } > > -static int ili9341_remove(struct spi_device *spi) > +static void ili9341_remove(struct spi_device *spi) > { > const struct spi_device_id *id = spi_get_device_id(spi); > struct ili9341 *ili = spi_get_drvdata(spi); > @@ -741,7 +741,6 @@ static int ili9341_remove(struct spi_device *spi) > drm_dev_unplug(drm); > drm_atomic_helper_shutdown(drm); > } > - return 0; > } > > static void ili9341_shutdown(struct spi_device *spi) > diff --git a/drivers/gpu/drm/panel/panel-innolux-ej030na.c b/drivers/gpu/drm/panel/panel-innolux-ej030na.c > index c558de3f99be..e3b1daa0cb72 100644 > --- a/drivers/gpu/drm/panel/panel-innolux-ej030na.c > +++ b/drivers/gpu/drm/panel/panel-innolux-ej030na.c > @@ -219,15 +219,13 @@ static int ej030na_probe(struct spi_device *spi) > return 0; > } > > -static int ej030na_remove(struct spi_device *spi) > +static void ej030na_remove(struct spi_device *spi) > { > struct ej030na *priv = spi_get_drvdata(spi); > > drm_panel_remove(&priv->panel); > drm_panel_disable(&priv->panel); > drm_panel_unprepare(&priv->panel); > - > - return 0; > } > > static const struct drm_display_mode ej030na_modes[] = { > diff --git a/drivers/gpu/drm/panel/panel-lg-lb035q02.c b/drivers/gpu/drm/panel/panel-lg-lb035q02.c > index f3183b68704f..9d0d4faa3f58 100644 > --- a/drivers/gpu/drm/panel/panel-lg-lb035q02.c > +++ b/drivers/gpu/drm/panel/panel-lg-lb035q02.c > @@ -203,14 +203,12 @@ static int lb035q02_probe(struct spi_device *spi) > return 0; > } > > -static int lb035q02_remove(struct spi_device *spi) > +static void lb035q02_remove(struct spi_device *spi) > { > struct lb035q02_device *lcd = spi_get_drvdata(spi); > > drm_panel_remove(&lcd->panel); > drm_panel_disable(&lcd->panel); > - > - return 0; > } > > static const struct of_device_id lb035q02_of_match[] = { > diff --git a/drivers/gpu/drm/panel/panel-lg-lg4573.c b/drivers/gpu/drm/panel/panel-lg-lg4573.c > index 8e5160af1de5..cf246d15b7b6 100644 > --- a/drivers/gpu/drm/panel/panel-lg-lg4573.c > +++ b/drivers/gpu/drm/panel/panel-lg-lg4573.c > @@ -266,14 +266,12 @@ static int lg4573_probe(struct spi_device *spi) > return 0; > } > > -static int lg4573_remove(struct spi_device *spi) > +static void lg4573_remove(struct spi_device *spi) > { > struct lg4573 *ctx = spi_get_drvdata(spi); > > lg4573_display_off(ctx); > drm_panel_remove(&ctx->panel); > - > - return 0; > } > > static const struct of_device_id lg4573_of_match[] = { > diff --git a/drivers/gpu/drm/panel/panel-nec-nl8048hl11.c b/drivers/gpu/drm/panel/panel-nec-nl8048hl11.c > index 6e5ab1debc8b..81c5c541a351 100644 > --- a/drivers/gpu/drm/panel/panel-nec-nl8048hl11.c > +++ b/drivers/gpu/drm/panel/panel-nec-nl8048hl11.c > @@ -212,15 +212,13 @@ static int nl8048_probe(struct spi_device *spi) > return 0; > } > > -static int nl8048_remove(struct spi_device *spi) > +static void nl8048_remove(struct spi_device *spi) > { > struct nl8048_panel *lcd = spi_get_drvdata(spi); > > drm_panel_remove(&lcd->panel); > drm_panel_disable(&lcd->panel); > drm_panel_unprepare(&lcd->panel); > - > - return 0; > } > > static const struct of_device_id nl8048_of_match[] = { > diff --git a/drivers/gpu/drm/panel/panel-novatek-nt39016.c b/drivers/gpu/drm/panel/panel-novatek-nt39016.c > index d036853db865..f58cfb10b58a 100644 > --- a/drivers/gpu/drm/panel/panel-novatek-nt39016.c > +++ b/drivers/gpu/drm/panel/panel-novatek-nt39016.c > @@ -292,7 +292,7 @@ static int nt39016_probe(struct spi_device *spi) > return 0; > } > > -static int nt39016_remove(struct spi_device *spi) > +static void nt39016_remove(struct spi_device *spi) > { > struct nt39016 *panel = spi_get_drvdata(spi); > > @@ -300,8 +300,6 @@ static int nt39016_remove(struct spi_device *spi) > > nt39016_disable(&panel->drm_panel); > nt39016_unprepare(&panel->drm_panel); > - > - return 0; > } > > static const struct drm_display_mode kd035g6_display_modes[] = { > diff --git a/drivers/gpu/drm/panel/panel-samsung-db7430.c b/drivers/gpu/drm/panel/panel-samsung-db7430.c > index ead479719f00..04640c5256a8 100644 > --- a/drivers/gpu/drm/panel/panel-samsung-db7430.c > +++ b/drivers/gpu/drm/panel/panel-samsung-db7430.c > @@ -314,12 +314,11 @@ static int db7430_probe(struct spi_device *spi) > return 0; > } > > -static int db7430_remove(struct spi_device *spi) > +static void db7430_remove(struct spi_device *spi) > { > struct db7430 *db = spi_get_drvdata(spi); > > drm_panel_remove(&db->panel); > - return 0; > } > > /* > diff --git a/drivers/gpu/drm/panel/panel-samsung-ld9040.c b/drivers/gpu/drm/panel/panel-samsung-ld9040.c > index c4b388850a13..01eb211f32f7 100644 > --- a/drivers/gpu/drm/panel/panel-samsung-ld9040.c > +++ b/drivers/gpu/drm/panel/panel-samsung-ld9040.c > @@ -358,14 +358,12 @@ static int ld9040_probe(struct spi_device *spi) > return 0; > } > > -static int ld9040_remove(struct spi_device *spi) > +static void ld9040_remove(struct spi_device *spi) > { > struct ld9040 *ctx = spi_get_drvdata(spi); > > ld9040_power_off(ctx); > drm_panel_remove(&ctx->panel); > - > - return 0; > } > > static const struct of_device_id ld9040_of_match[] = { > diff --git a/drivers/gpu/drm/panel/panel-samsung-s6d27a1.c b/drivers/gpu/drm/panel/panel-samsung-s6d27a1.c > index 1696ceb36aa0..2adb223a895c 100644 > --- a/drivers/gpu/drm/panel/panel-samsung-s6d27a1.c > +++ b/drivers/gpu/drm/panel/panel-samsung-s6d27a1.c > @@ -291,12 +291,11 @@ static int s6d27a1_probe(struct spi_device *spi) > return 0; > } > > -static int s6d27a1_remove(struct spi_device *spi) > +static void s6d27a1_remove(struct spi_device *spi) > { > struct s6d27a1 *ctx = spi_get_drvdata(spi); > > drm_panel_remove(&ctx->panel); > - return 0; > } > > static const struct of_device_id s6d27a1_match[] = { > diff --git a/drivers/gpu/drm/panel/panel-samsung-s6e63m0-spi.c b/drivers/gpu/drm/panel/panel-samsung-s6e63m0-spi.c > index c178d962b0d5..d99afcc672ca 100644 > --- a/drivers/gpu/drm/panel/panel-samsung-s6e63m0-spi.c > +++ b/drivers/gpu/drm/panel/panel-samsung-s6e63m0-spi.c > @@ -62,10 +62,9 @@ static int s6e63m0_spi_probe(struct spi_device *spi) > s6e63m0_spi_dcs_write, false); > } > > -static int s6e63m0_spi_remove(struct spi_device *spi) > +static void s6e63m0_spi_remove(struct spi_device *spi) > { > s6e63m0_remove(&spi->dev); > - return 0; > } > > static const struct of_device_id s6e63m0_spi_of_match[] = { > diff --git a/drivers/gpu/drm/panel/panel-sitronix-st7789v.c b/drivers/gpu/drm/panel/panel-sitronix-st7789v.c > index 61e565524542..bbc4569cbcdc 100644 > --- a/drivers/gpu/drm/panel/panel-sitronix-st7789v.c > +++ b/drivers/gpu/drm/panel/panel-sitronix-st7789v.c > @@ -387,13 +387,11 @@ static int st7789v_probe(struct spi_device *spi) > return 0; > } > > -static int st7789v_remove(struct spi_device *spi) > +static void st7789v_remove(struct spi_device *spi) > { > struct st7789v *ctx = spi_get_drvdata(spi); > > drm_panel_remove(&ctx->panel); > - > - return 0; > } > > static const struct of_device_id st7789v_of_match[] = { > diff --git a/drivers/gpu/drm/panel/panel-sony-acx565akm.c b/drivers/gpu/drm/panel/panel-sony-acx565akm.c > index ba0b3ead150f..0d7541a33f87 100644 > --- a/drivers/gpu/drm/panel/panel-sony-acx565akm.c > +++ b/drivers/gpu/drm/panel/panel-sony-acx565akm.c > @@ -655,7 +655,7 @@ static int acx565akm_probe(struct spi_device *spi) > return 0; > } > > -static int acx565akm_remove(struct spi_device *spi) > +static void acx565akm_remove(struct spi_device *spi) > { > struct acx565akm_panel *lcd = spi_get_drvdata(spi); > > @@ -666,8 +666,6 @@ static int acx565akm_remove(struct spi_device *spi) > > drm_panel_disable(&lcd->panel); > drm_panel_unprepare(&lcd->panel); > - > - return 0; > } > > static const struct of_device_id acx565akm_of_match[] = { > diff --git a/drivers/gpu/drm/panel/panel-tpo-td028ttec1.c b/drivers/gpu/drm/panel/panel-tpo-td028ttec1.c > index ba0c00d1a001..4dbf8b88f264 100644 > --- a/drivers/gpu/drm/panel/panel-tpo-td028ttec1.c > +++ b/drivers/gpu/drm/panel/panel-tpo-td028ttec1.c > @@ -350,15 +350,13 @@ static int td028ttec1_probe(struct spi_device *spi) > return 0; > } > > -static int td028ttec1_remove(struct spi_device *spi) > +static void td028ttec1_remove(struct spi_device *spi) > { > struct td028ttec1_panel *lcd = spi_get_drvdata(spi); > > drm_panel_remove(&lcd->panel); > drm_panel_disable(&lcd->panel); > drm_panel_unprepare(&lcd->panel); > - > - return 0; > } > > static const struct of_device_id td028ttec1_of_match[] = { > diff --git a/drivers/gpu/drm/panel/panel-tpo-td043mtea1.c b/drivers/gpu/drm/panel/panel-tpo-td043mtea1.c > index 1866cdb8f9c1..cf4609bb9b1d 100644 > --- a/drivers/gpu/drm/panel/panel-tpo-td043mtea1.c > +++ b/drivers/gpu/drm/panel/panel-tpo-td043mtea1.c > @@ -463,7 +463,7 @@ static int td043mtea1_probe(struct spi_device *spi) > return 0; > } > > -static int td043mtea1_remove(struct spi_device *spi) > +static void td043mtea1_remove(struct spi_device *spi) > { > struct td043mtea1_panel *lcd = spi_get_drvdata(spi); > > @@ -472,8 +472,6 @@ static int td043mtea1_remove(struct spi_device *spi) > drm_panel_unprepare(&lcd->panel); > > sysfs_remove_group(&spi->dev.kobj, &td043mtea1_attr_group); > - > - return 0; > } > > static const struct of_device_id td043mtea1_of_match[] = { > diff --git a/drivers/gpu/drm/panel/panel-tpo-tpg110.c b/drivers/gpu/drm/panel/panel-tpo-tpg110.c > index e3791dad6830..0b1f5a11a055 100644 > --- a/drivers/gpu/drm/panel/panel-tpo-tpg110.c > +++ b/drivers/gpu/drm/panel/panel-tpo-tpg110.c > @@ -450,12 +450,11 @@ static int tpg110_probe(struct spi_device *spi) > return 0; > } > > -static int tpg110_remove(struct spi_device *spi) > +static void tpg110_remove(struct spi_device *spi) > { > struct tpg110 *tpg = spi_get_drvdata(spi); > > drm_panel_remove(&tpg->panel); > - return 0; > } > > static const struct of_device_id tpg110_match[] = { > diff --git a/drivers/gpu/drm/panel/panel-widechips-ws2401.c b/drivers/gpu/drm/panel/panel-widechips-ws2401.c > index 8bc976f54b80..236f3cb2b594 100644 > --- a/drivers/gpu/drm/panel/panel-widechips-ws2401.c > +++ b/drivers/gpu/drm/panel/panel-widechips-ws2401.c > @@ -407,12 +407,11 @@ static int ws2401_probe(struct spi_device *spi) > return 0; > } > > -static int ws2401_remove(struct spi_device *spi) > +static void ws2401_remove(struct spi_device *spi) > { > struct ws2401 *ws = spi_get_drvdata(spi); > > drm_panel_remove(&ws->panel); > - return 0; > } > > /* > diff --git a/drivers/gpu/drm/tiny/hx8357d.c b/drivers/gpu/drm/tiny/hx8357d.c > index 9b33c05732aa..ebb025543f8d 100644 > --- a/drivers/gpu/drm/tiny/hx8357d.c > +++ b/drivers/gpu/drm/tiny/hx8357d.c > @@ -263,14 +263,12 @@ static int hx8357d_probe(struct spi_device *spi) > return 0; > } > > -static int hx8357d_remove(struct spi_device *spi) > +static void hx8357d_remove(struct spi_device *spi) > { > struct drm_device *drm = spi_get_drvdata(spi); > > drm_dev_unplug(drm); > drm_atomic_helper_shutdown(drm); > - > - return 0; > } > > static void hx8357d_shutdown(struct spi_device *spi) > diff --git a/drivers/gpu/drm/tiny/ili9163.c b/drivers/gpu/drm/tiny/ili9163.c > index bcc181351236..fc8ed245b0bc 100644 > --- a/drivers/gpu/drm/tiny/ili9163.c > +++ b/drivers/gpu/drm/tiny/ili9163.c > @@ -193,14 +193,12 @@ static int ili9163_probe(struct spi_device *spi) > return 0; > } > > -static int ili9163_remove(struct spi_device *spi) > +static void ili9163_remove(struct spi_device *spi) > { > struct drm_device *drm = spi_get_drvdata(spi); > > drm_dev_unplug(drm); > drm_atomic_helper_shutdown(drm); > - > - return 0; > } > > static void ili9163_shutdown(struct spi_device *spi) > diff --git a/drivers/gpu/drm/tiny/ili9225.c b/drivers/gpu/drm/tiny/ili9225.c > index 976d3209f164..cc92eb9f2a07 100644 > --- a/drivers/gpu/drm/tiny/ili9225.c > +++ b/drivers/gpu/drm/tiny/ili9225.c > @@ -411,14 +411,12 @@ static int ili9225_probe(struct spi_device *spi) > return 0; > } > > -static int ili9225_remove(struct spi_device *spi) > +static void ili9225_remove(struct spi_device *spi) > { > struct drm_device *drm = spi_get_drvdata(spi); > > drm_dev_unplug(drm); > drm_atomic_helper_shutdown(drm); > - > - return 0; > } > > static void ili9225_shutdown(struct spi_device *spi) > diff --git a/drivers/gpu/drm/tiny/ili9341.c b/drivers/gpu/drm/tiny/ili9341.c > index 37e0c33399c8..5b8cc770ee7b 100644 > --- a/drivers/gpu/drm/tiny/ili9341.c > +++ b/drivers/gpu/drm/tiny/ili9341.c > @@ -225,14 +225,12 @@ static int ili9341_probe(struct spi_device *spi) > return 0; > } > > -static int ili9341_remove(struct spi_device *spi) > +static void ili9341_remove(struct spi_device *spi) > { > struct drm_device *drm = spi_get_drvdata(spi); > > drm_dev_unplug(drm); > drm_atomic_helper_shutdown(drm); > - > - return 0; > } > > static void ili9341_shutdown(struct spi_device *spi) > diff --git a/drivers/gpu/drm/tiny/ili9486.c b/drivers/gpu/drm/tiny/ili9486.c > index e9a63f4b2993..6d655e18e0aa 100644 > --- a/drivers/gpu/drm/tiny/ili9486.c > +++ b/drivers/gpu/drm/tiny/ili9486.c > @@ -243,14 +243,12 @@ static int ili9486_probe(struct spi_device *spi) > return 0; > } > > -static int ili9486_remove(struct spi_device *spi) > +static void ili9486_remove(struct spi_device *spi) > { > struct drm_device *drm = spi_get_drvdata(spi); > > drm_dev_unplug(drm); > drm_atomic_helper_shutdown(drm); > - > - return 0; > } > > static void ili9486_shutdown(struct spi_device *spi) > diff --git a/drivers/gpu/drm/tiny/mi0283qt.c b/drivers/gpu/drm/tiny/mi0283qt.c > index 023de49e7a8e..5e060f6910bb 100644 > --- a/drivers/gpu/drm/tiny/mi0283qt.c > +++ b/drivers/gpu/drm/tiny/mi0283qt.c > @@ -233,14 +233,12 @@ static int mi0283qt_probe(struct spi_device *spi) > return 0; > } > > -static int mi0283qt_remove(struct spi_device *spi) > +static void mi0283qt_remove(struct spi_device *spi) > { > struct drm_device *drm = spi_get_drvdata(spi); > > drm_dev_unplug(drm); > drm_atomic_helper_shutdown(drm); > - > - return 0; > } > > static void mi0283qt_shutdown(struct spi_device *spi) > diff --git a/drivers/gpu/drm/tiny/repaper.c b/drivers/gpu/drm/tiny/repaper.c > index 97a775c48cea..beeeb170d0b1 100644 > --- a/drivers/gpu/drm/tiny/repaper.c > +++ b/drivers/gpu/drm/tiny/repaper.c > @@ -1140,14 +1140,12 @@ static int repaper_probe(struct spi_device *spi) > return 0; > } > > -static int repaper_remove(struct spi_device *spi) > +static void repaper_remove(struct spi_device *spi) > { > struct drm_device *drm = spi_get_drvdata(spi); > > drm_dev_unplug(drm); > drm_atomic_helper_shutdown(drm); > - > - return 0; > } > > static void repaper_shutdown(struct spi_device *spi) > diff --git a/drivers/gpu/drm/tiny/st7586.c b/drivers/gpu/drm/tiny/st7586.c > index 51b9b9fb3ead..3f38faa1cd8c 100644 > --- a/drivers/gpu/drm/tiny/st7586.c > +++ b/drivers/gpu/drm/tiny/st7586.c > @@ -360,14 +360,12 @@ static int st7586_probe(struct spi_device *spi) > return 0; > } > > -static int st7586_remove(struct spi_device *spi) > +static void st7586_remove(struct spi_device *spi) > { > struct drm_device *drm = spi_get_drvdata(spi); > > drm_dev_unplug(drm); > drm_atomic_helper_shutdown(drm); > - > - return 0; > } > > static void st7586_shutdown(struct spi_device *spi) > diff --git a/drivers/gpu/drm/tiny/st7735r.c b/drivers/gpu/drm/tiny/st7735r.c > index fc40dd10efa8..29d618093e94 100644 > --- a/drivers/gpu/drm/tiny/st7735r.c > +++ b/drivers/gpu/drm/tiny/st7735r.c > @@ -247,14 +247,12 @@ static int st7735r_probe(struct spi_device *spi) > return 0; > } > > -static int st7735r_remove(struct spi_device *spi) > +static void st7735r_remove(struct spi_device *spi) > { > struct drm_device *drm = spi_get_drvdata(spi); > > drm_dev_unplug(drm); > drm_atomic_helper_shutdown(drm); > - > - return 0; > } > > static void st7735r_shutdown(struct spi_device *spi) > diff --git a/drivers/hwmon/adcxx.c b/drivers/hwmon/adcxx.c > index e5bc5ce09f4e..de37bce24fa6 100644 > --- a/drivers/hwmon/adcxx.c > +++ b/drivers/hwmon/adcxx.c > @@ -194,7 +194,7 @@ static int adcxx_probe(struct spi_device *spi) > return status; > } > > -static int adcxx_remove(struct spi_device *spi) > +static void adcxx_remove(struct spi_device *spi) > { > struct adcxx *adc = spi_get_drvdata(spi); > int i; > @@ -205,8 +205,6 @@ static int adcxx_remove(struct spi_device *spi) > device_remove_file(&spi->dev, &ad_input[i].dev_attr); > > mutex_unlock(&adc->lock); > - > - return 0; > } > > static const struct spi_device_id adcxx_ids[] = { > diff --git a/drivers/hwmon/adt7310.c b/drivers/hwmon/adt7310.c > index c40cac16af68..832d9ec64934 100644 > --- a/drivers/hwmon/adt7310.c > +++ b/drivers/hwmon/adt7310.c > @@ -88,10 +88,9 @@ static int adt7310_spi_probe(struct spi_device *spi) > &adt7310_spi_ops); > } > > -static int adt7310_spi_remove(struct spi_device *spi) > +static void adt7310_spi_remove(struct spi_device *spi) > { > adt7x10_remove(&spi->dev, spi->irq); > - return 0; > } > > static const struct spi_device_id adt7310_id[] = { > diff --git a/drivers/hwmon/max1111.c b/drivers/hwmon/max1111.c > index 5fcfd57df61e..4c5487aeb3cf 100644 > --- a/drivers/hwmon/max1111.c > +++ b/drivers/hwmon/max1111.c > @@ -254,7 +254,7 @@ static int max1111_probe(struct spi_device *spi) > return err; > } > > -static int max1111_remove(struct spi_device *spi) > +static void max1111_remove(struct spi_device *spi) > { > struct max1111_data *data = spi_get_drvdata(spi); > > @@ -265,7 +265,6 @@ static int max1111_remove(struct spi_device *spi) > sysfs_remove_group(&spi->dev.kobj, &max1110_attr_group); > sysfs_remove_group(&spi->dev.kobj, &max1111_attr_group); > mutex_destroy(&data->drvdata_lock); > - return 0; > } > > static const struct spi_device_id max1111_ids[] = { > diff --git a/drivers/hwmon/max31722.c b/drivers/hwmon/max31722.c > index 4cf4fe6809a3..93e048ee4955 100644 > --- a/drivers/hwmon/max31722.c > +++ b/drivers/hwmon/max31722.c > @@ -100,7 +100,7 @@ static int max31722_probe(struct spi_device *spi) > return 0; > } > > -static int max31722_remove(struct spi_device *spi) > +static void max31722_remove(struct spi_device *spi) > { > struct max31722_data *data = spi_get_drvdata(spi); > int ret; > @@ -111,8 +111,6 @@ static int max31722_remove(struct spi_device *spi) > if (ret) > /* There is nothing we can do about this ... */ > dev_warn(&spi->dev, "Failed to put device in stand-by mode\n"); > - > - return 0; > } > > static int __maybe_unused max31722_suspend(struct device *dev) > diff --git a/drivers/iio/accel/bma400_spi.c b/drivers/iio/accel/bma400_spi.c > index 9f622e37477b..9040a717b247 100644 > --- a/drivers/iio/accel/bma400_spi.c > +++ b/drivers/iio/accel/bma400_spi.c > @@ -87,11 +87,9 @@ static int bma400_spi_probe(struct spi_device *spi) > return bma400_probe(&spi->dev, regmap, id->name); > } > > -static int bma400_spi_remove(struct spi_device *spi) > +static void bma400_spi_remove(struct spi_device *spi) > { > bma400_remove(&spi->dev); > - > - return 0; > } > > static const struct spi_device_id bma400_spi_ids[] = { > diff --git a/drivers/iio/accel/bmc150-accel-spi.c b/drivers/iio/accel/bmc150-accel-spi.c > index 11559567cb39..80007cc2d044 100644 > --- a/drivers/iio/accel/bmc150-accel-spi.c > +++ b/drivers/iio/accel/bmc150-accel-spi.c > @@ -35,11 +35,9 @@ static int bmc150_accel_probe(struct spi_device *spi) > true); > } > > -static int bmc150_accel_remove(struct spi_device *spi) > +static void bmc150_accel_remove(struct spi_device *spi) > { > bmc150_accel_core_remove(&spi->dev); > - > - return 0; > } > > static const struct acpi_device_id bmc150_accel_acpi_match[] = { > diff --git a/drivers/iio/accel/bmi088-accel-spi.c b/drivers/iio/accel/bmi088-accel-spi.c > index 758ad2f12896..06d99d9949f3 100644 > --- a/drivers/iio/accel/bmi088-accel-spi.c > +++ b/drivers/iio/accel/bmi088-accel-spi.c > @@ -56,11 +56,9 @@ static int bmi088_accel_probe(struct spi_device *spi) > true); > } > > -static int bmi088_accel_remove(struct spi_device *spi) > +static void bmi088_accel_remove(struct spi_device *spi) > { > bmi088_accel_core_remove(&spi->dev); > - > - return 0; > } > > static const struct spi_device_id bmi088_accel_id[] = { > diff --git a/drivers/iio/accel/kxsd9-spi.c b/drivers/iio/accel/kxsd9-spi.c > index 441e6b764281..57c451cfb9e5 100644 > --- a/drivers/iio/accel/kxsd9-spi.c > +++ b/drivers/iio/accel/kxsd9-spi.c > @@ -32,11 +32,9 @@ static int kxsd9_spi_probe(struct spi_device *spi) > spi_get_device_id(spi)->name); > } > > -static int kxsd9_spi_remove(struct spi_device *spi) > +static void kxsd9_spi_remove(struct spi_device *spi) > { > kxsd9_common_remove(&spi->dev); > - > - return 0; > } > > static const struct spi_device_id kxsd9_spi_id[] = { > diff --git a/drivers/iio/accel/mma7455_spi.c b/drivers/iio/accel/mma7455_spi.c > index ecf690692dcc..b746031551a3 100644 > --- a/drivers/iio/accel/mma7455_spi.c > +++ b/drivers/iio/accel/mma7455_spi.c > @@ -22,11 +22,9 @@ static int mma7455_spi_probe(struct spi_device *spi) > return mma7455_core_probe(&spi->dev, regmap, id->name); > } > > -static int mma7455_spi_remove(struct spi_device *spi) > +static void mma7455_spi_remove(struct spi_device *spi) > { > mma7455_core_remove(&spi->dev); > - > - return 0; > } > > static const struct spi_device_id mma7455_spi_ids[] = { > diff --git a/drivers/iio/accel/sca3000.c b/drivers/iio/accel/sca3000.c > index 43ecacbdc95a..83c81072511e 100644 > --- a/drivers/iio/accel/sca3000.c > +++ b/drivers/iio/accel/sca3000.c > @@ -1524,7 +1524,7 @@ static int sca3000_stop_all_interrupts(struct sca3000_state *st) > return ret; > } > > -static int sca3000_remove(struct spi_device *spi) > +static void sca3000_remove(struct spi_device *spi) > { > struct iio_dev *indio_dev = spi_get_drvdata(spi); > struct sca3000_state *st = iio_priv(indio_dev); > @@ -1535,8 +1535,6 @@ static int sca3000_remove(struct spi_device *spi) > sca3000_stop_all_interrupts(st); > if (spi->irq) > free_irq(spi->irq, indio_dev); > - > - return 0; > } > > static const struct spi_device_id sca3000_id[] = { > diff --git a/drivers/iio/adc/ad7266.c b/drivers/iio/adc/ad7266.c > index 1d345d66742d..c17d9b5fbaf6 100644 > --- a/drivers/iio/adc/ad7266.c > +++ b/drivers/iio/adc/ad7266.c > @@ -479,7 +479,7 @@ static int ad7266_probe(struct spi_device *spi) > return ret; > } > > -static int ad7266_remove(struct spi_device *spi) > +static void ad7266_remove(struct spi_device *spi) > { > struct iio_dev *indio_dev = spi_get_drvdata(spi); > struct ad7266_state *st = iio_priv(indio_dev); > @@ -488,8 +488,6 @@ static int ad7266_remove(struct spi_device *spi) > iio_triggered_buffer_cleanup(indio_dev); > if (!IS_ERR(st->reg)) > regulator_disable(st->reg); > - > - return 0; > } > > static const struct spi_device_id ad7266_id[] = { > diff --git a/drivers/iio/adc/ltc2496.c b/drivers/iio/adc/ltc2496.c > index dd956a7c216e..5a55f79f2574 100644 > --- a/drivers/iio/adc/ltc2496.c > +++ b/drivers/iio/adc/ltc2496.c > @@ -78,13 +78,11 @@ static int ltc2496_probe(struct spi_device *spi) > return ltc2497core_probe(dev, indio_dev); > } > > -static int ltc2496_remove(struct spi_device *spi) > +static void ltc2496_remove(struct spi_device *spi) > { > struct iio_dev *indio_dev = spi_get_drvdata(spi); > > ltc2497core_remove(indio_dev); > - > - return 0; > } > > static const struct of_device_id ltc2496_of_match[] = { > diff --git a/drivers/iio/adc/mcp320x.c b/drivers/iio/adc/mcp320x.c > index 8d1cff28cae0..b4c69acb33e3 100644 > --- a/drivers/iio/adc/mcp320x.c > +++ b/drivers/iio/adc/mcp320x.c > @@ -459,15 +459,13 @@ static int mcp320x_probe(struct spi_device *spi) > return ret; > } > > -static int mcp320x_remove(struct spi_device *spi) > +static void mcp320x_remove(struct spi_device *spi) > { > struct iio_dev *indio_dev = spi_get_drvdata(spi); > struct mcp320x *adc = iio_priv(indio_dev); > > iio_device_unregister(indio_dev); > regulator_disable(adc->reg); > - > - return 0; > } > > static const struct of_device_id mcp320x_dt_ids[] = { > diff --git a/drivers/iio/adc/mcp3911.c b/drivers/iio/adc/mcp3911.c > index 13535f148c4c..1cb4590fe412 100644 > --- a/drivers/iio/adc/mcp3911.c > +++ b/drivers/iio/adc/mcp3911.c > @@ -321,7 +321,7 @@ static int mcp3911_probe(struct spi_device *spi) > return ret; > } > > -static int mcp3911_remove(struct spi_device *spi) > +static void mcp3911_remove(struct spi_device *spi) > { > struct iio_dev *indio_dev = spi_get_drvdata(spi); > struct mcp3911 *adc = iio_priv(indio_dev); > @@ -331,8 +331,6 @@ static int mcp3911_remove(struct spi_device *spi) > clk_disable_unprepare(adc->clki); > if (adc->vref) > regulator_disable(adc->vref); > - > - return 0; > } > > static const struct of_device_id mcp3911_dt_ids[] = { > diff --git a/drivers/iio/adc/ti-adc12138.c b/drivers/iio/adc/ti-adc12138.c > index 6eb62b564dae..59d75d09604f 100644 > --- a/drivers/iio/adc/ti-adc12138.c > +++ b/drivers/iio/adc/ti-adc12138.c > @@ -503,7 +503,7 @@ static int adc12138_probe(struct spi_device *spi) > return ret; > } > > -static int adc12138_remove(struct spi_device *spi) > +static void adc12138_remove(struct spi_device *spi) > { > struct iio_dev *indio_dev = spi_get_drvdata(spi); > struct adc12138 *adc = iio_priv(indio_dev); > @@ -514,8 +514,6 @@ static int adc12138_remove(struct spi_device *spi) > regulator_disable(adc->vref_n); > regulator_disable(adc->vref_p); > clk_disable_unprepare(adc->cclk); > - > - return 0; > } > > static const struct of_device_id adc12138_dt_ids[] = { > diff --git a/drivers/iio/adc/ti-ads7950.c b/drivers/iio/adc/ti-ads7950.c > index a7efa3eada2c..e3658b969c5b 100644 > --- a/drivers/iio/adc/ti-ads7950.c > +++ b/drivers/iio/adc/ti-ads7950.c > @@ -662,7 +662,7 @@ static int ti_ads7950_probe(struct spi_device *spi) > return ret; > } > > -static int ti_ads7950_remove(struct spi_device *spi) > +static void ti_ads7950_remove(struct spi_device *spi) > { > struct iio_dev *indio_dev = spi_get_drvdata(spi); > struct ti_ads7950_state *st = iio_priv(indio_dev); > @@ -672,8 +672,6 @@ static int ti_ads7950_remove(struct spi_device *spi) > iio_triggered_buffer_cleanup(indio_dev); > regulator_disable(st->reg); > mutex_destroy(&st->slock); > - > - return 0; > } > > static const struct spi_device_id ti_ads7950_id[] = { > diff --git a/drivers/iio/adc/ti-ads8688.c b/drivers/iio/adc/ti-ads8688.c > index 2e24717d7f55..22c2583eedd0 100644 > --- a/drivers/iio/adc/ti-ads8688.c > +++ b/drivers/iio/adc/ti-ads8688.c > @@ -479,7 +479,7 @@ static int ads8688_probe(struct spi_device *spi) > return ret; > } > > -static int ads8688_remove(struct spi_device *spi) > +static void ads8688_remove(struct spi_device *spi) > { > struct iio_dev *indio_dev = spi_get_drvdata(spi); > struct ads8688_state *st = iio_priv(indio_dev); > @@ -489,8 +489,6 @@ static int ads8688_remove(struct spi_device *spi) > > if (!IS_ERR(st->reg)) > regulator_disable(st->reg); > - > - return 0; > } > > static const struct spi_device_id ads8688_id[] = { > diff --git a/drivers/iio/adc/ti-tlc4541.c b/drivers/iio/adc/ti-tlc4541.c > index 403b787f9f7e..2406eda9dfc6 100644 > --- a/drivers/iio/adc/ti-tlc4541.c > +++ b/drivers/iio/adc/ti-tlc4541.c > @@ -224,7 +224,7 @@ static int tlc4541_probe(struct spi_device *spi) > return ret; > } > > -static int tlc4541_remove(struct spi_device *spi) > +static void tlc4541_remove(struct spi_device *spi) > { > struct iio_dev *indio_dev = spi_get_drvdata(spi); > struct tlc4541_state *st = iio_priv(indio_dev); > @@ -232,8 +232,6 @@ static int tlc4541_remove(struct spi_device *spi) > iio_device_unregister(indio_dev); > iio_triggered_buffer_cleanup(indio_dev); > regulator_disable(st->reg); > - > - return 0; > } > > static const struct of_device_id tlc4541_dt_ids[] = { > diff --git a/drivers/iio/amplifiers/ad8366.c b/drivers/iio/amplifiers/ad8366.c > index cfcf18a0bce8..1134ae12e531 100644 > --- a/drivers/iio/amplifiers/ad8366.c > +++ b/drivers/iio/amplifiers/ad8366.c > @@ -298,7 +298,7 @@ static int ad8366_probe(struct spi_device *spi) > return ret; > } > > -static int ad8366_remove(struct spi_device *spi) > +static void ad8366_remove(struct spi_device *spi) > { > struct iio_dev *indio_dev = spi_get_drvdata(spi); > struct ad8366_state *st = iio_priv(indio_dev); > @@ -308,8 +308,6 @@ static int ad8366_remove(struct spi_device *spi) > > if (!IS_ERR(reg)) > regulator_disable(reg); > - > - return 0; > } > > static const struct spi_device_id ad8366_id[] = { > diff --git a/drivers/iio/common/ssp_sensors/ssp_dev.c b/drivers/iio/common/ssp_sensors/ssp_dev.c > index 1aee87100038..eafaf4529df5 100644 > --- a/drivers/iio/common/ssp_sensors/ssp_dev.c > +++ b/drivers/iio/common/ssp_sensors/ssp_dev.c > @@ -586,7 +586,7 @@ static int ssp_probe(struct spi_device *spi) > return ret; > } > > -static int ssp_remove(struct spi_device *spi) > +static void ssp_remove(struct spi_device *spi) > { > struct ssp_data *data = spi_get_drvdata(spi); > > @@ -608,8 +608,6 @@ static int ssp_remove(struct spi_device *spi) > mutex_destroy(&data->pending_lock); > > mfd_remove_devices(&spi->dev); > - > - return 0; > } > > #ifdef CONFIG_PM_SLEEP > diff --git a/drivers/iio/dac/ad5360.c b/drivers/iio/dac/ad5360.c > index 2d3b14c407d8..ecbc6a51d60f 100644 > --- a/drivers/iio/dac/ad5360.c > +++ b/drivers/iio/dac/ad5360.c > @@ -521,7 +521,7 @@ static int ad5360_probe(struct spi_device *spi) > return ret; > } > > -static int ad5360_remove(struct spi_device *spi) > +static void ad5360_remove(struct spi_device *spi) > { > struct iio_dev *indio_dev = spi_get_drvdata(spi); > struct ad5360_state *st = iio_priv(indio_dev); > @@ -531,8 +531,6 @@ static int ad5360_remove(struct spi_device *spi) > kfree(indio_dev->channels); > > regulator_bulk_disable(st->chip_info->num_vrefs, st->vref_reg); > - > - return 0; > } > > static const struct spi_device_id ad5360_ids[] = { > diff --git a/drivers/iio/dac/ad5380.c b/drivers/iio/dac/ad5380.c > index e38860a6a9f3..82e1d9bd773e 100644 > --- a/drivers/iio/dac/ad5380.c > +++ b/drivers/iio/dac/ad5380.c > @@ -488,11 +488,9 @@ static int ad5380_spi_probe(struct spi_device *spi) > return ad5380_probe(&spi->dev, regmap, id->driver_data, id->name); > } > > -static int ad5380_spi_remove(struct spi_device *spi) > +static void ad5380_spi_remove(struct spi_device *spi) > { > ad5380_remove(&spi->dev); > - > - return 0; > } > > static const struct spi_device_id ad5380_spi_ids[] = { > diff --git a/drivers/iio/dac/ad5446.c b/drivers/iio/dac/ad5446.c > index 1c9b54c012a7..14cfabacbea5 100644 > --- a/drivers/iio/dac/ad5446.c > +++ b/drivers/iio/dac/ad5446.c > @@ -491,11 +491,9 @@ static int ad5446_spi_probe(struct spi_device *spi) > &ad5446_spi_chip_info[id->driver_data]); > } > > -static int ad5446_spi_remove(struct spi_device *spi) > +static void ad5446_spi_remove(struct spi_device *spi) > { > ad5446_remove(&spi->dev); > - > - return 0; > } > > static struct spi_driver ad5446_spi_driver = { > diff --git a/drivers/iio/dac/ad5449.c b/drivers/iio/dac/ad5449.c > index f5e93c6acc9d..bad9bdaafa94 100644 > --- a/drivers/iio/dac/ad5449.c > +++ b/drivers/iio/dac/ad5449.c > @@ -330,7 +330,7 @@ static int ad5449_spi_probe(struct spi_device *spi) > return ret; > } > > -static int ad5449_spi_remove(struct spi_device *spi) > +static void ad5449_spi_remove(struct spi_device *spi) > { > struct iio_dev *indio_dev = spi_get_drvdata(spi); > struct ad5449 *st = iio_priv(indio_dev); > @@ -338,8 +338,6 @@ static int ad5449_spi_remove(struct spi_device *spi) > iio_device_unregister(indio_dev); > > regulator_bulk_disable(st->chip_info->num_channels, st->vref_reg); > - > - return 0; > } > > static const struct spi_device_id ad5449_spi_ids[] = { > diff --git a/drivers/iio/dac/ad5504.c b/drivers/iio/dac/ad5504.c > index b631261efa97..8507573aa13e 100644 > --- a/drivers/iio/dac/ad5504.c > +++ b/drivers/iio/dac/ad5504.c > @@ -336,7 +336,7 @@ static int ad5504_probe(struct spi_device *spi) > return ret; > } > > -static int ad5504_remove(struct spi_device *spi) > +static void ad5504_remove(struct spi_device *spi) > { > struct iio_dev *indio_dev = spi_get_drvdata(spi); > struct ad5504_state *st = iio_priv(indio_dev); > @@ -345,8 +345,6 @@ static int ad5504_remove(struct spi_device *spi) > > if (!IS_ERR(st->reg)) > regulator_disable(st->reg); > - > - return 0; > } > > static const struct spi_device_id ad5504_id[] = { > diff --git a/drivers/iio/dac/ad5592r.c b/drivers/iio/dac/ad5592r.c > index 6bfd7951e18c..0f7abfa75bec 100644 > --- a/drivers/iio/dac/ad5592r.c > +++ b/drivers/iio/dac/ad5592r.c > @@ -130,11 +130,9 @@ static int ad5592r_spi_probe(struct spi_device *spi) > return ad5592r_probe(&spi->dev, id->name, &ad5592r_rw_ops); > } > > -static int ad5592r_spi_remove(struct spi_device *spi) > +static void ad5592r_spi_remove(struct spi_device *spi) > { > ad5592r_remove(&spi->dev); > - > - return 0; > } > > static const struct spi_device_id ad5592r_spi_ids[] = { > diff --git a/drivers/iio/dac/ad5624r_spi.c b/drivers/iio/dac/ad5624r_spi.c > index 3c98941b9f99..371e812850eb 100644 > --- a/drivers/iio/dac/ad5624r_spi.c > +++ b/drivers/iio/dac/ad5624r_spi.c > @@ -293,7 +293,7 @@ static int ad5624r_probe(struct spi_device *spi) > return ret; > } > > -static int ad5624r_remove(struct spi_device *spi) > +static void ad5624r_remove(struct spi_device *spi) > { > struct iio_dev *indio_dev = spi_get_drvdata(spi); > struct ad5624r_state *st = iio_priv(indio_dev); > @@ -301,8 +301,6 @@ static int ad5624r_remove(struct spi_device *spi) > iio_device_unregister(indio_dev); > if (!IS_ERR(st->reg)) > regulator_disable(st->reg); > - > - return 0; > } > > static const struct spi_device_id ad5624r_id[] = { > diff --git a/drivers/iio/dac/ad5686-spi.c b/drivers/iio/dac/ad5686-spi.c > index 2628810fdbb1..d26fb29b6b04 100644 > --- a/drivers/iio/dac/ad5686-spi.c > +++ b/drivers/iio/dac/ad5686-spi.c > @@ -95,11 +95,9 @@ static int ad5686_spi_probe(struct spi_device *spi) > ad5686_spi_write, ad5686_spi_read); > } > > -static int ad5686_spi_remove(struct spi_device *spi) > +static void ad5686_spi_remove(struct spi_device *spi) > { > ad5686_remove(&spi->dev); > - > - return 0; > } > > static const struct spi_device_id ad5686_spi_id[] = { > diff --git a/drivers/iio/dac/ad5761.c b/drivers/iio/dac/ad5761.c > index e37e095e94fc..4cb8471db81e 100644 > --- a/drivers/iio/dac/ad5761.c > +++ b/drivers/iio/dac/ad5761.c > @@ -394,7 +394,7 @@ static int ad5761_probe(struct spi_device *spi) > return ret; > } > > -static int ad5761_remove(struct spi_device *spi) > +static void ad5761_remove(struct spi_device *spi) > { > struct iio_dev *iio_dev = spi_get_drvdata(spi); > struct ad5761_state *st = iio_priv(iio_dev); > @@ -403,8 +403,6 @@ static int ad5761_remove(struct spi_device *spi) > > if (!IS_ERR_OR_NULL(st->vref_reg)) > regulator_disable(st->vref_reg); > - > - return 0; > } > > static const struct spi_device_id ad5761_id[] = { > diff --git a/drivers/iio/dac/ad5764.c b/drivers/iio/dac/ad5764.c > index ae089b9145cb..d235a8047ba0 100644 > --- a/drivers/iio/dac/ad5764.c > +++ b/drivers/iio/dac/ad5764.c > @@ -332,7 +332,7 @@ static int ad5764_probe(struct spi_device *spi) > return ret; > } > > -static int ad5764_remove(struct spi_device *spi) > +static void ad5764_remove(struct spi_device *spi) > { > struct iio_dev *indio_dev = spi_get_drvdata(spi); > struct ad5764_state *st = iio_priv(indio_dev); > @@ -341,8 +341,6 @@ static int ad5764_remove(struct spi_device *spi) > > if (st->chip_info->int_vref == 0) > regulator_bulk_disable(ARRAY_SIZE(st->vref_reg), st->vref_reg); > - > - return 0; > } > > static const struct spi_device_id ad5764_ids[] = { > diff --git a/drivers/iio/dac/ad5791.c b/drivers/iio/dac/ad5791.c > index 7b4579d73d18..2b14914b4050 100644 > --- a/drivers/iio/dac/ad5791.c > +++ b/drivers/iio/dac/ad5791.c > @@ -428,7 +428,7 @@ static int ad5791_probe(struct spi_device *spi) > return ret; > } > > -static int ad5791_remove(struct spi_device *spi) > +static void ad5791_remove(struct spi_device *spi) > { > struct iio_dev *indio_dev = spi_get_drvdata(spi); > struct ad5791_state *st = iio_priv(indio_dev); > @@ -439,8 +439,6 @@ static int ad5791_remove(struct spi_device *spi) > > if (!IS_ERR(st->reg_vss)) > regulator_disable(st->reg_vss); > - > - return 0; > } > > static const struct spi_device_id ad5791_id[] = { > diff --git a/drivers/iio/dac/ad8801.c b/drivers/iio/dac/ad8801.c > index 5ecfdad54dec..6be35c92d435 100644 > --- a/drivers/iio/dac/ad8801.c > +++ b/drivers/iio/dac/ad8801.c > @@ -193,7 +193,7 @@ static int ad8801_probe(struct spi_device *spi) > return ret; > } > > -static int ad8801_remove(struct spi_device *spi) > +static void ad8801_remove(struct spi_device *spi) > { > struct iio_dev *indio_dev = spi_get_drvdata(spi); > struct ad8801_state *state = iio_priv(indio_dev); > @@ -202,8 +202,6 @@ static int ad8801_remove(struct spi_device *spi) > if (state->vrefl_reg) > regulator_disable(state->vrefl_reg); > regulator_disable(state->vrefh_reg); > - > - return 0; > } > > static const struct spi_device_id ad8801_ids[] = { > diff --git a/drivers/iio/dac/ltc1660.c b/drivers/iio/dac/ltc1660.c > index f6ec9bf5815e..c76233c9bb72 100644 > --- a/drivers/iio/dac/ltc1660.c > +++ b/drivers/iio/dac/ltc1660.c > @@ -206,15 +206,13 @@ static int ltc1660_probe(struct spi_device *spi) > return ret; > } > > -static int ltc1660_remove(struct spi_device *spi) > +static void ltc1660_remove(struct spi_device *spi) > { > struct iio_dev *indio_dev = spi_get_drvdata(spi); > struct ltc1660_priv *priv = iio_priv(indio_dev); > > iio_device_unregister(indio_dev); > regulator_disable(priv->vref_reg); > - > - return 0; > } > > static const struct of_device_id ltc1660_dt_ids[] = { > diff --git a/drivers/iio/dac/ltc2632.c b/drivers/iio/dac/ltc2632.c > index 53e4b887d372..aed46c80757e 100644 > --- a/drivers/iio/dac/ltc2632.c > +++ b/drivers/iio/dac/ltc2632.c > @@ -372,7 +372,7 @@ static int ltc2632_probe(struct spi_device *spi) > return iio_device_register(indio_dev); > } > > -static int ltc2632_remove(struct spi_device *spi) > +static void ltc2632_remove(struct spi_device *spi) > { > struct iio_dev *indio_dev = spi_get_drvdata(spi); > struct ltc2632_state *st = iio_priv(indio_dev); > @@ -381,8 +381,6 @@ static int ltc2632_remove(struct spi_device *spi) > > if (st->vref_reg) > regulator_disable(st->vref_reg); > - > - return 0; > } > > static const struct spi_device_id ltc2632_id[] = { > diff --git a/drivers/iio/dac/mcp4922.c b/drivers/iio/dac/mcp4922.c > index 0ae414ee1716..cb9e60e71b91 100644 > --- a/drivers/iio/dac/mcp4922.c > +++ b/drivers/iio/dac/mcp4922.c > @@ -172,7 +172,7 @@ static int mcp4922_probe(struct spi_device *spi) > return ret; > } > > -static int mcp4922_remove(struct spi_device *spi) > +static void mcp4922_remove(struct spi_device *spi) > { > struct iio_dev *indio_dev = spi_get_drvdata(spi); > struct mcp4922_state *state; > @@ -180,8 +180,6 @@ static int mcp4922_remove(struct spi_device *spi) > iio_device_unregister(indio_dev); > state = iio_priv(indio_dev); > regulator_disable(state->vref_reg); > - > - return 0; > } > > static const struct spi_device_id mcp4922_id[] = { > diff --git a/drivers/iio/dac/ti-dac082s085.c b/drivers/iio/dac/ti-dac082s085.c > index 6beda2193683..4e1156e6deb2 100644 > --- a/drivers/iio/dac/ti-dac082s085.c > +++ b/drivers/iio/dac/ti-dac082s085.c > @@ -313,7 +313,7 @@ static int ti_dac_probe(struct spi_device *spi) > return ret; > } > > -static int ti_dac_remove(struct spi_device *spi) > +static void ti_dac_remove(struct spi_device *spi) > { > struct iio_dev *indio_dev = spi_get_drvdata(spi); > struct ti_dac_chip *ti_dac = iio_priv(indio_dev); > @@ -321,8 +321,6 @@ static int ti_dac_remove(struct spi_device *spi) > iio_device_unregister(indio_dev); > mutex_destroy(&ti_dac->lock); > regulator_disable(ti_dac->vref); > - > - return 0; > } > > static const struct of_device_id ti_dac_of_id[] = { > diff --git a/drivers/iio/dac/ti-dac7311.c b/drivers/iio/dac/ti-dac7311.c > index 99f275829ec2..e10d17e60ed3 100644 > --- a/drivers/iio/dac/ti-dac7311.c > +++ b/drivers/iio/dac/ti-dac7311.c > @@ -292,7 +292,7 @@ static int ti_dac_probe(struct spi_device *spi) > return ret; > } > > -static int ti_dac_remove(struct spi_device *spi) > +static void ti_dac_remove(struct spi_device *spi) > { > struct iio_dev *indio_dev = spi_get_drvdata(spi); > struct ti_dac_chip *ti_dac = iio_priv(indio_dev); > @@ -300,7 +300,6 @@ static int ti_dac_remove(struct spi_device *spi) > iio_device_unregister(indio_dev); > mutex_destroy(&ti_dac->lock); > regulator_disable(ti_dac->vref); > - return 0; > } > > static const struct of_device_id ti_dac_of_id[] = { > diff --git a/drivers/iio/frequency/adf4350.c b/drivers/iio/frequency/adf4350.c > index 3d9eba716b69..f3521330f6fb 100644 > --- a/drivers/iio/frequency/adf4350.c > +++ b/drivers/iio/frequency/adf4350.c > @@ -589,7 +589,7 @@ static int adf4350_probe(struct spi_device *spi) > return ret; > } > > -static int adf4350_remove(struct spi_device *spi) > +static void adf4350_remove(struct spi_device *spi) > { > struct iio_dev *indio_dev = spi_get_drvdata(spi); > struct adf4350_state *st = iio_priv(indio_dev); > @@ -604,8 +604,6 @@ static int adf4350_remove(struct spi_device *spi) > > if (!IS_ERR(reg)) > regulator_disable(reg); > - > - return 0; > } > > static const struct of_device_id adf4350_of_match[] = { > diff --git a/drivers/iio/gyro/bmg160_spi.c b/drivers/iio/gyro/bmg160_spi.c > index 745962e1e423..fc2e453527b9 100644 > --- a/drivers/iio/gyro/bmg160_spi.c > +++ b/drivers/iio/gyro/bmg160_spi.c > @@ -27,11 +27,9 @@ static int bmg160_spi_probe(struct spi_device *spi) > return bmg160_core_probe(&spi->dev, regmap, spi->irq, id->name); > } > > -static int bmg160_spi_remove(struct spi_device *spi) > +static void bmg160_spi_remove(struct spi_device *spi) > { > bmg160_core_remove(&spi->dev); > - > - return 0; > } > > static const struct spi_device_id bmg160_spi_id[] = { > diff --git a/drivers/iio/gyro/fxas21002c_spi.c b/drivers/iio/gyro/fxas21002c_spi.c > index 77ceebef4e34..c3ac169facf9 100644 > --- a/drivers/iio/gyro/fxas21002c_spi.c > +++ b/drivers/iio/gyro/fxas21002c_spi.c > @@ -34,11 +34,9 @@ static int fxas21002c_spi_probe(struct spi_device *spi) > return fxas21002c_core_probe(&spi->dev, regmap, spi->irq, id->name); > } > > -static int fxas21002c_spi_remove(struct spi_device *spi) > +static void fxas21002c_spi_remove(struct spi_device *spi) > { > fxas21002c_core_remove(&spi->dev); > - > - return 0; > } > > static const struct spi_device_id fxas21002c_spi_id[] = { > diff --git a/drivers/iio/health/afe4403.c b/drivers/iio/health/afe4403.c > index 273f16dcaff8..856ec901b091 100644 > --- a/drivers/iio/health/afe4403.c > +++ b/drivers/iio/health/afe4403.c > @@ -570,7 +570,7 @@ static int afe4403_probe(struct spi_device *spi) > return ret; > } > > -static int afe4403_remove(struct spi_device *spi) > +static void afe4403_remove(struct spi_device *spi) > { > struct iio_dev *indio_dev = spi_get_drvdata(spi); > struct afe4403_data *afe = iio_priv(indio_dev); > @@ -586,8 +586,6 @@ static int afe4403_remove(struct spi_device *spi) > ret = regulator_disable(afe->regulator); > if (ret) > dev_warn(afe->dev, "Unable to disable regulator\n"); > - > - return 0; > } > > static const struct spi_device_id afe4403_ids[] = { > diff --git a/drivers/iio/magnetometer/bmc150_magn_spi.c b/drivers/iio/magnetometer/bmc150_magn_spi.c > index c6ed3ea8460a..4c570412d65c 100644 > --- a/drivers/iio/magnetometer/bmc150_magn_spi.c > +++ b/drivers/iio/magnetometer/bmc150_magn_spi.c > @@ -29,11 +29,9 @@ static int bmc150_magn_spi_probe(struct spi_device *spi) > return bmc150_magn_probe(&spi->dev, regmap, spi->irq, id->name); > } > > -static int bmc150_magn_spi_remove(struct spi_device *spi) > +static void bmc150_magn_spi_remove(struct spi_device *spi) > { > bmc150_magn_remove(&spi->dev); > - > - return 0; > } > > static const struct spi_device_id bmc150_magn_spi_id[] = { > diff --git a/drivers/iio/magnetometer/hmc5843_spi.c b/drivers/iio/magnetometer/hmc5843_spi.c > index 89cf59a62c28..a99dd9b33e95 100644 > --- a/drivers/iio/magnetometer/hmc5843_spi.c > +++ b/drivers/iio/magnetometer/hmc5843_spi.c > @@ -74,11 +74,9 @@ static int hmc5843_spi_probe(struct spi_device *spi) > id->driver_data, id->name); > } > > -static int hmc5843_spi_remove(struct spi_device *spi) > +static void hmc5843_spi_remove(struct spi_device *spi) > { > hmc5843_common_remove(&spi->dev); > - > - return 0; > } > > static const struct spi_device_id hmc5843_id[] = { > diff --git a/drivers/iio/potentiometer/max5487.c b/drivers/iio/potentiometer/max5487.c > index 007c2bd324cb..42723c996c9f 100644 > --- a/drivers/iio/potentiometer/max5487.c > +++ b/drivers/iio/potentiometer/max5487.c > @@ -112,7 +112,7 @@ static int max5487_spi_probe(struct spi_device *spi) > return iio_device_register(indio_dev); > } > > -static int max5487_spi_remove(struct spi_device *spi) > +static void max5487_spi_remove(struct spi_device *spi) > { > struct iio_dev *indio_dev = spi_get_drvdata(spi); > int ret; > @@ -123,8 +123,6 @@ static int max5487_spi_remove(struct spi_device *spi) > ret = max5487_write_cmd(spi, MAX5487_COPY_AB_TO_NV); > if (ret) > dev_warn(&spi->dev, "Failed to save wiper regs to NV regs\n"); > - > - return 0; > } > > static const struct spi_device_id max5487_id[] = { > diff --git a/drivers/iio/pressure/ms5611_spi.c b/drivers/iio/pressure/ms5611_spi.c > index 9fa2dcd71760..7ccd960ced5d 100644 > --- a/drivers/iio/pressure/ms5611_spi.c > +++ b/drivers/iio/pressure/ms5611_spi.c > @@ -107,11 +107,9 @@ static int ms5611_spi_probe(struct spi_device *spi) > spi_get_device_id(spi)->driver_data); > } > > -static int ms5611_spi_remove(struct spi_device *spi) > +static void ms5611_spi_remove(struct spi_device *spi) > { > ms5611_remove(spi_get_drvdata(spi)); > - > - return 0; > } > > static const struct of_device_id ms5611_spi_matches[] = { > diff --git a/drivers/iio/pressure/zpa2326_spi.c b/drivers/iio/pressure/zpa2326_spi.c > index 85201a4bae44..ee8ed77536ca 100644 > --- a/drivers/iio/pressure/zpa2326_spi.c > +++ b/drivers/iio/pressure/zpa2326_spi.c > @@ -57,11 +57,9 @@ static int zpa2326_probe_spi(struct spi_device *spi) > spi->irq, ZPA2326_DEVICE_ID, regmap); > } > > -static int zpa2326_remove_spi(struct spi_device *spi) > +static void zpa2326_remove_spi(struct spi_device *spi) > { > zpa2326_remove(&spi->dev); > - > - return 0; > } > > static const struct spi_device_id zpa2326_spi_ids[] = { > diff --git a/drivers/input/keyboard/applespi.c b/drivers/input/keyboard/applespi.c > index eda1b23002b5..d1f5354d5ea2 100644 > --- a/drivers/input/keyboard/applespi.c > +++ b/drivers/input/keyboard/applespi.c > @@ -1858,7 +1858,7 @@ static void applespi_drain_reads(struct applespi_data *applespi) > spin_unlock_irqrestore(&applespi->cmd_msg_lock, flags); > } > > -static int applespi_remove(struct spi_device *spi) > +static void applespi_remove(struct spi_device *spi) > { > struct applespi_data *applespi = spi_get_drvdata(spi); > > @@ -1871,8 +1871,6 @@ static int applespi_remove(struct spi_device *spi) > applespi_drain_reads(applespi); > > debugfs_remove_recursive(applespi->debugfs_root); > - > - return 0; > } > > static void applespi_shutdown(struct spi_device *spi) > diff --git a/drivers/input/misc/adxl34x-spi.c b/drivers/input/misc/adxl34x-spi.c > index 6e51c9bc619f..91e44d4c66f7 100644 > --- a/drivers/input/misc/adxl34x-spi.c > +++ b/drivers/input/misc/adxl34x-spi.c > @@ -87,13 +87,11 @@ static int adxl34x_spi_probe(struct spi_device *spi) > return 0; > } > > -static int adxl34x_spi_remove(struct spi_device *spi) > +static void adxl34x_spi_remove(struct spi_device *spi) > { > struct adxl34x *ac = spi_get_drvdata(spi); > > adxl34x_remove(ac); > - > - return 0; > } > > static int __maybe_unused adxl34x_spi_suspend(struct device *dev) > diff --git a/drivers/input/touchscreen/ads7846.c b/drivers/input/touchscreen/ads7846.c > index a25a77dd9a32..bed68a68f330 100644 > --- a/drivers/input/touchscreen/ads7846.c > +++ b/drivers/input/touchscreen/ads7846.c > @@ -1411,13 +1411,11 @@ static int ads7846_probe(struct spi_device *spi) > return 0; > } > > -static int ads7846_remove(struct spi_device *spi) > +static void ads7846_remove(struct spi_device *spi) > { > struct ads7846 *ts = spi_get_drvdata(spi); > > ads7846_stop(ts); > - > - return 0; > } > > static struct spi_driver ads7846_driver = { > diff --git a/drivers/input/touchscreen/cyttsp4_spi.c b/drivers/input/touchscreen/cyttsp4_spi.c > index 2aec41eb76b7..5d7db84f2749 100644 > --- a/drivers/input/touchscreen/cyttsp4_spi.c > +++ b/drivers/input/touchscreen/cyttsp4_spi.c > @@ -164,12 +164,10 @@ static int cyttsp4_spi_probe(struct spi_device *spi) > return PTR_ERR_OR_ZERO(ts); > } > > -static int cyttsp4_spi_remove(struct spi_device *spi) > +static void cyttsp4_spi_remove(struct spi_device *spi) > { > struct cyttsp4 *ts = spi_get_drvdata(spi); > cyttsp4_remove(ts); > - > - return 0; > } > > static struct spi_driver cyttsp4_spi_driver = { > diff --git a/drivers/input/touchscreen/tsc2005.c b/drivers/input/touchscreen/tsc2005.c > index a2f55920b9b2..555dfe98b3c4 100644 > --- a/drivers/input/touchscreen/tsc2005.c > +++ b/drivers/input/touchscreen/tsc2005.c > @@ -64,11 +64,9 @@ static int tsc2005_probe(struct spi_device *spi) > tsc2005_cmd); > } > > -static int tsc2005_remove(struct spi_device *spi) > +static void tsc2005_remove(struct spi_device *spi) > { > tsc200x_remove(&spi->dev); > - > - return 0; > } > > #ifdef CONFIG_OF > diff --git a/drivers/leds/leds-cr0014114.c b/drivers/leds/leds-cr0014114.c > index d03cfd3c0bfb..c87686bd7c18 100644 > --- a/drivers/leds/leds-cr0014114.c > +++ b/drivers/leds/leds-cr0014114.c > @@ -266,14 +266,12 @@ static int cr0014114_probe(struct spi_device *spi) > return 0; > } > > -static int cr0014114_remove(struct spi_device *spi) > +static void cr0014114_remove(struct spi_device *spi) > { > struct cr0014114 *priv = spi_get_drvdata(spi); > > cancel_delayed_work_sync(&priv->work); > mutex_destroy(&priv->lock); > - > - return 0; > } > > static const struct of_device_id cr0014114_dt_ids[] = { > diff --git a/drivers/leds/leds-dac124s085.c b/drivers/leds/leds-dac124s085.c > index 20dc9b9d7dea..cf5fb1195f87 100644 > --- a/drivers/leds/leds-dac124s085.c > +++ b/drivers/leds/leds-dac124s085.c > @@ -85,15 +85,13 @@ static int dac124s085_probe(struct spi_device *spi) > return ret; > } > > -static int dac124s085_remove(struct spi_device *spi) > +static void dac124s085_remove(struct spi_device *spi) > { > struct dac124s085 *dac = spi_get_drvdata(spi); > int i; > > for (i = 0; i < ARRAY_SIZE(dac->leds); i++) > led_classdev_unregister(&dac->leds[i].ldev); > - > - return 0; > } > > static struct spi_driver dac124s085_driver = { > diff --git a/drivers/leds/leds-el15203000.c b/drivers/leds/leds-el15203000.c > index f9eb59a25570..7e7b617bcd56 100644 > --- a/drivers/leds/leds-el15203000.c > +++ b/drivers/leds/leds-el15203000.c > @@ -315,13 +315,11 @@ static int el15203000_probe(struct spi_device *spi) > return el15203000_probe_dt(priv); > } > > -static int el15203000_remove(struct spi_device *spi) > +static void el15203000_remove(struct spi_device *spi) > { > struct el15203000 *priv = spi_get_drvdata(spi); > > mutex_destroy(&priv->lock); > - > - return 0; > } > > static const struct of_device_id el15203000_dt_ids[] = { > diff --git a/drivers/leds/leds-spi-byte.c b/drivers/leds/leds-spi-byte.c > index f1964c96fb15..2bc5c99daf51 100644 > --- a/drivers/leds/leds-spi-byte.c > +++ b/drivers/leds/leds-spi-byte.c > @@ -130,13 +130,11 @@ static int spi_byte_probe(struct spi_device *spi) > return 0; > } > > -static int spi_byte_remove(struct spi_device *spi) > +static void spi_byte_remove(struct spi_device *spi) > { > struct spi_byte_led *led = spi_get_drvdata(spi); > > mutex_destroy(&led->mutex); > - > - return 0; > } > > static struct spi_driver spi_byte_driver = { > diff --git a/drivers/media/spi/cxd2880-spi.c b/drivers/media/spi/cxd2880-spi.c > index 6f2a66bc87fb..6be4e5528879 100644 > --- a/drivers/media/spi/cxd2880-spi.c > +++ b/drivers/media/spi/cxd2880-spi.c > @@ -625,7 +625,7 @@ cxd2880_spi_probe(struct spi_device *spi) > return ret; > } > > -static int > +static void > cxd2880_spi_remove(struct spi_device *spi) > { > struct cxd2880_dvb_spi *dvb_spi = spi_get_drvdata(spi); > @@ -643,8 +643,6 @@ cxd2880_spi_remove(struct spi_device *spi) > > kfree(dvb_spi); > pr_info("cxd2880_spi remove ok.\n"); > - > - return 0; > } > > static const struct spi_device_id cxd2880_spi_id[] = { > diff --git a/drivers/media/spi/gs1662.c b/drivers/media/spi/gs1662.c > index f86ef1ca1288..75c21a93e6d0 100644 > --- a/drivers/media/spi/gs1662.c > +++ b/drivers/media/spi/gs1662.c > @@ -458,13 +458,11 @@ static int gs_probe(struct spi_device *spi) > return ret; > } > > -static int gs_remove(struct spi_device *spi) > +static void gs_remove(struct spi_device *spi) > { > struct v4l2_subdev *sd = spi_get_drvdata(spi); > > v4l2_device_unregister_subdev(sd); > - > - return 0; > } > > static struct spi_driver gs_driver = { > diff --git a/drivers/media/tuners/msi001.c b/drivers/media/tuners/msi001.c > index 44247049a319..ad6c72c1ed04 100644 > --- a/drivers/media/tuners/msi001.c > +++ b/drivers/media/tuners/msi001.c > @@ -472,7 +472,7 @@ static int msi001_probe(struct spi_device *spi) > return ret; > } > > -static int msi001_remove(struct spi_device *spi) > +static void msi001_remove(struct spi_device *spi) > { > struct v4l2_subdev *sd = spi_get_drvdata(spi); > struct msi001_dev *dev = sd_to_msi001_dev(sd); > @@ -486,7 +486,6 @@ static int msi001_remove(struct spi_device *spi) > v4l2_device_unregister_subdev(&dev->sd); > v4l2_ctrl_handler_free(&dev->hdl); > kfree(dev); > - return 0; > } > > static const struct spi_device_id msi001_id_table[] = { > diff --git a/drivers/mfd/arizona-spi.c b/drivers/mfd/arizona-spi.c > index 9fe06dda3782..03620c8efe34 100644 > --- a/drivers/mfd/arizona-spi.c > +++ b/drivers/mfd/arizona-spi.c > @@ -206,13 +206,11 @@ static int arizona_spi_probe(struct spi_device *spi) > return arizona_dev_init(arizona); > } > > -static int arizona_spi_remove(struct spi_device *spi) > +static void arizona_spi_remove(struct spi_device *spi) > { > struct arizona *arizona = spi_get_drvdata(spi); > > arizona_dev_exit(arizona); > - > - return 0; > } > > static const struct spi_device_id arizona_spi_ids[] = { > diff --git a/drivers/mfd/da9052-spi.c b/drivers/mfd/da9052-spi.c > index 5faf3766a5e2..b79a57b45c1e 100644 > --- a/drivers/mfd/da9052-spi.c > +++ b/drivers/mfd/da9052-spi.c > @@ -55,12 +55,11 @@ static int da9052_spi_probe(struct spi_device *spi) > return da9052_device_init(da9052, id->driver_data); > } > > -static int da9052_spi_remove(struct spi_device *spi) > +static void da9052_spi_remove(struct spi_device *spi) > { > struct da9052 *da9052 = spi_get_drvdata(spi); > > da9052_device_exit(da9052); > - return 0; > } > > static const struct spi_device_id da9052_spi_id[] = { > diff --git a/drivers/mfd/ezx-pcap.c b/drivers/mfd/ezx-pcap.c > index 70fa18b04ad2..2280f756f422 100644 > --- a/drivers/mfd/ezx-pcap.c > +++ b/drivers/mfd/ezx-pcap.c > @@ -392,7 +392,7 @@ static int pcap_add_subdev(struct pcap_chip *pcap, > return ret; > } > > -static int ezx_pcap_remove(struct spi_device *spi) > +static void ezx_pcap_remove(struct spi_device *spi) > { > struct pcap_chip *pcap = spi_get_drvdata(spi); > unsigned long flags; > @@ -412,8 +412,6 @@ static int ezx_pcap_remove(struct spi_device *spi) > irq_set_chip_and_handler(i, NULL, NULL); > > destroy_workqueue(pcap->workqueue); > - > - return 0; > } > > static int ezx_pcap_probe(struct spi_device *spi) > diff --git a/drivers/mfd/madera-spi.c b/drivers/mfd/madera-spi.c > index e860f5ff0933..da84eb50e53a 100644 > --- a/drivers/mfd/madera-spi.c > +++ b/drivers/mfd/madera-spi.c > @@ -112,13 +112,11 @@ static int madera_spi_probe(struct spi_device *spi) > return madera_dev_init(madera); > } > > -static int madera_spi_remove(struct spi_device *spi) > +static void madera_spi_remove(struct spi_device *spi) > { > struct madera *madera = spi_get_drvdata(spi); > > madera_dev_exit(madera); > - > - return 0; > } > > static const struct spi_device_id madera_spi_ids[] = { > diff --git a/drivers/mfd/mc13xxx-spi.c b/drivers/mfd/mc13xxx-spi.c > index 4d8913d647e6..f803527e5819 100644 > --- a/drivers/mfd/mc13xxx-spi.c > +++ b/drivers/mfd/mc13xxx-spi.c > @@ -166,10 +166,9 @@ static int mc13xxx_spi_probe(struct spi_device *spi) > return mc13xxx_common_init(&spi->dev); > } > > -static int mc13xxx_spi_remove(struct spi_device *spi) > +static void mc13xxx_spi_remove(struct spi_device *spi) > { > mc13xxx_common_exit(&spi->dev); > - return 0; > } > > static struct spi_driver mc13xxx_spi_driver = { > diff --git a/drivers/mfd/rsmu_spi.c b/drivers/mfd/rsmu_spi.c > index fec2b4ec477c..d2f3d8f1e05a 100644 > --- a/drivers/mfd/rsmu_spi.c > +++ b/drivers/mfd/rsmu_spi.c > @@ -220,13 +220,11 @@ static int rsmu_spi_probe(struct spi_device *client) > return rsmu_core_init(rsmu); > } > > -static int rsmu_spi_remove(struct spi_device *client) > +static void rsmu_spi_remove(struct spi_device *client) > { > struct rsmu_ddata *rsmu = spi_get_drvdata(client); > > rsmu_core_exit(rsmu); > - > - return 0; > } > > static const struct spi_device_id rsmu_spi_id[] = { > diff --git a/drivers/mfd/stmpe-spi.c b/drivers/mfd/stmpe-spi.c > index 6c5915016be5..ad8055a0e286 100644 > --- a/drivers/mfd/stmpe-spi.c > +++ b/drivers/mfd/stmpe-spi.c > @@ -102,13 +102,11 @@ stmpe_spi_probe(struct spi_device *spi) > return stmpe_probe(&spi_ci, id->driver_data); > } > > -static int stmpe_spi_remove(struct spi_device *spi) > +static void stmpe_spi_remove(struct spi_device *spi) > { > struct stmpe *stmpe = spi_get_drvdata(spi); > > stmpe_remove(stmpe); > - > - return 0; > } > > static const struct of_device_id stmpe_spi_of_match[] = { > diff --git a/drivers/mfd/tps65912-spi.c b/drivers/mfd/tps65912-spi.c > index d701926aa46e..bba38fbc781d 100644 > --- a/drivers/mfd/tps65912-spi.c > +++ b/drivers/mfd/tps65912-spi.c > @@ -50,13 +50,11 @@ static int tps65912_spi_probe(struct spi_device *spi) > return tps65912_device_init(tps); > } > > -static int tps65912_spi_remove(struct spi_device *spi) > +static void tps65912_spi_remove(struct spi_device *spi) > { > struct tps65912 *tps = spi_get_drvdata(spi); > > tps65912_device_exit(tps); > - > - return 0; > } > > static const struct spi_device_id tps65912_spi_id_table[] = { > diff --git a/drivers/misc/ad525x_dpot-spi.c b/drivers/misc/ad525x_dpot-spi.c > index a9e75d80ad36..263055bda48b 100644 > --- a/drivers/misc/ad525x_dpot-spi.c > +++ b/drivers/misc/ad525x_dpot-spi.c > @@ -90,10 +90,9 @@ static int ad_dpot_spi_probe(struct spi_device *spi) > spi_get_device_id(spi)->name); > } > > -static int ad_dpot_spi_remove(struct spi_device *spi) > +static void ad_dpot_spi_remove(struct spi_device *spi) > { > ad_dpot_remove(&spi->dev); > - return 0; > } > > static const struct spi_device_id ad_dpot_spi_id[] = { > diff --git a/drivers/misc/eeprom/eeprom_93xx46.c b/drivers/misc/eeprom/eeprom_93xx46.c > index 1f15399e5cb4..b630625b3024 100644 > --- a/drivers/misc/eeprom/eeprom_93xx46.c > +++ b/drivers/misc/eeprom/eeprom_93xx46.c > @@ -555,14 +555,12 @@ static int eeprom_93xx46_probe(struct spi_device *spi) > return 0; > } > > -static int eeprom_93xx46_remove(struct spi_device *spi) > +static void eeprom_93xx46_remove(struct spi_device *spi) > { > struct eeprom_93xx46_dev *edev = spi_get_drvdata(spi); > > if (!(edev->pdata->flags & EE_READONLY)) > device_remove_file(&spi->dev, &dev_attr_erase); > - > - return 0; > } > > static struct spi_driver eeprom_93xx46_driver = { > diff --git a/drivers/misc/lattice-ecp3-config.c b/drivers/misc/lattice-ecp3-config.c > index 98828030b5a4..bac4df2e5231 100644 > --- a/drivers/misc/lattice-ecp3-config.c > +++ b/drivers/misc/lattice-ecp3-config.c > @@ -211,13 +211,11 @@ static int lattice_ecp3_probe(struct spi_device *spi) > return 0; > } > > -static int lattice_ecp3_remove(struct spi_device *spi) > +static void lattice_ecp3_remove(struct spi_device *spi) > { > struct fpga_data *data = spi_get_drvdata(spi); > > wait_for_completion(&data->fw_loaded); > - > - return 0; > } > > static const struct spi_device_id lattice_ecp3_id[] = { > diff --git a/drivers/misc/lis3lv02d/lis3lv02d_spi.c b/drivers/misc/lis3lv02d/lis3lv02d_spi.c > index 9e40dfb60742..203a108b8883 100644 > --- a/drivers/misc/lis3lv02d/lis3lv02d_spi.c > +++ b/drivers/misc/lis3lv02d/lis3lv02d_spi.c > @@ -96,15 +96,13 @@ static int lis302dl_spi_probe(struct spi_device *spi) > return lis3lv02d_init_device(&lis3_dev); > } > > -static int lis302dl_spi_remove(struct spi_device *spi) > +static void lis302dl_spi_remove(struct spi_device *spi) > { > struct lis3lv02d *lis3 = spi_get_drvdata(spi); > lis3lv02d_joystick_disable(lis3); > lis3lv02d_poweroff(lis3); > > lis3lv02d_remove_fs(&lis3_dev); > - > - return 0; > } > > #ifdef CONFIG_PM_SLEEP > diff --git a/drivers/mmc/host/mmc_spi.c b/drivers/mmc/host/mmc_spi.c > index a576181e9db0..106dd204b1a7 100644 > --- a/drivers/mmc/host/mmc_spi.c > +++ b/drivers/mmc/host/mmc_spi.c > @@ -1489,7 +1489,7 @@ static int mmc_spi_probe(struct spi_device *spi) > } > > > -static int mmc_spi_remove(struct spi_device *spi) > +static void mmc_spi_remove(struct spi_device *spi) > { > struct mmc_host *mmc = dev_get_drvdata(&spi->dev); > struct mmc_spi_host *host = mmc_priv(mmc); > @@ -1507,7 +1507,6 @@ static int mmc_spi_remove(struct spi_device *spi) > spi->max_speed_hz = mmc->f_max; > mmc_spi_put_pdata(spi); > mmc_free_host(mmc); > - return 0; > } > > static const struct spi_device_id mmc_spi_dev_ids[] = { > diff --git a/drivers/mtd/devices/mchp23k256.c b/drivers/mtd/devices/mchp23k256.c > index a8b31bddf14b..008df9d8898d 100644 > --- a/drivers/mtd/devices/mchp23k256.c > +++ b/drivers/mtd/devices/mchp23k256.c > @@ -209,13 +209,11 @@ static int mchp23k256_probe(struct spi_device *spi) > return 0; > } > > -static int mchp23k256_remove(struct spi_device *spi) > +static void mchp23k256_remove(struct spi_device *spi) > { > struct mchp23k256_flash *flash = spi_get_drvdata(spi); > > WARN_ON(mtd_device_unregister(&flash->mtd)); > - > - return 0; > } > > static const struct of_device_id mchp23k256_of_table[] = { > diff --git a/drivers/mtd/devices/mchp48l640.c b/drivers/mtd/devices/mchp48l640.c > index 231a10790196..a3fd426df74b 100644 > --- a/drivers/mtd/devices/mchp48l640.c > +++ b/drivers/mtd/devices/mchp48l640.c > @@ -341,13 +341,11 @@ static int mchp48l640_probe(struct spi_device *spi) > return 0; > } > > -static int mchp48l640_remove(struct spi_device *spi) > +static void mchp48l640_remove(struct spi_device *spi) > { > struct mchp48l640_flash *flash = spi_get_drvdata(spi); > > WARN_ON(mtd_device_unregister(&flash->mtd)); > - > - return 0; > } > > static const struct of_device_id mchp48l640_of_table[] = { > diff --git a/drivers/mtd/devices/mtd_dataflash.c b/drivers/mtd/devices/mtd_dataflash.c > index 734878abaa23..134e27328597 100644 > --- a/drivers/mtd/devices/mtd_dataflash.c > +++ b/drivers/mtd/devices/mtd_dataflash.c > @@ -916,7 +916,7 @@ static int dataflash_probe(struct spi_device *spi) > return status; > } > > -static int dataflash_remove(struct spi_device *spi) > +static void dataflash_remove(struct spi_device *spi) > { > struct dataflash *flash = spi_get_drvdata(spi); > > @@ -925,8 +925,6 @@ static int dataflash_remove(struct spi_device *spi) > WARN_ON(mtd_device_unregister(&flash->mtd)); > > kfree(flash); > - > - return 0; > } > > static struct spi_driver dataflash_driver = { > diff --git a/drivers/mtd/devices/sst25l.c b/drivers/mtd/devices/sst25l.c > index 7f124c1bfa40..8813994ce9f4 100644 > --- a/drivers/mtd/devices/sst25l.c > +++ b/drivers/mtd/devices/sst25l.c > @@ -398,13 +398,11 @@ static int sst25l_probe(struct spi_device *spi) > return 0; > } > > -static int sst25l_remove(struct spi_device *spi) > +static void sst25l_remove(struct spi_device *spi) > { > struct sst25l_flash *flash = spi_get_drvdata(spi); > > WARN_ON(mtd_device_unregister(&flash->mtd)); > - > - return 0; > } > > static struct spi_driver sst25l_driver = { > diff --git a/drivers/net/can/m_can/tcan4x5x-core.c b/drivers/net/can/m_can/tcan4x5x-core.c > index 04687b15b250..41645a24384c 100644 > --- a/drivers/net/can/m_can/tcan4x5x-core.c > +++ b/drivers/net/can/m_can/tcan4x5x-core.c > @@ -388,7 +388,7 @@ static int tcan4x5x_can_probe(struct spi_device *spi) > return ret; > } > > -static int tcan4x5x_can_remove(struct spi_device *spi) > +static void tcan4x5x_can_remove(struct spi_device *spi) > { > struct tcan4x5x_priv *priv = spi_get_drvdata(spi); > > @@ -397,8 +397,6 @@ static int tcan4x5x_can_remove(struct spi_device *spi) > tcan4x5x_power_enable(priv->power, 0); > > m_can_class_free_dev(priv->cdev.net); > - > - return 0; > } > > static const struct of_device_id tcan4x5x_of_match[] = { > diff --git a/drivers/net/can/spi/hi311x.c b/drivers/net/can/spi/hi311x.c > index cfcc14fe3e42..664b8f14d7b0 100644 > --- a/drivers/net/can/spi/hi311x.c > +++ b/drivers/net/can/spi/hi311x.c > @@ -948,7 +948,7 @@ static int hi3110_can_probe(struct spi_device *spi) > return dev_err_probe(dev, ret, "Probe failed\n"); > } > > -static int hi3110_can_remove(struct spi_device *spi) > +static void hi3110_can_remove(struct spi_device *spi) > { > struct hi3110_priv *priv = spi_get_drvdata(spi); > struct net_device *net = priv->net; > @@ -960,8 +960,6 @@ static int hi3110_can_remove(struct spi_device *spi) > clk_disable_unprepare(priv->clk); > > free_candev(net); > - > - return 0; > } > > static int __maybe_unused hi3110_can_suspend(struct device *dev) > diff --git a/drivers/net/can/spi/mcp251x.c b/drivers/net/can/spi/mcp251x.c > index 025e07cb7439..d23edaf22420 100644 > --- a/drivers/net/can/spi/mcp251x.c > +++ b/drivers/net/can/spi/mcp251x.c > @@ -1427,7 +1427,7 @@ static int mcp251x_can_probe(struct spi_device *spi) > return ret; > } > > -static int mcp251x_can_remove(struct spi_device *spi) > +static void mcp251x_can_remove(struct spi_device *spi) > { > struct mcp251x_priv *priv = spi_get_drvdata(spi); > struct net_device *net = priv->net; > @@ -1442,8 +1442,6 @@ static int mcp251x_can_remove(struct spi_device *spi) > clk_disable_unprepare(priv->clk); > > free_candev(net); > - > - return 0; > } > > static int __maybe_unused mcp251x_can_suspend(struct device *dev) > diff --git a/drivers/net/can/spi/mcp251xfd/mcp251xfd-core.c b/drivers/net/can/spi/mcp251xfd/mcp251xfd-core.c > index b5986df6eca0..65c9b31666a6 100644 > --- a/drivers/net/can/spi/mcp251xfd/mcp251xfd-core.c > +++ b/drivers/net/can/spi/mcp251xfd/mcp251xfd-core.c > @@ -1966,7 +1966,7 @@ static int mcp251xfd_probe(struct spi_device *spi) > return err; > } > > -static int mcp251xfd_remove(struct spi_device *spi) > +static void mcp251xfd_remove(struct spi_device *spi) > { > struct mcp251xfd_priv *priv = spi_get_drvdata(spi); > struct net_device *ndev = priv->ndev; > @@ -1975,8 +1975,6 @@ static int mcp251xfd_remove(struct spi_device *spi) > mcp251xfd_unregister(priv); > spi->max_speed_hz = priv->spi_max_speed_hz_orig; > free_candev(ndev); > - > - return 0; > } > > static int __maybe_unused mcp251xfd_runtime_suspend(struct device *device) > diff --git a/drivers/net/dsa/b53/b53_spi.c b/drivers/net/dsa/b53/b53_spi.c > index 2b88f03e5252..0e54b2a0c211 100644 > --- a/drivers/net/dsa/b53/b53_spi.c > +++ b/drivers/net/dsa/b53/b53_spi.c > @@ -314,7 +314,7 @@ static int b53_spi_probe(struct spi_device *spi) > return 0; > } > > -static int b53_spi_remove(struct spi_device *spi) > +static void b53_spi_remove(struct spi_device *spi) > { > struct b53_device *dev = spi_get_drvdata(spi); > > @@ -322,8 +322,6 @@ static int b53_spi_remove(struct spi_device *spi) > b53_switch_remove(dev); > > spi_set_drvdata(spi, NULL); > - > - return 0; > } > > static void b53_spi_shutdown(struct spi_device *spi) > diff --git a/drivers/net/dsa/microchip/ksz8795_spi.c b/drivers/net/dsa/microchip/ksz8795_spi.c > index 866767b70d65..673589dc88ab 100644 > --- a/drivers/net/dsa/microchip/ksz8795_spi.c > +++ b/drivers/net/dsa/microchip/ksz8795_spi.c > @@ -87,7 +87,7 @@ static int ksz8795_spi_probe(struct spi_device *spi) > return 0; > } > > -static int ksz8795_spi_remove(struct spi_device *spi) > +static void ksz8795_spi_remove(struct spi_device *spi) > { > struct ksz_device *dev = spi_get_drvdata(spi); > > @@ -95,8 +95,6 @@ static int ksz8795_spi_remove(struct spi_device *spi) > ksz_switch_remove(dev); > > spi_set_drvdata(spi, NULL); > - > - return 0; > } > > static void ksz8795_spi_shutdown(struct spi_device *spi) > diff --git a/drivers/net/dsa/microchip/ksz9477_spi.c b/drivers/net/dsa/microchip/ksz9477_spi.c > index e3cb0e6c9f6f..940bb9665f15 100644 > --- a/drivers/net/dsa/microchip/ksz9477_spi.c > +++ b/drivers/net/dsa/microchip/ksz9477_spi.c > @@ -65,7 +65,7 @@ static int ksz9477_spi_probe(struct spi_device *spi) > return 0; > } > > -static int ksz9477_spi_remove(struct spi_device *spi) > +static void ksz9477_spi_remove(struct spi_device *spi) > { > struct ksz_device *dev = spi_get_drvdata(spi); > > @@ -73,8 +73,6 @@ static int ksz9477_spi_remove(struct spi_device *spi) > ksz_switch_remove(dev); > > spi_set_drvdata(spi, NULL); > - > - return 0; > } > > static void ksz9477_spi_shutdown(struct spi_device *spi) > diff --git a/drivers/net/dsa/sja1105/sja1105_main.c b/drivers/net/dsa/sja1105/sja1105_main.c > index b513713be610..c2a47c6693b8 100644 > --- a/drivers/net/dsa/sja1105/sja1105_main.c > +++ b/drivers/net/dsa/sja1105/sja1105_main.c > @@ -3346,18 +3346,16 @@ static int sja1105_probe(struct spi_device *spi) > return dsa_register_switch(priv->ds); > } > > -static int sja1105_remove(struct spi_device *spi) > +static void sja1105_remove(struct spi_device *spi) > { > struct sja1105_private *priv = spi_get_drvdata(spi); > > if (!priv) > - return 0; > + return; > > dsa_unregister_switch(priv->ds); > > spi_set_drvdata(spi, NULL); > - > - return 0; > } > > static void sja1105_shutdown(struct spi_device *spi) > diff --git a/drivers/net/dsa/vitesse-vsc73xx-spi.c b/drivers/net/dsa/vitesse-vsc73xx-spi.c > index 645398901e05..3110895358d8 100644 > --- a/drivers/net/dsa/vitesse-vsc73xx-spi.c > +++ b/drivers/net/dsa/vitesse-vsc73xx-spi.c > @@ -159,18 +159,16 @@ static int vsc73xx_spi_probe(struct spi_device *spi) > return vsc73xx_probe(&vsc_spi->vsc); > } > > -static int vsc73xx_spi_remove(struct spi_device *spi) > +static void vsc73xx_spi_remove(struct spi_device *spi) > { > struct vsc73xx_spi *vsc_spi = spi_get_drvdata(spi); > > if (!vsc_spi) > - return 0; > + return; > > vsc73xx_remove(&vsc_spi->vsc); > > spi_set_drvdata(spi, NULL); > - > - return 0; > } > > static void vsc73xx_spi_shutdown(struct spi_device *spi) > diff --git a/drivers/net/ethernet/asix/ax88796c_main.c b/drivers/net/ethernet/asix/ax88796c_main.c > index e7a9f9863258..bf70481bb1ca 100644 > --- a/drivers/net/ethernet/asix/ax88796c_main.c > +++ b/drivers/net/ethernet/asix/ax88796c_main.c > @@ -1102,7 +1102,7 @@ static int ax88796c_probe(struct spi_device *spi) > return ret; > } > > -static int ax88796c_remove(struct spi_device *spi) > +static void ax88796c_remove(struct spi_device *spi) > { > struct ax88796c_device *ax_local = dev_get_drvdata(&spi->dev); > struct net_device *ndev = ax_local->ndev; > @@ -1112,8 +1112,6 @@ static int ax88796c_remove(struct spi_device *spi) > netif_info(ax_local, probe, ndev, "removing network device %s %s\n", > dev_driver_string(&spi->dev), > dev_name(&spi->dev)); > - > - return 0; > } > > #ifdef CONFIG_OF > diff --git a/drivers/net/ethernet/micrel/ks8851_spi.c b/drivers/net/ethernet/micrel/ks8851_spi.c > index 0303e727e99f..d167d93e4c12 100644 > --- a/drivers/net/ethernet/micrel/ks8851_spi.c > +++ b/drivers/net/ethernet/micrel/ks8851_spi.c > @@ -452,11 +452,9 @@ static int ks8851_probe_spi(struct spi_device *spi) > return ks8851_probe_common(netdev, dev, msg_enable); > } > > -static int ks8851_remove_spi(struct spi_device *spi) > +static void ks8851_remove_spi(struct spi_device *spi) > { > ks8851_remove_common(&spi->dev); > - > - return 0; > } > > static const struct of_device_id ks8851_match_table[] = { > diff --git a/drivers/net/ethernet/microchip/enc28j60.c b/drivers/net/ethernet/microchip/enc28j60.c > index 634ac7649c43..db5a3edb4c3c 100644 > --- a/drivers/net/ethernet/microchip/enc28j60.c > +++ b/drivers/net/ethernet/microchip/enc28j60.c > @@ -1612,15 +1612,13 @@ static int enc28j60_probe(struct spi_device *spi) > return ret; > } > > -static int enc28j60_remove(struct spi_device *spi) > +static void enc28j60_remove(struct spi_device *spi) > { > struct enc28j60_net *priv = spi_get_drvdata(spi); > > unregister_netdev(priv->netdev); > free_irq(spi->irq, priv); > free_netdev(priv->netdev); > - > - return 0; > } > > static const struct of_device_id enc28j60_dt_ids[] = { > diff --git a/drivers/net/ethernet/microchip/encx24j600.c b/drivers/net/ethernet/microchip/encx24j600.c > index b90efc80fb59..dc1840cb5b10 100644 > --- a/drivers/net/ethernet/microchip/encx24j600.c > +++ b/drivers/net/ethernet/microchip/encx24j600.c > @@ -1093,7 +1093,7 @@ static int encx24j600_spi_probe(struct spi_device *spi) > return ret; > } > > -static int encx24j600_spi_remove(struct spi_device *spi) > +static void encx24j600_spi_remove(struct spi_device *spi) > { > struct encx24j600_priv *priv = dev_get_drvdata(&spi->dev); > > @@ -1101,8 +1101,6 @@ static int encx24j600_spi_remove(struct spi_device *spi) > kthread_stop(priv->kworker_task); > > free_netdev(priv->ndev); > - > - return 0; > } > > static const struct spi_device_id encx24j600_spi_id_table[] = { > diff --git a/drivers/net/ethernet/qualcomm/qca_spi.c b/drivers/net/ethernet/qualcomm/qca_spi.c > index 955cce644392..3c5494afd3c0 100644 > --- a/drivers/net/ethernet/qualcomm/qca_spi.c > +++ b/drivers/net/ethernet/qualcomm/qca_spi.c > @@ -1001,7 +1001,7 @@ qca_spi_probe(struct spi_device *spi) > return 0; > } > > -static int > +static void > qca_spi_remove(struct spi_device *spi) > { > struct net_device *qcaspi_devs = spi_get_drvdata(spi); > @@ -1011,8 +1011,6 @@ qca_spi_remove(struct spi_device *spi) > > unregister_netdev(qcaspi_devs); > free_netdev(qcaspi_devs); > - > - return 0; > } > > static const struct spi_device_id qca_spi_id[] = { > diff --git a/drivers/net/ethernet/vertexcom/mse102x.c b/drivers/net/ethernet/vertexcom/mse102x.c > index 89a31783fbb4..25739b182ac7 100644 > --- a/drivers/net/ethernet/vertexcom/mse102x.c > +++ b/drivers/net/ethernet/vertexcom/mse102x.c > @@ -731,7 +731,7 @@ static int mse102x_probe_spi(struct spi_device *spi) > return 0; > } > > -static int mse102x_remove_spi(struct spi_device *spi) > +static void mse102x_remove_spi(struct spi_device *spi) > { > struct mse102x_net *mse = dev_get_drvdata(&spi->dev); > struct mse102x_net_spi *mses = to_mse102x_spi(mse); > @@ -741,8 +741,6 @@ static int mse102x_remove_spi(struct spi_device *spi) > > mse102x_remove_device_debugfs(mses); > unregister_netdev(mse->ndev); > - > - return 0; > } > > static const struct of_device_id mse102x_match_table[] = { > diff --git a/drivers/net/ethernet/wiznet/w5100-spi.c b/drivers/net/ethernet/wiznet/w5100-spi.c > index 7779a36da3c8..7c52796273a4 100644 > --- a/drivers/net/ethernet/wiznet/w5100-spi.c > +++ b/drivers/net/ethernet/wiznet/w5100-spi.c > @@ -461,11 +461,9 @@ static int w5100_spi_probe(struct spi_device *spi) > return w5100_probe(&spi->dev, ops, priv_size, mac, spi->irq, -EINVAL); > } > > -static int w5100_spi_remove(struct spi_device *spi) > +static void w5100_spi_remove(struct spi_device *spi) > { > w5100_remove(&spi->dev); > - > - return 0; > } > > static const struct spi_device_id w5100_spi_ids[] = { > diff --git a/drivers/net/ieee802154/adf7242.c b/drivers/net/ieee802154/adf7242.c > index 7db9cbd0f5de..6afdf1622944 100644 > --- a/drivers/net/ieee802154/adf7242.c > +++ b/drivers/net/ieee802154/adf7242.c > @@ -1304,7 +1304,7 @@ static int adf7242_probe(struct spi_device *spi) > return ret; > } > > -static int adf7242_remove(struct spi_device *spi) > +static void adf7242_remove(struct spi_device *spi) > { > struct adf7242_local *lp = spi_get_drvdata(spi); > > @@ -1316,8 +1316,6 @@ static int adf7242_remove(struct spi_device *spi) > ieee802154_unregister_hw(lp->hw); > mutex_destroy(&lp->bmux); > ieee802154_free_hw(lp->hw); > - > - return 0; > } > > static const struct of_device_id adf7242_of_match[] = { > diff --git a/drivers/net/ieee802154/at86rf230.c b/drivers/net/ieee802154/at86rf230.c > index 7d67f41387f5..a4734323dc29 100644 > --- a/drivers/net/ieee802154/at86rf230.c > +++ b/drivers/net/ieee802154/at86rf230.c > @@ -1759,7 +1759,7 @@ static int at86rf230_probe(struct spi_device *spi) > return rc; > } > > -static int at86rf230_remove(struct spi_device *spi) > +static void at86rf230_remove(struct spi_device *spi) > { > struct at86rf230_local *lp = spi_get_drvdata(spi); > > @@ -1769,8 +1769,6 @@ static int at86rf230_remove(struct spi_device *spi) > ieee802154_free_hw(lp->hw); > at86rf230_debugfs_remove(); > dev_dbg(&spi->dev, "unregistered at86rf230\n"); > - > - return 0; > } > > static const struct of_device_id at86rf230_of_match[] = { > diff --git a/drivers/net/ieee802154/ca8210.c b/drivers/net/ieee802154/ca8210.c > index ece6ff6049f6..b499bbe4d48f 100644 > --- a/drivers/net/ieee802154/ca8210.c > +++ b/drivers/net/ieee802154/ca8210.c > @@ -831,7 +831,7 @@ static void ca8210_rx_done(struct cas_control *cas_ctl) > finish:; > } > > -static int ca8210_remove(struct spi_device *spi_device); > +static void ca8210_remove(struct spi_device *spi_device); > > /** > * ca8210_spi_transfer_complete() - Called when a single spi transfer has > @@ -3048,7 +3048,7 @@ static void ca8210_test_interface_clear(struct ca8210_priv *priv) > * > * Return: 0 or linux error code > */ > -static int ca8210_remove(struct spi_device *spi_device) > +static void ca8210_remove(struct spi_device *spi_device) > { > struct ca8210_priv *priv; > struct ca8210_platform_data *pdata; > @@ -3088,8 +3088,6 @@ static int ca8210_remove(struct spi_device *spi_device) > if (IS_ENABLED(CONFIG_IEEE802154_CA8210_DEBUGFS)) > ca8210_test_interface_clear(priv); > } > - > - return 0; > } > > /** > diff --git a/drivers/net/ieee802154/cc2520.c b/drivers/net/ieee802154/cc2520.c > index 89c046b204e0..1e1f40f628a0 100644 > --- a/drivers/net/ieee802154/cc2520.c > +++ b/drivers/net/ieee802154/cc2520.c > @@ -1213,7 +1213,7 @@ static int cc2520_probe(struct spi_device *spi) > return ret; > } > > -static int cc2520_remove(struct spi_device *spi) > +static void cc2520_remove(struct spi_device *spi) > { > struct cc2520_private *priv = spi_get_drvdata(spi); > > @@ -1222,8 +1222,6 @@ static int cc2520_remove(struct spi_device *spi) > > ieee802154_unregister_hw(priv->hw); > ieee802154_free_hw(priv->hw); > - > - return 0; > } > > static const struct spi_device_id cc2520_ids[] = { > diff --git a/drivers/net/ieee802154/mcr20a.c b/drivers/net/ieee802154/mcr20a.c > index 8dc04e2590b1..a3af52a8e6dd 100644 > --- a/drivers/net/ieee802154/mcr20a.c > +++ b/drivers/net/ieee802154/mcr20a.c > @@ -1335,7 +1335,7 @@ mcr20a_probe(struct spi_device *spi) > return ret; > } > > -static int mcr20a_remove(struct spi_device *spi) > +static void mcr20a_remove(struct spi_device *spi) > { > struct mcr20a_local *lp = spi_get_drvdata(spi); > > @@ -1343,8 +1343,6 @@ static int mcr20a_remove(struct spi_device *spi) > > ieee802154_unregister_hw(lp->hw); > ieee802154_free_hw(lp->hw); > - > - return 0; > } > > static const struct of_device_id mcr20a_of_match[] = { > diff --git a/drivers/net/ieee802154/mrf24j40.c b/drivers/net/ieee802154/mrf24j40.c > index ff83e00b77af..ee4cfbf2c5cc 100644 > --- a/drivers/net/ieee802154/mrf24j40.c > +++ b/drivers/net/ieee802154/mrf24j40.c > @@ -1356,7 +1356,7 @@ static int mrf24j40_probe(struct spi_device *spi) > return ret; > } > > -static int mrf24j40_remove(struct spi_device *spi) > +static void mrf24j40_remove(struct spi_device *spi) > { > struct mrf24j40 *devrec = spi_get_drvdata(spi); > > @@ -1366,8 +1366,6 @@ static int mrf24j40_remove(struct spi_device *spi) > ieee802154_free_hw(devrec->hw); > /* TODO: Will ieee802154_free_device() wait until ->xmit() is > * complete? */ > - > - return 0; > } > > static const struct of_device_id mrf24j40_of_match[] = { > diff --git a/drivers/net/phy/spi_ks8995.c b/drivers/net/phy/spi_ks8995.c > index 8b5445a724ce..ff37f8ba6758 100644 > --- a/drivers/net/phy/spi_ks8995.c > +++ b/drivers/net/phy/spi_ks8995.c > @@ -517,7 +517,7 @@ static int ks8995_probe(struct spi_device *spi) > return 0; > } > > -static int ks8995_remove(struct spi_device *spi) > +static void ks8995_remove(struct spi_device *spi) > { > struct ks8995_switch *ks = spi_get_drvdata(spi); > > @@ -526,8 +526,6 @@ static int ks8995_remove(struct spi_device *spi) > /* assert reset */ > if (ks->pdata && gpio_is_valid(ks->pdata->reset_gpio)) > gpiod_set_value(gpio_to_desc(ks->pdata->reset_gpio), 1); > - > - return 0; > } > > /* ------------------------------------------------------------------------ */ > diff --git a/drivers/net/wan/slic_ds26522.c b/drivers/net/wan/slic_ds26522.c > index 8e3b1c717c10..6063552cea9b 100644 > --- a/drivers/net/wan/slic_ds26522.c > +++ b/drivers/net/wan/slic_ds26522.c > @@ -194,10 +194,9 @@ static int slic_ds26522_init_configure(struct spi_device *spi) > return 0; > } > > -static int slic_ds26522_remove(struct spi_device *spi) > +static void slic_ds26522_remove(struct spi_device *spi) > { > pr_info("DS26522 module uninstalled\n"); > - return 0; > } > > static int slic_ds26522_probe(struct spi_device *spi) > diff --git a/drivers/net/wireless/intersil/p54/p54spi.c b/drivers/net/wireless/intersil/p54/p54spi.c > index ab0fe8565851..f99b7ba69fc3 100644 > --- a/drivers/net/wireless/intersil/p54/p54spi.c > +++ b/drivers/net/wireless/intersil/p54/p54spi.c > @@ -669,7 +669,7 @@ static int p54spi_probe(struct spi_device *spi) > return ret; > } > > -static int p54spi_remove(struct spi_device *spi) > +static void p54spi_remove(struct spi_device *spi) > { > struct p54s_priv *priv = spi_get_drvdata(spi); > > @@ -684,8 +684,6 @@ static int p54spi_remove(struct spi_device *spi) > mutex_destroy(&priv->mutex); > > p54_free_common(priv->hw); > - > - return 0; > } > > > diff --git a/drivers/net/wireless/marvell/libertas/if_spi.c b/drivers/net/wireless/marvell/libertas/if_spi.c > index cd9f8ecf171f..ff1c7ec8c450 100644 > --- a/drivers/net/wireless/marvell/libertas/if_spi.c > +++ b/drivers/net/wireless/marvell/libertas/if_spi.c > @@ -1195,7 +1195,7 @@ static int if_spi_probe(struct spi_device *spi) > return err; > } > > -static int libertas_spi_remove(struct spi_device *spi) > +static void libertas_spi_remove(struct spi_device *spi) > { > struct if_spi_card *card = spi_get_drvdata(spi); > struct lbs_private *priv = card->priv; > @@ -1212,8 +1212,6 @@ static int libertas_spi_remove(struct spi_device *spi) > if (card->pdata->teardown) > card->pdata->teardown(spi); > free_if_spi_card(card); > - > - return 0; > } > > static int if_spi_suspend(struct device *dev) > diff --git a/drivers/net/wireless/microchip/wilc1000/spi.c b/drivers/net/wireless/microchip/wilc1000/spi.c > index 2c2ed4b09efd..d2db52289399 100644 > --- a/drivers/net/wireless/microchip/wilc1000/spi.c > +++ b/drivers/net/wireless/microchip/wilc1000/spi.c > @@ -240,7 +240,7 @@ static int wilc_bus_probe(struct spi_device *spi) > return ret; > } > > -static int wilc_bus_remove(struct spi_device *spi) > +static void wilc_bus_remove(struct spi_device *spi) > { > struct wilc *wilc = spi_get_drvdata(spi); > struct wilc_spi *spi_priv = wilc->bus_data; > @@ -248,8 +248,6 @@ static int wilc_bus_remove(struct spi_device *spi) > clk_disable_unprepare(wilc->rtc_clk); > wilc_netdev_cleanup(wilc); > kfree(spi_priv); > - > - return 0; > } > > static const struct of_device_id wilc_of_match[] = { > diff --git a/drivers/net/wireless/st/cw1200/cw1200_spi.c b/drivers/net/wireless/st/cw1200/cw1200_spi.c > index 271ed2ce2d7f..fe0d220da44d 100644 > --- a/drivers/net/wireless/st/cw1200/cw1200_spi.c > +++ b/drivers/net/wireless/st/cw1200/cw1200_spi.c > @@ -423,7 +423,7 @@ static int cw1200_spi_probe(struct spi_device *func) > } > > /* Disconnect Function to be called by SPI stack when device is disconnected */ > -static int cw1200_spi_disconnect(struct spi_device *func) > +static void cw1200_spi_disconnect(struct spi_device *func) > { > struct hwbus_priv *self = spi_get_drvdata(func); > > @@ -435,8 +435,6 @@ static int cw1200_spi_disconnect(struct spi_device *func) > } > } > cw1200_spi_off(dev_get_platdata(&func->dev)); > - > - return 0; > } > > static int __maybe_unused cw1200_spi_suspend(struct device *dev) > diff --git a/drivers/net/wireless/ti/wl1251/spi.c b/drivers/net/wireless/ti/wl1251/spi.c > index 5b894bd6237e..9df38726e8b0 100644 > --- a/drivers/net/wireless/ti/wl1251/spi.c > +++ b/drivers/net/wireless/ti/wl1251/spi.c > @@ -327,14 +327,12 @@ static int wl1251_spi_probe(struct spi_device *spi) > return ret; > } > > -static int wl1251_spi_remove(struct spi_device *spi) > +static void wl1251_spi_remove(struct spi_device *spi) > { > struct wl1251 *wl = spi_get_drvdata(spi); > > wl1251_free_hw(wl); > regulator_disable(wl->vio); > - > - return 0; > } > > static struct spi_driver wl1251_spi_driver = { > diff --git a/drivers/net/wireless/ti/wlcore/spi.c b/drivers/net/wireless/ti/wlcore/spi.c > index 354a7e1c3315..7eae1ec2eb2b 100644 > --- a/drivers/net/wireless/ti/wlcore/spi.c > +++ b/drivers/net/wireless/ti/wlcore/spi.c > @@ -546,13 +546,11 @@ static int wl1271_probe(struct spi_device *spi) > return ret; > } > > -static int wl1271_remove(struct spi_device *spi) > +static void wl1271_remove(struct spi_device *spi) > { > struct wl12xx_spi_glue *glue = spi_get_drvdata(spi); > > platform_device_unregister(glue->core); > - > - return 0; > } > > static struct spi_driver wl1271_spi_driver = { > diff --git a/drivers/nfc/nfcmrvl/spi.c b/drivers/nfc/nfcmrvl/spi.c > index 5b833a9a83f8..a38e2fcdfd39 100644 > --- a/drivers/nfc/nfcmrvl/spi.c > +++ b/drivers/nfc/nfcmrvl/spi.c > @@ -174,12 +174,11 @@ static int nfcmrvl_spi_probe(struct spi_device *spi) > return 0; > } > > -static int nfcmrvl_spi_remove(struct spi_device *spi) > +static void nfcmrvl_spi_remove(struct spi_device *spi) > { > struct nfcmrvl_spi_drv_data *drv_data = spi_get_drvdata(spi); > > nfcmrvl_nci_unregister_dev(drv_data->priv); > - return 0; > } > > static const struct of_device_id of_nfcmrvl_spi_match[] __maybe_unused = { > diff --git a/drivers/nfc/st-nci/spi.c b/drivers/nfc/st-nci/spi.c > index 4e723992e74c..169eacc0a32a 100644 > --- a/drivers/nfc/st-nci/spi.c > +++ b/drivers/nfc/st-nci/spi.c > @@ -263,13 +263,11 @@ static int st_nci_spi_probe(struct spi_device *dev) > return r; > } > > -static int st_nci_spi_remove(struct spi_device *dev) > +static void st_nci_spi_remove(struct spi_device *dev) > { > struct st_nci_spi_phy *phy = spi_get_drvdata(dev); > > ndlc_remove(phy->ndlc); > - > - return 0; > } > > static struct spi_device_id st_nci_spi_id_table[] = { > diff --git a/drivers/nfc/st95hf/core.c b/drivers/nfc/st95hf/core.c > index b23f47936473..ed704bb77226 100644 > --- a/drivers/nfc/st95hf/core.c > +++ b/drivers/nfc/st95hf/core.c > @@ -1198,7 +1198,7 @@ static int st95hf_probe(struct spi_device *nfc_spi_dev) > return ret; > } > > -static int st95hf_remove(struct spi_device *nfc_spi_dev) > +static void st95hf_remove(struct spi_device *nfc_spi_dev) > { > int result = 0; > unsigned char reset_cmd = ST95HF_COMMAND_RESET; > @@ -1236,8 +1236,6 @@ static int st95hf_remove(struct spi_device *nfc_spi_dev) > /* disable regulator */ > if (stcontext->st95hf_supply) > regulator_disable(stcontext->st95hf_supply); > - > - return 0; > } > > /* Register as SPI protocol driver */ > diff --git a/drivers/nfc/trf7970a.c b/drivers/nfc/trf7970a.c > index 29ca9c328df2..21d68664fe08 100644 > --- a/drivers/nfc/trf7970a.c > +++ b/drivers/nfc/trf7970a.c > @@ -2144,7 +2144,7 @@ static int trf7970a_probe(struct spi_device *spi) > return ret; > } > > -static int trf7970a_remove(struct spi_device *spi) > +static void trf7970a_remove(struct spi_device *spi) > { > struct trf7970a *trf = spi_get_drvdata(spi); > > @@ -2160,8 +2160,6 @@ static int trf7970a_remove(struct spi_device *spi) > regulator_disable(trf->regulator); > > mutex_destroy(&trf->lock); > - > - return 0; > } > > #ifdef CONFIG_PM_SLEEP > diff --git a/drivers/platform/chrome/cros_ec_spi.c b/drivers/platform/chrome/cros_ec_spi.c > index 713c58687721..8493af0f680e 100644 > --- a/drivers/platform/chrome/cros_ec_spi.c > +++ b/drivers/platform/chrome/cros_ec_spi.c > @@ -786,13 +786,11 @@ static int cros_ec_spi_probe(struct spi_device *spi) > return 0; > } > > -static int cros_ec_spi_remove(struct spi_device *spi) > +static void cros_ec_spi_remove(struct spi_device *spi) > { > struct cros_ec_device *ec_dev = spi_get_drvdata(spi); > > cros_ec_unregister(ec_dev); > - > - return 0; > } > > #ifdef CONFIG_PM_SLEEP > diff --git a/drivers/platform/olpc/olpc-xo175-ec.c b/drivers/platform/olpc/olpc-xo175-ec.c > index 0d46706afd2d..4823bd2819f6 100644 > --- a/drivers/platform/olpc/olpc-xo175-ec.c > +++ b/drivers/platform/olpc/olpc-xo175-ec.c > @@ -648,7 +648,7 @@ static struct olpc_ec_driver olpc_xo175_ec_driver = { > .ec_cmd = olpc_xo175_ec_cmd, > }; > > -static int olpc_xo175_ec_remove(struct spi_device *spi) > +static void olpc_xo175_ec_remove(struct spi_device *spi) > { > if (pm_power_off == olpc_xo175_ec_power_off) > pm_power_off = NULL; > @@ -657,8 +657,6 @@ static int olpc_xo175_ec_remove(struct spi_device *spi) > > platform_device_unregister(olpc_ec); > olpc_ec = NULL; > - > - return 0; > } > > static int olpc_xo175_ec_probe(struct spi_device *spi) > diff --git a/drivers/rtc/rtc-ds1302.c b/drivers/rtc/rtc-ds1302.c > index 2f83adef966e..6d66ab5a8b17 100644 > --- a/drivers/rtc/rtc-ds1302.c > +++ b/drivers/rtc/rtc-ds1302.c > @@ -185,10 +185,9 @@ static int ds1302_probe(struct spi_device *spi) > return 0; > } > > -static int ds1302_remove(struct spi_device *spi) > +static void ds1302_remove(struct spi_device *spi) > { > spi_set_drvdata(spi, NULL); > - return 0; > } > > #ifdef CONFIG_OF > diff --git a/drivers/rtc/rtc-ds1305.c b/drivers/rtc/rtc-ds1305.c > index 9ef107b99b65..ed9360486953 100644 > --- a/drivers/rtc/rtc-ds1305.c > +++ b/drivers/rtc/rtc-ds1305.c > @@ -720,7 +720,7 @@ static int ds1305_probe(struct spi_device *spi) > return 0; > } > > -static int ds1305_remove(struct spi_device *spi) > +static void ds1305_remove(struct spi_device *spi) > { > struct ds1305 *ds1305 = spi_get_drvdata(spi); > > @@ -730,8 +730,6 @@ static int ds1305_remove(struct spi_device *spi) > devm_free_irq(&spi->dev, spi->irq, ds1305); > cancel_work_sync(&ds1305->work); > } > - > - return 0; > } > > static struct spi_driver ds1305_driver = { > diff --git a/drivers/rtc/rtc-ds1343.c b/drivers/rtc/rtc-ds1343.c > index f14ed6c96437..ed5a6ba89a3e 100644 > --- a/drivers/rtc/rtc-ds1343.c > +++ b/drivers/rtc/rtc-ds1343.c > @@ -434,11 +434,9 @@ static int ds1343_probe(struct spi_device *spi) > return 0; > } > > -static int ds1343_remove(struct spi_device *spi) > +static void ds1343_remove(struct spi_device *spi) > { > dev_pm_clear_wake_irq(&spi->dev); > - > - return 0; > } > > #ifdef CONFIG_PM_SLEEP > diff --git a/drivers/spi/spi-mem.c b/drivers/spi/spi-mem.c > index 37f4443ce9a0..e9d83d65873b 100644 > --- a/drivers/spi/spi-mem.c > +++ b/drivers/spi/spi-mem.c > @@ -854,15 +854,13 @@ static int spi_mem_probe(struct spi_device *spi) > return memdrv->probe(mem); > } > > -static int spi_mem_remove(struct spi_device *spi) > +static void spi_mem_remove(struct spi_device *spi) > { > struct spi_mem_driver *memdrv = to_spi_mem_drv(spi->dev.driver); > struct spi_mem *mem = spi_get_drvdata(spi); > > if (memdrv->remove) > - return memdrv->remove(mem); > - > - return 0; > + memdrv->remove(mem); > } > > static void spi_mem_shutdown(struct spi_device *spi) > diff --git a/drivers/spi/spi-slave-system-control.c b/drivers/spi/spi-slave-system-control.c > index 169f3d595f60..d37cfe995a63 100644 > --- a/drivers/spi/spi-slave-system-control.c > +++ b/drivers/spi/spi-slave-system-control.c > @@ -132,13 +132,12 @@ static int spi_slave_system_control_probe(struct spi_device *spi) > return 0; > } > > -static int spi_slave_system_control_remove(struct spi_device *spi) > +static void spi_slave_system_control_remove(struct spi_device *spi) > { > struct spi_slave_system_control_priv *priv = spi_get_drvdata(spi); > > spi_slave_abort(spi); > wait_for_completion(&priv->finished); > - return 0; > } > > static struct spi_driver spi_slave_system_control_driver = { > diff --git a/drivers/spi/spi-slave-time.c b/drivers/spi/spi-slave-time.c > index f2e07a392d68..f56c1afb8534 100644 > --- a/drivers/spi/spi-slave-time.c > +++ b/drivers/spi/spi-slave-time.c > @@ -106,13 +106,12 @@ static int spi_slave_time_probe(struct spi_device *spi) > return 0; > } > > -static int spi_slave_time_remove(struct spi_device *spi) > +static void spi_slave_time_remove(struct spi_device *spi) > { > struct spi_slave_time_priv *priv = spi_get_drvdata(spi); > > spi_slave_abort(spi); > wait_for_completion(&priv->finished); > - return 0; > } > > static struct spi_driver spi_slave_time_driver = { > diff --git a/drivers/spi/spi-tle62x0.c b/drivers/spi/spi-tle62x0.c > index f8ad0709d015..a565352f6381 100644 > --- a/drivers/spi/spi-tle62x0.c > +++ b/drivers/spi/spi-tle62x0.c > @@ -288,7 +288,7 @@ static int tle62x0_probe(struct spi_device *spi) > return ret; > } > > -static int tle62x0_remove(struct spi_device *spi) > +static void tle62x0_remove(struct spi_device *spi) > { > struct tle62x0_state *st = spi_get_drvdata(spi); > int ptr; > @@ -298,7 +298,6 @@ static int tle62x0_remove(struct spi_device *spi) > > device_remove_file(&spi->dev, &dev_attr_status_show); > kfree(st); > - return 0; > } > > static struct spi_driver tle62x0_driver = { > diff --git a/drivers/spi/spi.c b/drivers/spi/spi.c > index 4599b121d744..ead9a132dcb9 100644 > --- a/drivers/spi/spi.c > +++ b/drivers/spi/spi.c > @@ -404,15 +404,8 @@ static void spi_remove(struct device *dev) > { > const struct spi_driver *sdrv = to_spi_driver(dev->driver); > > - if (sdrv->remove) { > - int ret; > - > - ret = sdrv->remove(to_spi_device(dev)); > - if (ret) > - dev_warn(dev, > - "Failed to unbind driver (%pe), ignoring\n", > - ERR_PTR(ret)); > - } > + if (sdrv->remove) > + sdrv->remove(to_spi_device(dev)); > > dev_pm_domain_detach(dev, true); > } > diff --git a/drivers/spi/spidev.c b/drivers/spi/spidev.c > index a5cceca8b82b..9468f74308bd 100644 > --- a/drivers/spi/spidev.c > +++ b/drivers/spi/spidev.c > @@ -803,7 +803,7 @@ static int spidev_probe(struct spi_device *spi) > return status; > } > > -static int spidev_remove(struct spi_device *spi) > +static void spidev_remove(struct spi_device *spi) > { > struct spidev_data *spidev = spi_get_drvdata(spi); > > @@ -820,8 +820,6 @@ static int spidev_remove(struct spi_device *spi) > if (spidev->users == 0) > kfree(spidev); > mutex_unlock(&device_list_lock); > - > - return 0; > } > > static struct spi_driver spidev_spi_driver = { > diff --git a/drivers/staging/fbtft/fbtft.h b/drivers/staging/fbtft/fbtft.h > index 6a7545b5bcd2..b68f5f9b7c78 100644 > --- a/drivers/staging/fbtft/fbtft.h > +++ b/drivers/staging/fbtft/fbtft.h > @@ -286,12 +286,11 @@ static int fbtft_driver_probe_spi(struct spi_device *spi) \ > return fbtft_probe_common(_display, spi, NULL); \ > } \ > \ > -static int fbtft_driver_remove_spi(struct spi_device *spi) \ > +static void fbtft_driver_remove_spi(struct spi_device *spi) \ > { \ > struct fb_info *info = spi_get_drvdata(spi); \ > \ > fbtft_remove_common(&spi->dev, info); \ > - return 0; \ > } \ > \ > static struct spi_driver fbtft_driver_spi_driver = { \ > diff --git a/drivers/staging/pi433/pi433_if.c b/drivers/staging/pi433/pi433_if.c > index 68c09fa016ed..1d31c35875e3 100644 > --- a/drivers/staging/pi433/pi433_if.c > +++ b/drivers/staging/pi433/pi433_if.c > @@ -1264,7 +1264,7 @@ static int pi433_probe(struct spi_device *spi) > return retval; > } > > -static int pi433_remove(struct spi_device *spi) > +static void pi433_remove(struct spi_device *spi) > { > struct pi433_device *device = spi_get_drvdata(spi); > > @@ -1284,8 +1284,6 @@ static int pi433_remove(struct spi_device *spi) > > kfree(device->rx_buffer); > kfree(device); > - > - return 0; > } > > static const struct of_device_id pi433_dt_ids[] = { > diff --git a/drivers/staging/wfx/bus_spi.c b/drivers/staging/wfx/bus_spi.c > index 55ffcd7c42e2..fa0ff66a457d 100644 > --- a/drivers/staging/wfx/bus_spi.c > +++ b/drivers/staging/wfx/bus_spi.c > @@ -232,12 +232,11 @@ static int wfx_spi_probe(struct spi_device *func) > return wfx_probe(bus->core); > } > > -static int wfx_spi_remove(struct spi_device *func) > +static void wfx_spi_remove(struct spi_device *func) > { > struct wfx_spi_priv *bus = spi_get_drvdata(func); > > wfx_release(bus->core); > - return 0; > } > > /* For dynamic driver binding, kernel does not use OF to match driver. It only > diff --git a/drivers/tty/serial/max3100.c b/drivers/tty/serial/max3100.c > index 3c92d4e01488..516cff362434 100644 > --- a/drivers/tty/serial/max3100.c > +++ b/drivers/tty/serial/max3100.c > @@ -805,7 +805,7 @@ static int max3100_probe(struct spi_device *spi) > return 0; > } > > -static int max3100_remove(struct spi_device *spi) > +static void max3100_remove(struct spi_device *spi) > { > struct max3100_port *s = spi_get_drvdata(spi); > int i; > @@ -828,13 +828,12 @@ static int max3100_remove(struct spi_device *spi) > for (i = 0; i < MAX_MAX3100; i++) > if (max3100s[i]) { > mutex_unlock(&max3100s_lock); > - return 0; > + return; > } > pr_debug("removing max3100 driver\n"); > uart_unregister_driver(&max3100_uart_driver); > > mutex_unlock(&max3100s_lock); > - return 0; > } > > #ifdef CONFIG_PM_SLEEP > diff --git a/drivers/tty/serial/max310x.c b/drivers/tty/serial/max310x.c > index dde0824b2fa5..3112b4a05448 100644 > --- a/drivers/tty/serial/max310x.c > +++ b/drivers/tty/serial/max310x.c > @@ -1487,10 +1487,9 @@ static int max310x_spi_probe(struct spi_device *spi) > return max310x_probe(&spi->dev, devtype, regmap, spi->irq); > } > > -static int max310x_spi_remove(struct spi_device *spi) > +static void max310x_spi_remove(struct spi_device *spi) > { > max310x_remove(&spi->dev); > - return 0; > } > > static const struct spi_device_id max310x_id_table[] = { > diff --git a/drivers/tty/serial/sc16is7xx.c b/drivers/tty/serial/sc16is7xx.c > index 64e7e6c8145f..25d67b8c4db7 100644 > --- a/drivers/tty/serial/sc16is7xx.c > +++ b/drivers/tty/serial/sc16is7xx.c > @@ -1440,11 +1440,9 @@ static int sc16is7xx_spi_probe(struct spi_device *spi) > return sc16is7xx_probe(&spi->dev, devtype, regmap, spi->irq); > } > > -static int sc16is7xx_spi_remove(struct spi_device *spi) > +static void sc16is7xx_spi_remove(struct spi_device *spi) > { > sc16is7xx_remove(&spi->dev); > - > - return 0; > } > > static const struct spi_device_id sc16is7xx_spi_id_table[] = { > diff --git a/drivers/usb/gadget/udc/max3420_udc.c b/drivers/usb/gadget/udc/max3420_udc.c > index d2a2b20cc1ad..7d9bd16190c0 100644 > --- a/drivers/usb/gadget/udc/max3420_udc.c > +++ b/drivers/usb/gadget/udc/max3420_udc.c > @@ -1292,7 +1292,7 @@ static int max3420_probe(struct spi_device *spi) > return err; > } > > -static int max3420_remove(struct spi_device *spi) > +static void max3420_remove(struct spi_device *spi) > { > struct max3420_udc *udc = spi_get_drvdata(spi); > unsigned long flags; > @@ -1304,8 +1304,6 @@ static int max3420_remove(struct spi_device *spi) > kthread_stop(udc->thread_task); > > spin_unlock_irqrestore(&udc->lock, flags); > - > - return 0; > } > > static const struct of_device_id max3420_udc_of_match[] = { > diff --git a/drivers/usb/host/max3421-hcd.c b/drivers/usb/host/max3421-hcd.c > index 30de85a707fe..99a5523a79fb 100644 > --- a/drivers/usb/host/max3421-hcd.c > +++ b/drivers/usb/host/max3421-hcd.c > @@ -1926,7 +1926,7 @@ max3421_probe(struct spi_device *spi) > return retval; > } > > -static int > +static void > max3421_remove(struct spi_device *spi) > { > struct max3421_hcd *max3421_hcd; > @@ -1947,7 +1947,6 @@ max3421_remove(struct spi_device *spi) > free_irq(spi->irq, hcd); > > usb_put_hcd(hcd); > - return 0; > } > > static const struct of_device_id max3421_of_match_table[] = { > diff --git a/drivers/video/backlight/ams369fg06.c b/drivers/video/backlight/ams369fg06.c > index 8a4361e95a11..522dd81110b8 100644 > --- a/drivers/video/backlight/ams369fg06.c > +++ b/drivers/video/backlight/ams369fg06.c > @@ -506,12 +506,11 @@ static int ams369fg06_probe(struct spi_device *spi) > return 0; > } > > -static int ams369fg06_remove(struct spi_device *spi) > +static void ams369fg06_remove(struct spi_device *spi) > { > struct ams369fg06 *lcd = spi_get_drvdata(spi); > > ams369fg06_power(lcd, FB_BLANK_POWERDOWN); > - return 0; > } > > #ifdef CONFIG_PM_SLEEP > diff --git a/drivers/video/backlight/corgi_lcd.c b/drivers/video/backlight/corgi_lcd.c > index 33f5d80495e6..0a57033ae31d 100644 > --- a/drivers/video/backlight/corgi_lcd.c > +++ b/drivers/video/backlight/corgi_lcd.c > @@ -542,7 +542,7 @@ static int corgi_lcd_probe(struct spi_device *spi) > return 0; > } > > -static int corgi_lcd_remove(struct spi_device *spi) > +static void corgi_lcd_remove(struct spi_device *spi) > { > struct corgi_lcd *lcd = spi_get_drvdata(spi); > > @@ -550,7 +550,6 @@ static int corgi_lcd_remove(struct spi_device *spi) > lcd->bl_dev->props.brightness = 0; > backlight_update_status(lcd->bl_dev); > corgi_lcd_set_power(lcd->lcd_dev, FB_BLANK_POWERDOWN); > - return 0; > } > > static struct spi_driver corgi_lcd_driver = { > diff --git a/drivers/video/backlight/ili922x.c b/drivers/video/backlight/ili922x.c > index 328aba9cddad..e7b6bd827986 100644 > --- a/drivers/video/backlight/ili922x.c > +++ b/drivers/video/backlight/ili922x.c > @@ -526,10 +526,9 @@ static int ili922x_probe(struct spi_device *spi) > return 0; > } > > -static int ili922x_remove(struct spi_device *spi) > +static void ili922x_remove(struct spi_device *spi) > { > ili922x_poweroff(spi); > - return 0; > } > > static struct spi_driver ili922x_driver = { > diff --git a/drivers/video/backlight/l4f00242t03.c b/drivers/video/backlight/l4f00242t03.c > index 46f97d1c3d21..cc763cf15f53 100644 > --- a/drivers/video/backlight/l4f00242t03.c > +++ b/drivers/video/backlight/l4f00242t03.c > @@ -223,12 +223,11 @@ static int l4f00242t03_probe(struct spi_device *spi) > return 0; > } > > -static int l4f00242t03_remove(struct spi_device *spi) > +static void l4f00242t03_remove(struct spi_device *spi) > { > struct l4f00242t03_priv *priv = spi_get_drvdata(spi); > > l4f00242t03_lcd_power_set(priv->ld, FB_BLANK_POWERDOWN); > - return 0; > } > > static void l4f00242t03_shutdown(struct spi_device *spi) > diff --git a/drivers/video/backlight/lms501kf03.c b/drivers/video/backlight/lms501kf03.c > index f949b66dce1b..5c46df8022bf 100644 > --- a/drivers/video/backlight/lms501kf03.c > +++ b/drivers/video/backlight/lms501kf03.c > @@ -364,12 +364,11 @@ static int lms501kf03_probe(struct spi_device *spi) > return 0; > } > > -static int lms501kf03_remove(struct spi_device *spi) > +static void lms501kf03_remove(struct spi_device *spi) > { > struct lms501kf03 *lcd = spi_get_drvdata(spi); > > lms501kf03_power(lcd, FB_BLANK_POWERDOWN); > - return 0; > } > > #ifdef CONFIG_PM_SLEEP > diff --git a/drivers/video/backlight/ltv350qv.c b/drivers/video/backlight/ltv350qv.c > index 5cbf621e48bd..b6d373af6e3f 100644 > --- a/drivers/video/backlight/ltv350qv.c > +++ b/drivers/video/backlight/ltv350qv.c > @@ -255,12 +255,11 @@ static int ltv350qv_probe(struct spi_device *spi) > return 0; > } > > -static int ltv350qv_remove(struct spi_device *spi) > +static void ltv350qv_remove(struct spi_device *spi) > { > struct ltv350qv *lcd = spi_get_drvdata(spi); > > ltv350qv_power(lcd, FB_BLANK_POWERDOWN); > - return 0; > } > > #ifdef CONFIG_PM_SLEEP > diff --git a/drivers/video/backlight/tdo24m.c b/drivers/video/backlight/tdo24m.c > index 0de044dcafd5..fc6fbaf85594 100644 > --- a/drivers/video/backlight/tdo24m.c > +++ b/drivers/video/backlight/tdo24m.c > @@ -397,12 +397,11 @@ static int tdo24m_probe(struct spi_device *spi) > return 0; > } > > -static int tdo24m_remove(struct spi_device *spi) > +static void tdo24m_remove(struct spi_device *spi) > { > struct tdo24m *lcd = spi_get_drvdata(spi); > > tdo24m_power(lcd, FB_BLANK_POWERDOWN); > - return 0; > } > > #ifdef CONFIG_PM_SLEEP > diff --git a/drivers/video/backlight/tosa_lcd.c b/drivers/video/backlight/tosa_lcd.c > index 38765544345b..23d6c6bf0f54 100644 > --- a/drivers/video/backlight/tosa_lcd.c > +++ b/drivers/video/backlight/tosa_lcd.c > @@ -232,15 +232,13 @@ static int tosa_lcd_probe(struct spi_device *spi) > return ret; > } > > -static int tosa_lcd_remove(struct spi_device *spi) > +static void tosa_lcd_remove(struct spi_device *spi) > { > struct tosa_lcd_data *data = spi_get_drvdata(spi); > > i2c_unregister_device(data->i2c); > > tosa_lcd_tg_off(data); > - > - return 0; > } > > #ifdef CONFIG_PM_SLEEP > diff --git a/drivers/video/backlight/vgg2432a4.c b/drivers/video/backlight/vgg2432a4.c > index 3567b45f9ba9..bfc1913e8b55 100644 > --- a/drivers/video/backlight/vgg2432a4.c > +++ b/drivers/video/backlight/vgg2432a4.c > @@ -233,11 +233,9 @@ static int vgg2432a4_probe(struct spi_device *spi) > return 0; > } > > -static int vgg2432a4_remove(struct spi_device *spi) > +static void vgg2432a4_remove(struct spi_device *spi) > { > ili9320_remove(spi_get_drvdata(spi)); > - > - return 0; > } > > static void vgg2432a4_shutdown(struct spi_device *spi) > diff --git a/drivers/video/fbdev/omap/lcd_mipid.c b/drivers/video/fbdev/omap/lcd_mipid.c > index a75ae0c9b14c..03cff39d392d 100644 > --- a/drivers/video/fbdev/omap/lcd_mipid.c > +++ b/drivers/video/fbdev/omap/lcd_mipid.c > @@ -570,14 +570,12 @@ static int mipid_spi_probe(struct spi_device *spi) > return 0; > } > > -static int mipid_spi_remove(struct spi_device *spi) > +static void mipid_spi_remove(struct spi_device *spi) > { > struct mipid_device *md = dev_get_drvdata(&spi->dev); > > mipid_disable(&md->panel); > kfree(md); > - > - return 0; > } > > static struct spi_driver mipid_spi_driver = { > diff --git a/drivers/video/fbdev/omap2/omapfb/displays/panel-lgphilips-lb035q02.c b/drivers/video/fbdev/omap2/omapfb/displays/panel-lgphilips-lb035q02.c > index 1bec7a4422e8..aab67721263d 100644 > --- a/drivers/video/fbdev/omap2/omapfb/displays/panel-lgphilips-lb035q02.c > +++ b/drivers/video/fbdev/omap2/omapfb/displays/panel-lgphilips-lb035q02.c > @@ -316,7 +316,7 @@ static int lb035q02_panel_spi_probe(struct spi_device *spi) > return r; > } > > -static int lb035q02_panel_spi_remove(struct spi_device *spi) > +static void lb035q02_panel_spi_remove(struct spi_device *spi) > { > struct panel_drv_data *ddata = spi_get_drvdata(spi); > struct omap_dss_device *dssdev = &ddata->dssdev; > @@ -328,8 +328,6 @@ static int lb035q02_panel_spi_remove(struct spi_device *spi) > lb035q02_disconnect(dssdev); > > omap_dss_put_device(in); > - > - return 0; > } > > static const struct of_device_id lb035q02_of_match[] = { > diff --git a/drivers/video/fbdev/omap2/omapfb/displays/panel-nec-nl8048hl11.c b/drivers/video/fbdev/omap2/omapfb/displays/panel-nec-nl8048hl11.c > index dff9ebbadfc0..be9910ff6e62 100644 > --- a/drivers/video/fbdev/omap2/omapfb/displays/panel-nec-nl8048hl11.c > +++ b/drivers/video/fbdev/omap2/omapfb/displays/panel-nec-nl8048hl11.c > @@ -327,7 +327,7 @@ static int nec_8048_probe(struct spi_device *spi) > return r; > } > > -static int nec_8048_remove(struct spi_device *spi) > +static void nec_8048_remove(struct spi_device *spi) > { > struct panel_drv_data *ddata = dev_get_drvdata(&spi->dev); > struct omap_dss_device *dssdev = &ddata->dssdev; > @@ -341,8 +341,6 @@ static int nec_8048_remove(struct spi_device *spi) > nec_8048_disconnect(dssdev); > > omap_dss_put_device(in); > - > - return 0; > } > > #ifdef CONFIG_PM_SLEEP > diff --git a/drivers/video/fbdev/omap2/omapfb/displays/panel-sony-acx565akm.c b/drivers/video/fbdev/omap2/omapfb/displays/panel-sony-acx565akm.c > index 8d8b5ff7d43c..a909b5385ca5 100644 > --- a/drivers/video/fbdev/omap2/omapfb/displays/panel-sony-acx565akm.c > +++ b/drivers/video/fbdev/omap2/omapfb/displays/panel-sony-acx565akm.c > @@ -857,7 +857,7 @@ static int acx565akm_probe(struct spi_device *spi) > return r; > } > > -static int acx565akm_remove(struct spi_device *spi) > +static void acx565akm_remove(struct spi_device *spi) > { > struct panel_drv_data *ddata = dev_get_drvdata(&spi->dev); > struct omap_dss_device *dssdev = &ddata->dssdev; > @@ -874,8 +874,6 @@ static int acx565akm_remove(struct spi_device *spi) > acx565akm_disconnect(dssdev); > > omap_dss_put_device(in); > - > - return 0; > } > > static const struct of_device_id acx565akm_of_match[] = { > diff --git a/drivers/video/fbdev/omap2/omapfb/displays/panel-tpo-td028ttec1.c b/drivers/video/fbdev/omap2/omapfb/displays/panel-tpo-td028ttec1.c > index 595ebd8bd5dc..3c0f887d3092 100644 > --- a/drivers/video/fbdev/omap2/omapfb/displays/panel-tpo-td028ttec1.c > +++ b/drivers/video/fbdev/omap2/omapfb/displays/panel-tpo-td028ttec1.c > @@ -425,7 +425,7 @@ static int td028ttec1_panel_probe(struct spi_device *spi) > return r; > } > > -static int td028ttec1_panel_remove(struct spi_device *spi) > +static void td028ttec1_panel_remove(struct spi_device *spi) > { > struct panel_drv_data *ddata = dev_get_drvdata(&spi->dev); > struct omap_dss_device *dssdev = &ddata->dssdev; > @@ -439,8 +439,6 @@ static int td028ttec1_panel_remove(struct spi_device *spi) > td028ttec1_panel_disconnect(dssdev); > > omap_dss_put_device(in); > - > - return 0; > } > > static const struct of_device_id td028ttec1_of_match[] = { > diff --git a/drivers/video/fbdev/omap2/omapfb/displays/panel-tpo-td043mtea1.c b/drivers/video/fbdev/omap2/omapfb/displays/panel-tpo-td043mtea1.c > index afac1d9445aa..58bbba7c037f 100644 > --- a/drivers/video/fbdev/omap2/omapfb/displays/panel-tpo-td043mtea1.c > +++ b/drivers/video/fbdev/omap2/omapfb/displays/panel-tpo-td043mtea1.c > @@ -564,7 +564,7 @@ static int tpo_td043_probe(struct spi_device *spi) > return r; > } > > -static int tpo_td043_remove(struct spi_device *spi) > +static void tpo_td043_remove(struct spi_device *spi) > { > struct panel_drv_data *ddata = dev_get_drvdata(&spi->dev); > struct omap_dss_device *dssdev = &ddata->dssdev; > @@ -580,8 +580,6 @@ static int tpo_td043_remove(struct spi_device *spi) > omap_dss_put_device(in); > > sysfs_remove_group(&spi->dev.kobj, &tpo_td043_attr_group); > - > - return 0; > } > > #ifdef CONFIG_PM_SLEEP > diff --git a/include/linux/spi/spi.h b/include/linux/spi/spi.h > index 7ab3fed7b804..c84e61b99c7b 100644 > --- a/include/linux/spi/spi.h > +++ b/include/linux/spi/spi.h > @@ -280,7 +280,7 @@ struct spi_message; > struct spi_driver { > const struct spi_device_id *id_table; > int (*probe)(struct spi_device *spi); > - int (*remove)(struct spi_device *spi); > + void (*remove)(struct spi_device *spi); > void (*shutdown)(struct spi_device *spi); > struct device_driver driver; > }; > diff --git a/sound/pci/hda/cs35l41_hda_spi.c b/sound/pci/hda/cs35l41_hda_spi.c > index 9f8123893cc8..50eb6c0e6658 100644 > --- a/sound/pci/hda/cs35l41_hda_spi.c > +++ b/sound/pci/hda/cs35l41_hda_spi.c > @@ -28,11 +28,9 @@ static int cs35l41_hda_spi_probe(struct spi_device *spi) > devm_regmap_init_spi(spi, &cs35l41_regmap_spi)); > } > > -static int cs35l41_hda_spi_remove(struct spi_device *spi) > +static void cs35l41_hda_spi_remove(struct spi_device *spi) > { > cs35l41_hda_remove(&spi->dev); > - > - return 0; > } > > static const struct spi_device_id cs35l41_hda_spi_id[] = { > diff --git a/sound/soc/codecs/adau1761-spi.c b/sound/soc/codecs/adau1761-spi.c > index 655689c9778a..7c9242c2ff94 100644 > --- a/sound/soc/codecs/adau1761-spi.c > +++ b/sound/soc/codecs/adau1761-spi.c > @@ -45,10 +45,9 @@ static int adau1761_spi_probe(struct spi_device *spi) > id->driver_data, adau1761_spi_switch_mode); > } > > -static int adau1761_spi_remove(struct spi_device *spi) > +static void adau1761_spi_remove(struct spi_device *spi) > { > adau17x1_remove(&spi->dev); > - return 0; > } > > static const struct spi_device_id adau1761_spi_id[] = { > diff --git a/sound/soc/codecs/adau1781-spi.c b/sound/soc/codecs/adau1781-spi.c > index bb5613574786..1a09633d5a88 100644 > --- a/sound/soc/codecs/adau1781-spi.c > +++ b/sound/soc/codecs/adau1781-spi.c > @@ -45,10 +45,9 @@ static int adau1781_spi_probe(struct spi_device *spi) > id->driver_data, adau1781_spi_switch_mode); > } > > -static int adau1781_spi_remove(struct spi_device *spi) > +static void adau1781_spi_remove(struct spi_device *spi) > { > adau17x1_remove(&spi->dev); > - return 0; > } > > static const struct spi_device_id adau1781_spi_id[] = { > diff --git a/sound/soc/codecs/cs35l41-spi.c b/sound/soc/codecs/cs35l41-spi.c > index 6dfd5459aa20..169221a5b09f 100644 > --- a/sound/soc/codecs/cs35l41-spi.c > +++ b/sound/soc/codecs/cs35l41-spi.c > @@ -55,13 +55,11 @@ static int cs35l41_spi_probe(struct spi_device *spi) > return cs35l41_probe(cs35l41, pdata); > } > > -static int cs35l41_spi_remove(struct spi_device *spi) > +static void cs35l41_spi_remove(struct spi_device *spi) > { > struct cs35l41_private *cs35l41 = spi_get_drvdata(spi); > > cs35l41_remove(cs35l41); > - > - return 0; > } > > #ifdef CONFIG_OF > diff --git a/sound/soc/codecs/pcm3168a-spi.c b/sound/soc/codecs/pcm3168a-spi.c > index ecd379f308e6..b5b08046f545 100644 > --- a/sound/soc/codecs/pcm3168a-spi.c > +++ b/sound/soc/codecs/pcm3168a-spi.c > @@ -26,11 +26,9 @@ static int pcm3168a_spi_probe(struct spi_device *spi) > return pcm3168a_probe(&spi->dev, regmap); > } > > -static int pcm3168a_spi_remove(struct spi_device *spi) > +static void pcm3168a_spi_remove(struct spi_device *spi) > { > pcm3168a_remove(&spi->dev); > - > - return 0; > } > > static const struct spi_device_id pcm3168a_spi_id[] = { > diff --git a/sound/soc/codecs/pcm512x-spi.c b/sound/soc/codecs/pcm512x-spi.c > index 7cf559b47e1c..4d29e7196380 100644 > --- a/sound/soc/codecs/pcm512x-spi.c > +++ b/sound/soc/codecs/pcm512x-spi.c > @@ -26,10 +26,9 @@ static int pcm512x_spi_probe(struct spi_device *spi) > return pcm512x_probe(&spi->dev, regmap); > } > > -static int pcm512x_spi_remove(struct spi_device *spi) > +static void pcm512x_spi_remove(struct spi_device *spi) > { > pcm512x_remove(&spi->dev); > - return 0; > } > > static const struct spi_device_id pcm512x_spi_id[] = { > diff --git a/sound/soc/codecs/tlv320aic32x4-spi.c b/sound/soc/codecs/tlv320aic32x4-spi.c > index a8958cd1c692..03cce8d6404f 100644 > --- a/sound/soc/codecs/tlv320aic32x4-spi.c > +++ b/sound/soc/codecs/tlv320aic32x4-spi.c > @@ -46,11 +46,9 @@ static int aic32x4_spi_probe(struct spi_device *spi) > return aic32x4_probe(&spi->dev, regmap); > } > > -static int aic32x4_spi_remove(struct spi_device *spi) > +static void aic32x4_spi_remove(struct spi_device *spi) > { > aic32x4_remove(&spi->dev); > - > - return 0; > } > > static const struct spi_device_id aic32x4_spi_id[] = { > diff --git a/sound/soc/codecs/tlv320aic3x-spi.c b/sound/soc/codecs/tlv320aic3x-spi.c > index 494e84402232..deed6ec7e081 100644 > --- a/sound/soc/codecs/tlv320aic3x-spi.c > +++ b/sound/soc/codecs/tlv320aic3x-spi.c > @@ -35,11 +35,9 @@ static int aic3x_spi_probe(struct spi_device *spi) > return aic3x_probe(&spi->dev, regmap, id->driver_data); > } > > -static int aic3x_spi_remove(struct spi_device *spi) > +static void aic3x_spi_remove(struct spi_device *spi) > { > aic3x_remove(&spi->dev); > - > - return 0; > } > > static const struct spi_device_id aic3x_spi_id[] = { > diff --git a/sound/soc/codecs/wm0010.c b/sound/soc/codecs/wm0010.c > index 28b4656c4e14..1bef1c500c8e 100644 > --- a/sound/soc/codecs/wm0010.c > +++ b/sound/soc/codecs/wm0010.c > @@ -969,7 +969,7 @@ static int wm0010_spi_probe(struct spi_device *spi) > return 0; > } > > -static int wm0010_spi_remove(struct spi_device *spi) > +static void wm0010_spi_remove(struct spi_device *spi) > { > struct wm0010_priv *wm0010 = spi_get_drvdata(spi); > > @@ -980,8 +980,6 @@ static int wm0010_spi_remove(struct spi_device *spi) > > if (wm0010->irq) > free_irq(wm0010->irq, wm0010); > - > - return 0; > } > > static struct spi_driver wm0010_spi_driver = { > diff --git a/sound/soc/codecs/wm8804-spi.c b/sound/soc/codecs/wm8804-spi.c > index 9a8da1511c34..628568724c20 100644 > --- a/sound/soc/codecs/wm8804-spi.c > +++ b/sound/soc/codecs/wm8804-spi.c > @@ -24,10 +24,9 @@ static int wm8804_spi_probe(struct spi_device *spi) > return wm8804_probe(&spi->dev, regmap); > } > > -static int wm8804_spi_remove(struct spi_device *spi) > +static void wm8804_spi_remove(struct spi_device *spi) > { > wm8804_remove(&spi->dev); > - return 0; > } > > static const struct of_device_id wm8804_of_match[] = { > diff --git a/sound/spi/at73c213.c b/sound/spi/at73c213.c > index 76c0e37a838c..56d2c712e257 100644 > --- a/sound/spi/at73c213.c > +++ b/sound/spi/at73c213.c > @@ -1001,7 +1001,7 @@ static int snd_at73c213_probe(struct spi_device *spi) > return retval; > } > > -static int snd_at73c213_remove(struct spi_device *spi) > +static void snd_at73c213_remove(struct spi_device *spi) > { > struct snd_card *card = dev_get_drvdata(&spi->dev); > struct snd_at73c213 *chip = card->private_data; > @@ -1066,8 +1066,6 @@ static int snd_at73c213_remove(struct spi_device *spi) > > ssc_free(chip->ssc); > snd_card_free(card); > - > - return 0; > } > > #ifdef CONFIG_PM_SLEEP -- DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: (+49)-8142-66989-54 Fax: (+49)-8142-66989-80 Email: ch(a)denx.de

1 0

[PATCH v2 1/5] ASoC: sh: rz-ssi: Drop calling rz_ssi_pio_recv() recursively
by Lad Prabhakar 25 Jan '22

25 Jan '22

Instead of recursively calling rz_ssi_pio_recv() use a loop instead to read the samples from RX fifo. Inspiration for this patch is to avoid recursion, as recursion is unwelcome in kernel due to limited stack use. Also to add this driver will later be used on RZ/A2 SoC's which runs with limited memory. This also fixes an issue where the return value of rz_ssi_pio_recv() was ignored when called recursively. Fixes: 03e786bd4341 ("ASoC: sh: Add RZ/G2L SSIF-2 driver") Reported-by: Pavel Machek <pavel(a)denx.de> Signed-off-by: Lad Prabhakar <prabhakar.mahadev-lad.rj(a)bp.renesas.com> Reviewed-by: Biju Das <biju.das.jz(a)bp.renesas.com> --- v1->v2 * Used a do while loop * Fixed comments pointed by Cezary. --- sound/soc/sh/rz-ssi.c | 65 +++++++++++++++++++++---------------------- 1 file changed, 31 insertions(+), 34 deletions(-) diff --git a/sound/soc/sh/rz-ssi.c b/sound/soc/sh/rz-ssi.c index fa0cc08f70ec..637802117c6c 100644 --- a/sound/soc/sh/rz-ssi.c +++ b/sound/soc/sh/rz-ssi.c @@ -414,51 +414,48 @@ static int rz_ssi_pio_recv(struct rz_ssi_priv *ssi, struct rz_ssi_stream *strm) u16 *buf; int fifo_samples; int frames_left; - int samples = 0; + int samples; int i; if (!rz_ssi_stream_is_valid(ssi, strm)) return -EINVAL; runtime = substream->runtime; - /* frames left in this period */ - frames_left = runtime->period_size - (strm->buffer_pos % - runtime->period_size); - if (frames_left == 0) - frames_left = runtime->period_size; - /* Samples in RX FIFO */ - fifo_samples = (rz_ssi_reg_readl(ssi, SSIFSR) >> - SSIFSR_RDC_SHIFT) & SSIFSR_RDC_MASK; - - /* Only read full frames at a time */ - while (frames_left && (fifo_samples >= runtime->channels)) { - samples += runtime->channels; - fifo_samples -= runtime->channels; - frames_left--; - } - - /* not enough samples yet */ - if (samples == 0) - return 0; + do { + /* frames left in this period */ + frames_left = runtime->period_size - + (strm->buffer_pos % runtime->period_size); + if (!frames_left) + frames_left = runtime->period_size; + + /* Samples in RX FIFO */ + fifo_samples = (rz_ssi_reg_readl(ssi, SSIFSR) >> + SSIFSR_RDC_SHIFT) & SSIFSR_RDC_MASK; + + /* Only read full frames at a time */ + samples = 0; + while (frames_left && (fifo_samples >= runtime->channels)) { + samples += runtime->channels; + fifo_samples -= runtime->channels; + frames_left--; + } - /* calculate new buffer index */ - buf = (u16 *)(runtime->dma_area); - buf += strm->buffer_pos * runtime->channels; + /* not enough samples yet */ + if (!samples) + break; - /* Note, only supports 16-bit samples */ - for (i = 0; i < samples; i++) - *buf++ = (u16)(rz_ssi_reg_readl(ssi, SSIFRDR) >> 16); + /* calculate new buffer index */ + buf = (u16 *)runtime->dma_area; + buf += strm->buffer_pos * runtime->channels; - rz_ssi_reg_mask_setl(ssi, SSIFSR, SSIFSR_RDF, 0); - rz_ssi_pointer_update(strm, samples / runtime->channels); + /* Note, only supports 16-bit samples */ + for (i = 0; i < samples; i++) + *buf++ = (u16)(rz_ssi_reg_readl(ssi, SSIFRDR) >> 16); - /* - * If we finished this period, but there are more samples in - * the RX FIFO, call this function again - */ - if (frames_left == 0 && fifo_samples >= runtime->channels) - rz_ssi_pio_recv(ssi, strm); + rz_ssi_reg_mask_setl(ssi, SSIFSR, SSIFSR_RDF, 0); + rz_ssi_pointer_update(strm, samples / runtime->channels); + } while (!frames_left && fifo_samples >= runtime->channels); return 0; } -- 2.17.1

3 2

[PATCH v3 0/6] ASoC: Xilinx fixes
by Robert Hancock 25 Jan '22

25 Jan '22

There are drivers in mainline for the Xilinx Audio Formatter and Xilinx I2S IP cores. However, because of a few issues, these were only really usable with Xilinx's xlnx_pl_snd_card top-level driver, which is not in mainline (and not suitable for mainline). The fixes in this patchset, for the simple-card layer as well as the Xilinx drivers, now allow these drivers to be properly used with simple-card without any out-of-tree support code. Changes since v2: -drop patches already merged -added constraint to simple-card to allow enforcing valid sample rates Changes since v1: -formatting fixes -renamed last_sysclk variables to sysclk -require exact match for clock divisor rather than rounding to nearest -broke out driver data structure change in xlnx_i2s to separate patch -added constraints for sample rate based on sysclk to xlnx_i2s -switched to separate function for DAI parsing for platforms in simple_card Robert Hancock (6): ASoC: xilinx: xlnx_formatter_pcm: Handle sysclk setting ASoC: xilinx: xlnx_i2s: create drvdata structure ASoC: xilinx: xlnx_i2s: Handle sysclk setting ASoC: simple-card-utils: Set sysclk on all components ASoC: dt-bindings: simple-card: document new system-clock-fixed flag ASoC: simple-card-utils: Add new system-clock-fixed flag .../bindings/sound/simple-card.yaml | 11 ++ include/sound/simple_card_utils.h | 1 + sound/soc/generic/simple-card-utils.c | 86 ++++++++-- sound/soc/xilinx/xlnx_formatter_pcm.c | 25 +++ sound/soc/xilinx/xlnx_i2s.c | 147 +++++++++++++----- 5 files changed, 223 insertions(+), 47 deletions(-) -- 2.31.1

4 10

[PATCH] ASoC: amd: sof-mach: Add support for RT5682S and RT1019 card
by V sujith kumar Reddy 25 Jan '22

25 Jan '22

We have new platform with rt5682s as a primary codec and rt1019 as an amp codec. Add machine struct to register sof audio based sound card on such Chrome machine. Signed-off-by: Ajit Kumar Pandey <AjitKumar.Pandey(a)amd.com> Signed-off-by: V sujith kumar Reddy <vsujithkumar.reddy(a)amd.com> --- sound/soc/amd/acp-config.c | 9 +++++++++ sound/soc/amd/acp/acp-sof-mach.c | 14 ++++++++++++++ 2 files changed, 23 insertions(+) diff --git a/sound/soc/amd/acp-config.c b/sound/soc/amd/acp-config.c index c9e1c08364f3..5cbc82eca4c9 100644 --- a/sound/soc/amd/acp-config.c +++ b/sound/soc/amd/acp-config.c @@ -110,6 +110,15 @@ struct snd_soc_acpi_mach snd_soc_acpi_amd_sof_machines[] = { .fw_filename = "sof-rn.ri", .sof_tplg_filename = "sof-rn-rt5682-max98360.tplg", }, + { + .id = "RTL5682", + .drv_name = "rt5682s-rt1019", + .pdata = (void *)&acp_quirk_data, + .machine_quirk = snd_soc_acpi_codec_list, + .quirk_data = &amp_rt1019, + .fw_filename = "sof-rn.ri", + .sof_tplg_filename = "sof-rn-rt5682-rt1019.tplg", + }, { .id = "AMDI1019", .drv_name = "renoir-dsp", diff --git a/sound/soc/amd/acp/acp-sof-mach.c b/sound/soc/amd/acp/acp-sof-mach.c index 07de46142655..c1d9650fc222 100644 --- a/sound/soc/amd/acp/acp-sof-mach.c +++ b/sound/soc/amd/acp/acp-sof-mach.c @@ -40,6 +40,15 @@ static struct acp_card_drvdata sof_rt5682_max_data = { .gpio_spkr_en = EN_SPKR_GPIO_NK, }; +static struct acp_card_drvdata sof_rt5682s_rt1019_data = { + .hs_cpu_id = I2S_SP, + .amp_cpu_id = I2S_SP, + .dmic_cpu_id = DMIC, + .hs_codec_id = RT5682S, + .amp_codec_id = RT1019, + .dmic_codec_id = DMIC, +}; + static struct acp_card_drvdata sof_rt5682s_max_data = { .hs_cpu_id = I2S_SP, .amp_cpu_id = I2S_SP, @@ -126,6 +135,10 @@ static const struct platform_device_id board_ids[] = { .name = "rt5682s-max", .driver_data = (kernel_ulong_t)&sof_rt5682s_max_data }, + { + .name = "rt5682s-rt1019", + .driver_data = (kernel_ulong_t)&sof_rt5682s_rt1019_data + }, { } }; static struct platform_driver acp_asoc_audio = { @@ -143,4 +156,5 @@ MODULE_DESCRIPTION("ACP chrome SOF audio support"); MODULE_ALIAS("platform:rt5682-rt1019"); MODULE_ALIAS("platform:rt5682-max"); MODULE_ALIAS("platform:rt5682s-max"); +MODULE_ALIAS("platform:rt5682s-rt1019"); MODULE_LICENSE("GPL v2"); -- 2.25.1

2 1

[PATCH v3] ASoC: codecs: Check for error pointer after calling devm_regmap_init_mmio
by Jiasheng Jiang 25 Jan '22

25 Jan '22

Since the potential failure of the devm_regmap_init_mmio(), it will return error pointer and be assigned to the regmap. Then the error pointer will be dereferenced. For example rx->regmap will be used in rx_macro_mclk_enable(). Therefore, it should be better to check it. Fixes: af3d54b99764 ("ASoC: codecs: lpass-rx-macro: add support for lpass rx macro") Fixes: c39667ddcfc5 ("ASoC: codecs: lpass-tx-macro: add support for lpass tx macro") Fixes: 809bcbcecebf ("ASoC: codecs: lpass-wsa-macro: Add support to WSA Macro") Signed-off-by: Jiasheng Jiang <jiasheng(a)iscas.ac.cn> --- Changelog v1 -> v2 * Change 1. Refine the commit message. v2 -> v3 * Change 1. Make the patch against the latest code. --- sound/soc/codecs/lpass-rx-macro.c | 2 ++ sound/soc/codecs/lpass-tx-macro.c | 2 ++ sound/soc/codecs/lpass-wsa-macro.c | 2 ++ 3 files changed, 6 insertions(+) diff --git a/sound/soc/codecs/lpass-rx-macro.c b/sound/soc/codecs/lpass-rx-macro.c index aec5127260fd..29d214f784d1 100644 --- a/sound/soc/codecs/lpass-rx-macro.c +++ b/sound/soc/codecs/lpass-rx-macro.c @@ -3542,6 +3542,8 @@ static int rx_macro_probe(struct platform_device *pdev) return PTR_ERR(base); rx->regmap = devm_regmap_init_mmio(dev, base, &rx_regmap_config); + if (IS_ERR(rx->regmap)) + return PTR_ERR(rx->regmap); dev_set_drvdata(dev, rx); diff --git a/sound/soc/codecs/lpass-tx-macro.c b/sound/soc/codecs/lpass-tx-macro.c index a4c0a155af56..9c96ab1bf84f 100644 --- a/sound/soc/codecs/lpass-tx-macro.c +++ b/sound/soc/codecs/lpass-tx-macro.c @@ -1821,6 +1821,8 @@ static int tx_macro_probe(struct platform_device *pdev) } tx->regmap = devm_regmap_init_mmio(dev, base, &tx_regmap_config); + if (IS_ERR(tx->regmap)) + return PTR_ERR(tx->regmap); dev_set_drvdata(dev, tx); diff --git a/sound/soc/codecs/lpass-wsa-macro.c b/sound/soc/codecs/lpass-wsa-macro.c index 75baf8eb7029..69d2915f40d8 100644 --- a/sound/soc/codecs/lpass-wsa-macro.c +++ b/sound/soc/codecs/lpass-wsa-macro.c @@ -2405,6 +2405,8 @@ static int wsa_macro_probe(struct platform_device *pdev) return PTR_ERR(base); wsa->regmap = devm_regmap_init_mmio(dev, base, &wsa_regmap_config); + if (IS_ERR(wsa->regmap)) + return PTR_ERR(wsa->regmap); dev_set_drvdata(dev, wsa); -- 2.25.1

2 1

[PATCH v2] ASoC: Intel: sof_rt5682: add 512FS MCLK clock configuration
by Mac Chiang 25 Jan '22

25 Jan '22

codec system clock source support 512FS MCLK synchronous directly, so no need to set PLL configuration when MCLK 24.576MHz. Suggested-by: Shuming Fan <shumingf(a)realtek.com> Signed-off-by: Mac Chiang <mac.chiang(a)intel.com> --- Changelog: v2: - apply mclk configuration to both rt5682vd and rt5682vs - Thanks to Brent by suggesting pll_in condition if MCLK or PLL requires. --- sound/soc/intel/boards/sof_rt5682.c | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/sound/soc/intel/boards/sof_rt5682.c b/sound/soc/intel/boards/sof_rt5682.c index bd6d2e7dea53..f4e833cbffe1 100644 --- a/sound/soc/intel/boards/sof_rt5682.c +++ b/sound/soc/intel/boards/sof_rt5682.c @@ -369,11 +369,16 @@ static int sof_rt5682_hw_params(struct snd_pcm_substream *substream, pll_out = params_rate(params) * 512; - /* Configure pll for codec */ - ret = snd_soc_dai_set_pll(codec_dai, pll_id, pll_source, pll_in, - pll_out); - if (ret < 0) - dev_err(rtd->dev, "snd_soc_dai_set_pll err = %d\n", ret); + /* when MCLK is 512FS, no need to set PLL configuration additionally. */ + if (pll_in == pll_out) + clk_id = RT5682S_SCLK_S_MCLK; + else { + /* Configure pll for codec */ + ret = snd_soc_dai_set_pll(codec_dai, pll_id, pll_source, pll_in, + pll_out); + if (ret < 0) + dev_err(rtd->dev, "snd_soc_dai_set_pll err = %d\n", ret); + } /* Configure sysclk for codec */ ret = snd_soc_dai_set_sysclk(codec_dai, clk_id, -- 2.20.1

3 2

[PATCH v2 0/3] ASOC: cs42l42: Add support for system suspend
by Richard Fitzgerald 25 Jan '22

25 Jan '22

Add system suspend and resume handlers so that the cs42l42 is cleanly put into power-off state during system suspend and the registers are restored in resume. The first two patches separate out two small changes that can stand alone and are needed to enable the system suspend implementation: 1) Don't rely on there being a jack unplug IRQ before a plug IRQ. There won't be if the unplug and plug happened while in system suspend. 2) Put a mutex around the entire IRQ handling so that the suspend can ensure the last run of the IRQ handler has completed before it powers down. Changes since V1: - Hold irq_lock mutex while restoring registers Richard Fitzgerald (3): ASoC: cs42l42: Report full jack status when plug is detected ASoC: cs42l42: Change jack_detect_mutex to a lock of all IRQ handling ASoC: cs42l42: Handle system suspend sound/soc/codecs/cs42l42.c | 166 ++++++++++++++++++++++++++++++++++++++++++--- sound/soc/codecs/cs42l42.h | 7 +- 2 files changed, 163 insertions(+), 10 deletions(-) -- 2.11.0

2 4

[PATCH 0/2] ASoC: SOF: Intel: improve SoundWire _ADR handling
by Pierre-Louis Bossart 25 Jan '22

25 Jan '22

Make sure the device version is taken into account when selecting a machine driver, in addition to device manufacturer and part_id, and simplify code with a macro. Bard Liao (2): ASoC: SOF: Intel: match sdw version on link_slaves_found ASoC: SOF: Intel: Compare sdw adr directly sound/soc/sof/intel/hda.c | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) -- 2.25.1

2 3

[PATCH 0/5] ASoC: SOF: Intel: don't download firmware at each resume
by Pierre-Louis Bossart 25 Jan '22

25 Jan '22

After the first firmware boot, the firmware is capable of saving/restoring its context to/from IMR (Isolated Memory Region, set aside by BIOS on startup). This capability improves the resume speed. Due to an unexplained issue on Up2 boards, this capability is disabled on ApolloLake. For backwards compatibility, the regular boot flow is used with older firmware. For added peace of mind, a kernel module parameter is provided to force the regular boot flow - this shouldn't be necessary since we've been testing these patches for 6+ months. Keyon Jie (4): ASoC: SOF: add _D3_PERSISTENT flag to fw_ready message ASoC: SOF: Intel: hda-loader: add SSP helper ASoC: SOF: Intel: hda-loader: add IMR restore support ASoC: SOF: add flag to disable IMR restore to sof_debug Pierre-Louis Bossart (1): ASoC: SOF: Intel: use inclusive language for SSP clocks include/sound/sof/info.h | 1 + include/uapi/sound/sof/abi.h | 2 +- sound/soc/sof/intel/hda-loader.c | 68 +++++++++++++++++++++++++++----- sound/soc/sof/intel/hda.h | 6 +-- sound/soc/sof/sof-priv.h | 3 ++ 5 files changed, 66 insertions(+), 14 deletions(-) -- 2.25.1

2 6

[PATCH 0/2] ASoC: Intel: sof_rt5682: add two derivative options
by Pierre-Louis Bossart 25 Jan '22

25 Jan '22

Add support for platforms without amplifier (headset codec only) and without Intel graphics. Ajye Huang (1): ASoC: Intel: sof_rt5682: Add support for platform without amplifier Yong Zhi (1): ASoC: Intel: sof_rt5682: add support for systems without i915 audio sound/soc/intel/boards/sof_rt5682.c | 40 ++++++++++++++----- .../intel/common/soc-acpi-intel-adl-match.c | 6 +++ 2 files changed, 36 insertions(+), 10 deletions(-) -- 2.25.1

2 3

[PATCH] ASoC: soc-generic-dmaengine-pcm: separate max_buffer_size assignment
by Shengjiu Wang 25 Jan '22

25 Jan '22

The config->pcm_hardware may be NULL when config->prealloc_buffer_size is not zero, so it is better to move max_buffer_size assignment under a separate condition. Signed-off-by: Shengjiu Wang <shengjiu.wang(a)nxp.com> --- sound/soc/soc-generic-dmaengine-pcm.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/sound/soc/soc-generic-dmaengine-pcm.c b/sound/soc/soc-generic-dmaengine-pcm.c index c54c8ca8d715..8659cb1794f1 100644 --- a/sound/soc/soc-generic-dmaengine-pcm.c +++ b/sound/soc/soc-generic-dmaengine-pcm.c @@ -237,13 +237,15 @@ static int dmaengine_pcm_new(struct snd_soc_component *component, size_t max_buffer_size; unsigned int i; - if (config && config->prealloc_buffer_size) { + if (config && config->prealloc_buffer_size) prealloc_buffer_size = config->prealloc_buffer_size; - max_buffer_size = config->pcm_hardware->buffer_bytes_max; - } else { + else prealloc_buffer_size = prealloc_buffer_size_kbytes * 1024; + + if (config && config->pcm_hardware && config->pcm_hardware->buffer_bytes_max) + max_buffer_size = config->pcm_hardware->buffer_bytes_max; + else max_buffer_size = SIZE_MAX; - } for_each_pcm_streams(i) { struct snd_pcm_substream *substream = rtd->pcm->streams[i].substream; -- 2.17.1

2 1

[PATCH v3 0/2] ASoC: add support for TAS5805M digital amplifier
by Daniel Beer 25 Jan '22

25 Jan '22

This pair of patches implements support for the TAS5805M class D audio amplifier. This driver, and the example configuration in the device-tree file, were originally based on a 4.19 series kernel and have been modified slightly from the tested version. This resubmission differs from v2 as follows: - The redundant mutex has been removed - DSP configuration is loaded as a firmware image, rather than directly from the device-tree - The volume control returns non-zero when the values have changed, as required - Some corrections to device-tree example Daniel Beer (2): ASoC: add support for TAS5805M digital amplifier ASoC: dt-bindings: add bindings for TI TAS5805M. .../devicetree/bindings/sound/tas5805m.yaml | 56 ++ sound/soc/codecs/Kconfig | 9 + sound/soc/codecs/Makefile | 2 + sound/soc/codecs/tas5805m.c | 567 ++++++++++++++++++ 4 files changed, 634 insertions(+) create mode 100644 Documentation/devicetree/bindings/sound/tas5805m.yaml create mode 100644 sound/soc/codecs/tas5805m.c -- 2.30.2

2 3

[PATCH] sound/soc/samsung: remove unneeded ret variable
by cgel.zte＠gmail.com 25 Jan '22

25 Jan '22

From: Minghao Chi <chi.minghao(a)zte.com.cn> Return value from io_remap_pfn_range() directly instead of taking this in another redundant variable. Reported-by: Zeal Robot <zealci(a)zte.com.cn> Signed-off-by: Minghao Chi <chi.minghao(a)zte.com.cn> Signed-off-by: CGEL ZTE <cgel.zte(a)gmail.com> --- sound/soc/samsung/idma.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/sound/soc/samsung/idma.c b/sound/soc/samsung/idma.c index c3f1b054e238..402ccadad46c 100644 --- a/sound/soc/samsung/idma.c +++ b/sound/soc/samsung/idma.c @@ -244,17 +244,14 @@ static int idma_mmap(struct snd_soc_component *component, { struct snd_pcm_runtime *runtime = substream->runtime; unsigned long size, offset; - int ret; /* From snd_pcm_lib_mmap_iomem */ vma->vm_page_prot = pgprot_noncached(vma->vm_page_prot); size = vma->vm_end - vma->vm_start; offset = vma->vm_pgoff << PAGE_SHIFT; - ret = io_remap_pfn_range(vma, vma->vm_start, + return io_remap_pfn_range(vma, vma->vm_start, (runtime->dma_addr + offset) >> PAGE_SHIFT, size, vma->vm_page_prot); - - return ret; } static irqreturn_t iis_irq(int irqno, void *dev_id) -- 2.25.1

3 3

[PATCH v2 0/5] fsl-asoc-card: Add optional dt property for setting mclk-id
by Ariel D'Alessandro 25 Jan '22

25 Jan '22

This is a follow up of patchset: [RFC patch 0/5] Support BCLK input clock in tlv320aic31xx Sound cards may allow using different main clock inputs. In the generic fsl-asoc-card driver, these values are hardcoded for each specific card configuration. Let's make it more flexible, allowing setting mclk-id from the device-tree node. Changes in v2: * Split patch adding mckl-id property. Ariel D'Alessandro (5): dt-bindings: sound: Rename tlv320aic31xx-micbias as tlv320aic31xx dt-bindings: tlv320aic31xx: Define PLL clock inputs ASoC: bindings: fsl-asoc-card: Add mclk-id optional property ASoC: fsl-asoc-card: Add optional dt property for setting mclk-id ASoC: fsl-asoc-card: Remove BCLK default value for tlv320aic31xx card .../devicetree/bindings/sound/fsl-asoc-card.txt | 1 + .../devicetree/bindings/sound/tlv320aic31xx.txt | 2 +- arch/arm/boot/dts/am43x-epos-evm.dts | 2 +- include/dt-bindings/sound/tlv320aic31xx-micbias.h | 9 --------- include/dt-bindings/sound/tlv320aic31xx.h | 14 ++++++++++++++ sound/soc/codecs/tlv320aic31xx.c | 2 +- sound/soc/fsl/fsl-asoc-card.c | 7 ++++++- 7 files changed, 24 insertions(+), 13 deletions(-) delete mode 100644 include/dt-bindings/sound/tlv320aic31xx-micbias.h create mode 100644 include/dt-bindings/sound/tlv320aic31xx.h -- 2.34.1

2 7

[PATCH v2] ASoC: codecs: Check for error pointer after calling devm_regmap_init_mmio
by Jiasheng Jiang 25 Jan '22

25 Jan '22

Since the possible failure of the devm_regmap_init_mmio(), it will return error pointer and be assigned to the regmap. Then the error pointer will be dereferenced. For example rx->regmap will be used in rx_macro_mclk_enable(). Therefore, it should be better to check it. Fixes: af3d54b99764 ("ASoC: codecs: lpass-rx-macro: add support for lpass rx macro") Fixes: c39667ddcfc5 ("ASoC: codecs: lpass-tx-macro: add support for lpass tx macro") Fixes: 809bcbcecebf ("ASoC: codecs: lpass-wsa-macro: Add support to WSA Macro") Signed-off-by: Jiasheng Jiang <jiasheng(a)iscas.ac.cn> --- Changelog v1 -> v2 * Change 1. Refine the commit message. --- sound/soc/codecs/lpass-rx-macro.c | 2 ++ sound/soc/codecs/lpass-tx-macro.c | 2 ++ sound/soc/codecs/lpass-wsa-macro.c | 2 ++ 3 files changed, 6 insertions(+) diff --git a/sound/soc/codecs/lpass-rx-macro.c b/sound/soc/codecs/lpass-rx-macro.c index 07894ec5e7a6..2adbf2e2697f 100644 --- a/sound/soc/codecs/lpass-rx-macro.c +++ b/sound/soc/codecs/lpass-rx-macro.c @@ -3542,6 +3542,8 @@ static int rx_macro_probe(struct platform_device *pdev) return PTR_ERR(base); rx->regmap = devm_regmap_init_mmio(dev, base, &rx_regmap_config); + if (IS_ERR(rx->regmap)) + return PTR_ERR(rx->regmap); dev_set_drvdata(dev, rx); diff --git a/sound/soc/codecs/lpass-tx-macro.c b/sound/soc/codecs/lpass-tx-macro.c index 27a0d5defd27..e4bbc6bd4925 100644 --- a/sound/soc/codecs/lpass-tx-macro.c +++ b/sound/soc/codecs/lpass-tx-macro.c @@ -1803,6 +1803,8 @@ static int tx_macro_probe(struct platform_device *pdev) return PTR_ERR(base); tx->regmap = devm_regmap_init_mmio(dev, base, &tx_regmap_config); + if (IS_ERR(tx->regmap)) + return PTR_ERR(tx->regmap); dev_set_drvdata(dev, tx); diff --git a/sound/soc/codecs/lpass-wsa-macro.c b/sound/soc/codecs/lpass-wsa-macro.c index d3ac318fd6b6..dd1a8b7bc794 100644 --- a/sound/soc/codecs/lpass-wsa-macro.c +++ b/sound/soc/codecs/lpass-wsa-macro.c @@ -2405,6 +2405,8 @@ static int wsa_macro_probe(struct platform_device *pdev) return PTR_ERR(base); wsa->regmap = devm_regmap_init_mmio(dev, base, &wsa_regmap_config); + if (IS_ERR(wsa->regmap)) + return PTR_ERR(wsa->regmap); dev_set_drvdata(dev, wsa); -- 2.25.1

2 2

[PATCH v2 0/3] ASoC: topology: Fixes
by Amadeusz Sławiński 25 Jan '22

25 Jan '22

Following series performs few cleanups in topology code. First patch reduces number of prints we get from failure. Second allos TLV controls to be either read or write which should be possible as evidenced by further code in function. Last one cleanups after refactoring of memory handling. v2: - Add missing Fixes tag on second patch - Add Reviewed-by tag from Pierre Amadeusz Sławiński (3): ASoC: topology: Remove superfluous error prints ASoC: topology: Allow TLV control to be either read or write ASoC: topology: Optimize soc_tplg_dapm_graph_elems_load behavior sound/soc/soc-topology.c | 103 ++++++++++----------------------------- 1 file changed, 27 insertions(+), 76 deletions(-) -- 2.25.1

2 4

[PATCH] ASoC: codecs: Check for error pointer after calling devm_regmap_init_mmio
by Jiasheng Jiang 25 Jan '22

25 Jan '22

The devm_regmap_init_mmio() may return error pointer under certain circumstances, for example the possible failure of the kzalloc() in regmap_mmio_gen_context(), which is called by devm_regmap_init_mmio(). Then the error pointer will be dereferenced. For example rx->regmap will be used in rx_macro_mclk_enable(). Therefore, it should be better to check it. Fixes: af3d54b99764 ("ASoC: codecs: lpass-rx-macro: add support for lpass rx macro") Fixes: c39667ddcfc5 ("ASoC: codecs: lpass-tx-macro: add support for lpass tx macro") Fixes: 809bcbcecebf ("ASoC: codecs: lpass-wsa-macro: Add support to WSA Macro") Signed-off-by: Jiasheng Jiang <jiasheng(a)iscas.ac.cn> --- sound/soc/codecs/lpass-rx-macro.c | 2 ++ sound/soc/codecs/lpass-tx-macro.c | 2 ++ sound/soc/codecs/lpass-wsa-macro.c | 2 ++ 3 files changed, 6 insertions(+) diff --git a/sound/soc/codecs/lpass-rx-macro.c b/sound/soc/codecs/lpass-rx-macro.c index 07894ec5e7a6..2adbf2e2697f 100644 --- a/sound/soc/codecs/lpass-rx-macro.c +++ b/sound/soc/codecs/lpass-rx-macro.c @@ -3542,6 +3542,8 @@ static int rx_macro_probe(struct platform_device *pdev) return PTR_ERR(base); rx->regmap = devm_regmap_init_mmio(dev, base, &rx_regmap_config); + if (IS_ERR(rx->regmap)) + return PTR_ERR(rx->regmap); dev_set_drvdata(dev, rx); diff --git a/sound/soc/codecs/lpass-tx-macro.c b/sound/soc/codecs/lpass-tx-macro.c index 27a0d5defd27..e4bbc6bd4925 100644 --- a/sound/soc/codecs/lpass-tx-macro.c +++ b/sound/soc/codecs/lpass-tx-macro.c @@ -1803,6 +1803,8 @@ static int tx_macro_probe(struct platform_device *pdev) return PTR_ERR(base); tx->regmap = devm_regmap_init_mmio(dev, base, &tx_regmap_config); + if (IS_ERR(tx->regmap)) + return PTR_ERR(tx->regmap); dev_set_drvdata(dev, tx); diff --git a/sound/soc/codecs/lpass-wsa-macro.c b/sound/soc/codecs/lpass-wsa-macro.c index d3ac318fd6b6..dd1a8b7bc794 100644 --- a/sound/soc/codecs/lpass-wsa-macro.c +++ b/sound/soc/codecs/lpass-wsa-macro.c @@ -2405,6 +2405,8 @@ static int wsa_macro_probe(struct platform_device *pdev) return PTR_ERR(base); wsa->regmap = devm_regmap_init_mmio(dev, base, &wsa_regmap_config); + if (IS_ERR(wsa->regmap)) + return PTR_ERR(wsa->regmap); dev_set_drvdata(dev, wsa); -- 2.25.1

3 3

[PATCH] sound/soc/codecs: remove redundant ret variable
by cgel.zte＠gmail.com 25 Jan '22

25 Jan '22

From: Minghao Chi <chi.minghao(a)zte.com.cn> Return value from devm_snd_soc_register_component() directly instead of taking this in another redundant variable. Reported-by: Zeal Robot <zealci(a)zte.com.cn> Signed-off-by: Minghao Chi <chi.minghao(a)zte.com.cn> Signed-off-by: CGEL ZTE <cgel.zte(a)gmail.com> --- sound/soc/codecs/wm8971.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/sound/soc/codecs/wm8971.c b/sound/soc/codecs/wm8971.c index 21ae55c32a6d..ddf0e2f5e66a 100644 --- a/sound/soc/codecs/wm8971.c +++ b/sound/soc/codecs/wm8971.c @@ -676,7 +676,6 @@ static int wm8971_i2c_probe(struct i2c_client *i2c, const struct i2c_device_id *id) { struct wm8971_priv *wm8971; - int ret; wm8971 = devm_kzalloc(&i2c->dev, sizeof(struct wm8971_priv), GFP_KERNEL); @@ -689,10 +688,8 @@ static int wm8971_i2c_probe(struct i2c_client *i2c, i2c_set_clientdata(i2c, wm8971); - ret = devm_snd_soc_register_component(&i2c->dev, + return devm_snd_soc_register_component(&i2c->dev, &soc_component_dev_wm8971, &wm8971_dai, 1); - - return ret; } static const struct i2c_device_id wm8971_i2c_id[] = { -- 2.25.1

3 3

[PATCH] ASoC: amd: acp-mach: Fix Left and Right rt1019 amp devices
by Ajit Kumar Pandey 25 Jan '22

25 Jan '22

We're setting wrong card codec conf for rt1019 amp devices in our machine driver. Due to this left and right amp channels data are reversed in our machines as wrong device prefix results in wrong value for "Mono LR Select" rt1019 mixer control. Reverse dev ids in codec conf with Left and Right name_prefix to fix such issue. Signed-off-by: Ajit Kumar Pandey <AjitKumar.Pandey(a)amd.com> --- sound/soc/amd/acp/acp-mach-common.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sound/soc/amd/acp/acp-mach-common.c b/sound/soc/amd/acp/acp-mach-common.c index c9caade5cb74..cd05ee2802c9 100644 --- a/sound/soc/amd/acp/acp-mach-common.c +++ b/sound/soc/amd/acp/acp-mach-common.c @@ -303,11 +303,11 @@ static const struct snd_soc_dapm_route rt1019_map_lr[] = { static struct snd_soc_codec_conf rt1019_conf[] = { { - .dlc = COMP_CODEC_CONF("i2c-10EC1019:00"), + .dlc = COMP_CODEC_CONF("i2c-10EC1019:01"), .name_prefix = "Left", }, { - .dlc = COMP_CODEC_CONF("i2c-10EC1019:01"), + .dlc = COMP_CODEC_CONF("i2c-10EC1019:00"), .name_prefix = "Right", }, }; -- 2.25.1

2 1

Re: [PATCH 5/5] spi: make remove callback a void function
by Miquel Raynal 25 Jan '22

25 Jan '22

Hi Uwe, u.kleine-koenig(a)pengutronix.de wrote on Sun, 23 Jan 2022 18:52:01 +0100: > The value returned by an spi driver's remove function is mostly ignored. > (Only an error message is printed if the value is non-zero that the > error is ignored.) > > So change the prototype of the remove function to return no value. This > way driver authors are not tempted to assume that passing an error to > the upper layer is a good idea. All drivers are adapted accordingly. > There is no intended change of behaviour, all callbacks were prepared to > return 0 before. > > Signed-off-by: Uwe Kleine-König <u.kleine-koenig(a)pengutronix.de> > --- [...] > drivers/mtd/devices/mchp23k256.c | 4 +--- > drivers/mtd/devices/mchp48l640.c | 4 +--- > drivers/mtd/devices/mtd_dataflash.c | 4 +--- > drivers/mtd/devices/sst25l.c | 4 +--- For MTD devices: Acked-by: Miquel Raynal <miquel.raynal(a)bootlin.com> Thanks, Miquèl

1 0

Re: [PATCH 5/5] spi: make remove callback a void function
by Stefan Schmidt 25 Jan '22

25 Jan '22

Hello. On 23.01.22 18:52, Uwe Kleine-König wrote: > The value returned by an spi driver's remove function is mostly ignored. > (Only an error message is printed if the value is non-zero that the > error is ignored.) > > So change the prototype of the remove function to return no value. This > way driver authors are not tempted to assume that passing an error to > the upper layer is a good idea. All drivers are adapted accordingly. > There is no intended change of behaviour, all callbacks were prepared to > return 0 before. > > Signed-off-by: Uwe Kleine-König <u.kleine-koenig(a)pengutronix.de> > --- [...] > drivers/net/ieee802154/adf7242.c | 4 +--- > drivers/net/ieee802154/at86rf230.c | 4 +--- > drivers/net/ieee802154/ca8210.c | 6 ++---- > drivers/net/ieee802154/cc2520.c | 4 +--- > drivers/net/ieee802154/mcr20a.c | 4 +--- > drivers/net/ieee802154/mrf24j40.c | 4 +--- [...] For the ieee802154 drivers: Acked-by: Stefan Schmidt <stefan(a)datenfreihafen.org> regards Stefan Schmidt

1 0

Re: [PATCH 5/5] spi: make remove callback a void function
by Alexandre Belloni 25 Jan '22

25 Jan '22

On 23/01/2022 18:52:01+0100, Uwe Kleine-König wrote: > The value returned by an spi driver's remove function is mostly ignored. > (Only an error message is printed if the value is non-zero that the > error is ignored.) > > So change the prototype of the remove function to return no value. This > way driver authors are not tempted to assume that passing an error to > the upper layer is a good idea. All drivers are adapted accordingly. > There is no intended change of behaviour, all callbacks were prepared to > return 0 before. > > Signed-off-by: Uwe Kleine-König <u.kleine-koenig(a)pengutronix.de> Acked-by: Alexandre Belloni <alexandre.belloni(a)bootlin.com> > --- > drivers/bus/moxtet.c | 4 +--- > drivers/char/tpm/st33zp24/spi.c | 4 +--- > drivers/char/tpm/tpm_tis_spi_main.c | 3 +-- > drivers/clk/clk-lmk04832.c | 4 +--- > drivers/gpio/gpio-74x164.c | 4 +--- > drivers/gpio/gpio-max3191x.c | 4 +--- > drivers/gpio/gpio-max7301.c | 4 +--- > drivers/gpio/gpio-mc33880.c | 4 +--- > drivers/gpio/gpio-pisosr.c | 4 +--- > drivers/gpu/drm/panel/panel-abt-y030xx067a.c | 4 +--- > drivers/gpu/drm/panel/panel-ilitek-ili9322.c | 4 +--- > drivers/gpu/drm/panel/panel-ilitek-ili9341.c | 3 +-- > drivers/gpu/drm/panel/panel-innolux-ej030na.c | 4 +--- > drivers/gpu/drm/panel/panel-lg-lb035q02.c | 4 +--- > drivers/gpu/drm/panel/panel-lg-lg4573.c | 4 +--- > drivers/gpu/drm/panel/panel-nec-nl8048hl11.c | 4 +--- > drivers/gpu/drm/panel/panel-novatek-nt39016.c | 4 +--- > drivers/gpu/drm/panel/panel-samsung-db7430.c | 3 +-- > drivers/gpu/drm/panel/panel-samsung-ld9040.c | 4 +--- > drivers/gpu/drm/panel/panel-samsung-s6d27a1.c | 3 +-- > drivers/gpu/drm/panel/panel-samsung-s6e63m0-spi.c | 3 +-- > drivers/gpu/drm/panel/panel-sitronix-st7789v.c | 4 +--- > drivers/gpu/drm/panel/panel-sony-acx565akm.c | 4 +--- > drivers/gpu/drm/panel/panel-tpo-td028ttec1.c | 4 +--- > drivers/gpu/drm/panel/panel-tpo-td043mtea1.c | 4 +--- > drivers/gpu/drm/panel/panel-tpo-tpg110.c | 3 +-- > drivers/gpu/drm/panel/panel-widechips-ws2401.c | 3 +-- > drivers/gpu/drm/tiny/hx8357d.c | 4 +--- > drivers/gpu/drm/tiny/ili9163.c | 4 +--- > drivers/gpu/drm/tiny/ili9225.c | 4 +--- > drivers/gpu/drm/tiny/ili9341.c | 4 +--- > drivers/gpu/drm/tiny/ili9486.c | 4 +--- > drivers/gpu/drm/tiny/mi0283qt.c | 4 +--- > drivers/gpu/drm/tiny/repaper.c | 4 +--- > drivers/gpu/drm/tiny/st7586.c | 4 +--- > drivers/gpu/drm/tiny/st7735r.c | 4 +--- > drivers/hwmon/adcxx.c | 4 +--- > drivers/hwmon/adt7310.c | 3 +-- > drivers/hwmon/max1111.c | 3 +-- > drivers/hwmon/max31722.c | 4 +--- > drivers/iio/accel/bma400_spi.c | 4 +--- > drivers/iio/accel/bmc150-accel-spi.c | 4 +--- > drivers/iio/accel/bmi088-accel-spi.c | 4 +--- > drivers/iio/accel/kxsd9-spi.c | 4 +--- > drivers/iio/accel/mma7455_spi.c | 4 +--- > drivers/iio/accel/sca3000.c | 4 +--- > drivers/iio/adc/ad7266.c | 4 +--- > drivers/iio/adc/ltc2496.c | 4 +--- > drivers/iio/adc/mcp320x.c | 4 +--- > drivers/iio/adc/mcp3911.c | 4 +--- > drivers/iio/adc/ti-adc12138.c | 4 +--- > drivers/iio/adc/ti-ads7950.c | 4 +--- > drivers/iio/adc/ti-ads8688.c | 4 +--- > drivers/iio/adc/ti-tlc4541.c | 4 +--- > drivers/iio/amplifiers/ad8366.c | 4 +--- > drivers/iio/common/ssp_sensors/ssp_dev.c | 4 +--- > drivers/iio/dac/ad5360.c | 4 +--- > drivers/iio/dac/ad5380.c | 4 +--- > drivers/iio/dac/ad5446.c | 4 +--- > drivers/iio/dac/ad5449.c | 4 +--- > drivers/iio/dac/ad5504.c | 4 +--- > drivers/iio/dac/ad5592r.c | 4 +--- > drivers/iio/dac/ad5624r_spi.c | 4 +--- > drivers/iio/dac/ad5686-spi.c | 4 +--- > drivers/iio/dac/ad5761.c | 4 +--- > drivers/iio/dac/ad5764.c | 4 +--- > drivers/iio/dac/ad5791.c | 4 +--- > drivers/iio/dac/ad8801.c | 4 +--- > drivers/iio/dac/ltc1660.c | 4 +--- > drivers/iio/dac/ltc2632.c | 4 +--- > drivers/iio/dac/mcp4922.c | 4 +--- > drivers/iio/dac/ti-dac082s085.c | 4 +--- > drivers/iio/dac/ti-dac7311.c | 3 +-- > drivers/iio/frequency/adf4350.c | 4 +--- > drivers/iio/gyro/bmg160_spi.c | 4 +--- > drivers/iio/gyro/fxas21002c_spi.c | 4 +--- > drivers/iio/health/afe4403.c | 4 +--- > drivers/iio/magnetometer/bmc150_magn_spi.c | 4 +--- > drivers/iio/magnetometer/hmc5843_spi.c | 4 +--- > drivers/iio/potentiometer/max5487.c | 4 +--- > drivers/iio/pressure/ms5611_spi.c | 4 +--- > drivers/iio/pressure/zpa2326_spi.c | 4 +--- > drivers/input/keyboard/applespi.c | 4 +--- > drivers/input/misc/adxl34x-spi.c | 4 +--- > drivers/input/touchscreen/ads7846.c | 4 +--- > drivers/input/touchscreen/cyttsp4_spi.c | 4 +--- > drivers/input/touchscreen/tsc2005.c | 4 +--- > drivers/leds/leds-cr0014114.c | 4 +--- > drivers/leds/leds-dac124s085.c | 4 +--- > drivers/leds/leds-el15203000.c | 4 +--- > drivers/leds/leds-spi-byte.c | 4 +--- > drivers/media/spi/cxd2880-spi.c | 4 +--- > drivers/media/spi/gs1662.c | 4 +--- > drivers/media/tuners/msi001.c | 3 +-- > drivers/mfd/arizona-spi.c | 4 +--- > drivers/mfd/da9052-spi.c | 3 +-- > drivers/mfd/ezx-pcap.c | 4 +--- > drivers/mfd/madera-spi.c | 4 +--- > drivers/mfd/mc13xxx-spi.c | 3 +-- > drivers/mfd/rsmu_spi.c | 4 +--- > drivers/mfd/stmpe-spi.c | 4 +--- > drivers/mfd/tps65912-spi.c | 4 +--- > drivers/misc/ad525x_dpot-spi.c | 3 +-- > drivers/misc/eeprom/eeprom_93xx46.c | 4 +--- > drivers/misc/lattice-ecp3-config.c | 4 +--- > drivers/misc/lis3lv02d/lis3lv02d_spi.c | 4 +--- > drivers/mmc/host/mmc_spi.c | 3 +-- > drivers/mtd/devices/mchp23k256.c | 4 +--- > drivers/mtd/devices/mchp48l640.c | 4 +--- > drivers/mtd/devices/mtd_dataflash.c | 4 +--- > drivers/mtd/devices/sst25l.c | 4 +--- > drivers/net/can/m_can/tcan4x5x-core.c | 4 +--- > drivers/net/can/spi/hi311x.c | 4 +--- > drivers/net/can/spi/mcp251x.c | 4 +--- > drivers/net/can/spi/mcp251xfd/mcp251xfd-core.c | 4 +--- > drivers/net/dsa/b53/b53_spi.c | 4 +--- > drivers/net/dsa/microchip/ksz8795_spi.c | 4 +--- > drivers/net/dsa/microchip/ksz9477_spi.c | 4 +--- > drivers/net/dsa/sja1105/sja1105_main.c | 6 ++---- > drivers/net/dsa/vitesse-vsc73xx-spi.c | 6 ++---- > drivers/net/ethernet/asix/ax88796c_main.c | 4 +--- > drivers/net/ethernet/micrel/ks8851_spi.c | 4 +--- > drivers/net/ethernet/microchip/enc28j60.c | 4 +--- > drivers/net/ethernet/microchip/encx24j600.c | 4 +--- > drivers/net/ethernet/qualcomm/qca_spi.c | 4 +--- > drivers/net/ethernet/vertexcom/mse102x.c | 4 +--- > drivers/net/ethernet/wiznet/w5100-spi.c | 4 +--- > drivers/net/ieee802154/adf7242.c | 4 +--- > drivers/net/ieee802154/at86rf230.c | 4 +--- > drivers/net/ieee802154/ca8210.c | 6 ++---- > drivers/net/ieee802154/cc2520.c | 4 +--- > drivers/net/ieee802154/mcr20a.c | 4 +--- > drivers/net/ieee802154/mrf24j40.c | 4 +--- > drivers/net/phy/spi_ks8995.c | 4 +--- > drivers/net/wan/slic_ds26522.c | 3 +-- > drivers/net/wireless/intersil/p54/p54spi.c | 4 +--- > drivers/net/wireless/marvell/libertas/if_spi.c | 4 +--- > drivers/net/wireless/microchip/wilc1000/spi.c | 4 +--- > drivers/net/wireless/st/cw1200/cw1200_spi.c | 4 +--- > drivers/net/wireless/ti/wl1251/spi.c | 4 +--- > drivers/net/wireless/ti/wlcore/spi.c | 4 +--- > drivers/nfc/nfcmrvl/spi.c | 3 +-- > drivers/nfc/st-nci/spi.c | 4 +--- > drivers/nfc/st95hf/core.c | 4 +--- > drivers/nfc/trf7970a.c | 4 +--- > drivers/platform/chrome/cros_ec_spi.c | 4 +--- > drivers/platform/olpc/olpc-xo175-ec.c | 4 +--- > drivers/rtc/rtc-ds1302.c | 3 +-- > drivers/rtc/rtc-ds1305.c | 4 +--- > drivers/rtc/rtc-ds1343.c | 4 +--- > drivers/spi/spi-mem.c | 6 ++---- > drivers/spi/spi-slave-system-control.c | 3 +-- > drivers/spi/spi-slave-time.c | 3 +-- > drivers/spi/spi-tle62x0.c | 3 +-- > drivers/spi/spi.c | 11 ++--------- > drivers/spi/spidev.c | 4 +--- > drivers/staging/fbtft/fbtft.h | 3 +-- > drivers/staging/pi433/pi433_if.c | 4 +--- > drivers/staging/wfx/bus_spi.c | 3 +-- > drivers/tty/serial/max3100.c | 5 ++--- > drivers/tty/serial/max310x.c | 3 +-- > drivers/tty/serial/sc16is7xx.c | 4 +--- > drivers/usb/gadget/udc/max3420_udc.c | 4 +--- > drivers/usb/host/max3421-hcd.c | 3 +-- > drivers/video/backlight/ams369fg06.c | 3 +-- > drivers/video/backlight/corgi_lcd.c | 3 +-- > drivers/video/backlight/ili922x.c | 3 +-- > drivers/video/backlight/l4f00242t03.c | 3 +-- > drivers/video/backlight/lms501kf03.c | 3 +-- > drivers/video/backlight/ltv350qv.c | 3 +-- > drivers/video/backlight/tdo24m.c | 3 +-- > drivers/video/backlight/tosa_lcd.c | 4 +--- > drivers/video/backlight/vgg2432a4.c | 4 +--- > drivers/video/fbdev/omap/lcd_mipid.c | 4 +--- > .../omap2/omapfb/displays/panel-lgphilips-lb035q02.c | 4 +--- > .../omap2/omapfb/displays/panel-nec-nl8048hl11.c | 4 +--- > .../omap2/omapfb/displays/panel-sony-acx565akm.c | 4 +--- > .../omap2/omapfb/displays/panel-tpo-td028ttec1.c | 4 +--- > .../omap2/omapfb/displays/panel-tpo-td043mtea1.c | 4 +--- > include/linux/spi/spi.h | 2 +- > sound/pci/hda/cs35l41_hda_spi.c | 4 +--- > sound/soc/codecs/adau1761-spi.c | 3 +-- > sound/soc/codecs/adau1781-spi.c | 3 +-- > sound/soc/codecs/cs35l41-spi.c | 4 +--- > sound/soc/codecs/pcm3168a-spi.c | 4 +--- > sound/soc/codecs/pcm512x-spi.c | 3 +-- > sound/soc/codecs/tlv320aic32x4-spi.c | 4 +--- > sound/soc/codecs/tlv320aic3x-spi.c | 4 +--- > sound/soc/codecs/wm0010.c | 4 +--- > sound/soc/codecs/wm8804-spi.c | 3 +-- > sound/spi/at73c213.c | 4 +--- > 191 files changed, 197 insertions(+), 545 deletions(-) > > diff --git a/drivers/bus/moxtet.c b/drivers/bus/moxtet.c > index fd87a59837fa..5eb0fe73ddc4 100644 > --- a/drivers/bus/moxtet.c > +++ b/drivers/bus/moxtet.c > @@ -815,7 +815,7 @@ static int moxtet_probe(struct spi_device *spi) > return 0; > } > > -static int moxtet_remove(struct spi_device *spi) > +static void moxtet_remove(struct spi_device *spi) > { > struct moxtet *moxtet = spi_get_drvdata(spi); > > @@ -828,8 +828,6 @@ static int moxtet_remove(struct spi_device *spi) > device_for_each_child(moxtet->dev, NULL, __unregister); > > mutex_destroy(&moxtet->lock); > - > - return 0; > } > > static const struct of_device_id moxtet_dt_ids[] = { > diff --git a/drivers/char/tpm/st33zp24/spi.c b/drivers/char/tpm/st33zp24/spi.c > index ccd9e42b8eab..22d184884694 100644 > --- a/drivers/char/tpm/st33zp24/spi.c > +++ b/drivers/char/tpm/st33zp24/spi.c > @@ -381,13 +381,11 @@ static int st33zp24_spi_probe(struct spi_device *dev) > * @param: client, the spi_device description (TPM SPI description). > * @return: 0 in case of success. > */ > -static int st33zp24_spi_remove(struct spi_device *dev) > +static void st33zp24_spi_remove(struct spi_device *dev) > { > struct tpm_chip *chip = spi_get_drvdata(dev); > > st33zp24_remove(chip); > - > - return 0; > } > > static const struct spi_device_id st33zp24_spi_id[] = { > diff --git a/drivers/char/tpm/tpm_tis_spi_main.c b/drivers/char/tpm/tpm_tis_spi_main.c > index aaa59a00eeae..184396b3af50 100644 > --- a/drivers/char/tpm/tpm_tis_spi_main.c > +++ b/drivers/char/tpm/tpm_tis_spi_main.c > @@ -254,13 +254,12 @@ static int tpm_tis_spi_driver_probe(struct spi_device *spi) > > static SIMPLE_DEV_PM_OPS(tpm_tis_pm, tpm_pm_suspend, tpm_tis_spi_resume); > > -static int tpm_tis_spi_remove(struct spi_device *dev) > +static void tpm_tis_spi_remove(struct spi_device *dev) > { > struct tpm_chip *chip = spi_get_drvdata(dev); > > tpm_chip_unregister(chip); > tpm_tis_remove(chip); > - return 0; > } > > static const struct spi_device_id tpm_tis_spi_id[] = { > diff --git a/drivers/clk/clk-lmk04832.c b/drivers/clk/clk-lmk04832.c > index 8f02c0b88000..f416f8bc2898 100644 > --- a/drivers/clk/clk-lmk04832.c > +++ b/drivers/clk/clk-lmk04832.c > @@ -1544,14 +1544,12 @@ static int lmk04832_probe(struct spi_device *spi) > return ret; > } > > -static int lmk04832_remove(struct spi_device *spi) > +static void lmk04832_remove(struct spi_device *spi) > { > struct lmk04832 *lmk = spi_get_drvdata(spi); > > clk_disable_unprepare(lmk->oscin); > of_clk_del_provider(spi->dev.of_node); > - > - return 0; > } > static const struct spi_device_id lmk04832_id[] = { > { "lmk04832", LMK04832 }, > diff --git a/drivers/gpio/gpio-74x164.c b/drivers/gpio/gpio-74x164.c > index 4a55cdf089d6..e00c33310517 100644 > --- a/drivers/gpio/gpio-74x164.c > +++ b/drivers/gpio/gpio-74x164.c > @@ -163,15 +163,13 @@ static int gen_74x164_probe(struct spi_device *spi) > return ret; > } > > -static int gen_74x164_remove(struct spi_device *spi) > +static void gen_74x164_remove(struct spi_device *spi) > { > struct gen_74x164_chip *chip = spi_get_drvdata(spi); > > gpiod_set_value_cansleep(chip->gpiod_oe, 0); > gpiochip_remove(&chip->gpio_chip); > mutex_destroy(&chip->lock); > - > - return 0; > } > > static const struct spi_device_id gen_74x164_spi_ids[] = { > diff --git a/drivers/gpio/gpio-max3191x.c b/drivers/gpio/gpio-max3191x.c > index 51cd6f98d1c7..161c4751c5f7 100644 > --- a/drivers/gpio/gpio-max3191x.c > +++ b/drivers/gpio/gpio-max3191x.c > @@ -443,14 +443,12 @@ static int max3191x_probe(struct spi_device *spi) > return 0; > } > > -static int max3191x_remove(struct spi_device *spi) > +static void max3191x_remove(struct spi_device *spi) > { > struct max3191x_chip *max3191x = spi_get_drvdata(spi); > > gpiochip_remove(&max3191x->gpio); > mutex_destroy(&max3191x->lock); > - > - return 0; > } > > static int __init max3191x_register_driver(struct spi_driver *sdrv) > diff --git a/drivers/gpio/gpio-max7301.c b/drivers/gpio/gpio-max7301.c > index 5862d73bf325..11813f41d460 100644 > --- a/drivers/gpio/gpio-max7301.c > +++ b/drivers/gpio/gpio-max7301.c > @@ -64,11 +64,9 @@ static int max7301_probe(struct spi_device *spi) > return ret; > } > > -static int max7301_remove(struct spi_device *spi) > +static void max7301_remove(struct spi_device *spi) > { > __max730x_remove(&spi->dev); > - > - return 0; > } > > static const struct spi_device_id max7301_id[] = { > diff --git a/drivers/gpio/gpio-mc33880.c b/drivers/gpio/gpio-mc33880.c > index 31d2be1bebc8..cd9b16dbe1a9 100644 > --- a/drivers/gpio/gpio-mc33880.c > +++ b/drivers/gpio/gpio-mc33880.c > @@ -134,7 +134,7 @@ static int mc33880_probe(struct spi_device *spi) > return ret; > } > > -static int mc33880_remove(struct spi_device *spi) > +static void mc33880_remove(struct spi_device *spi) > { > struct mc33880 *mc; > > @@ -142,8 +142,6 @@ static int mc33880_remove(struct spi_device *spi) > > gpiochip_remove(&mc->chip); > mutex_destroy(&mc->lock); > - > - return 0; > } > > static struct spi_driver mc33880_driver = { > diff --git a/drivers/gpio/gpio-pisosr.c b/drivers/gpio/gpio-pisosr.c > index 8e04054cf07e..81a47ae09ff8 100644 > --- a/drivers/gpio/gpio-pisosr.c > +++ b/drivers/gpio/gpio-pisosr.c > @@ -163,15 +163,13 @@ static int pisosr_gpio_probe(struct spi_device *spi) > return 0; > } > > -static int pisosr_gpio_remove(struct spi_device *spi) > +static void pisosr_gpio_remove(struct spi_device *spi) > { > struct pisosr_gpio *gpio = spi_get_drvdata(spi); > > gpiochip_remove(&gpio->chip); > > mutex_destroy(&gpio->lock); > - > - return 0; > } > > static const struct spi_device_id pisosr_gpio_id_table[] = { > diff --git a/drivers/gpu/drm/panel/panel-abt-y030xx067a.c b/drivers/gpu/drm/panel/panel-abt-y030xx067a.c > index f043b484055b..ed626fdc08e8 100644 > --- a/drivers/gpu/drm/panel/panel-abt-y030xx067a.c > +++ b/drivers/gpu/drm/panel/panel-abt-y030xx067a.c > @@ -293,15 +293,13 @@ static int y030xx067a_probe(struct spi_device *spi) > return 0; > } > > -static int y030xx067a_remove(struct spi_device *spi) > +static void y030xx067a_remove(struct spi_device *spi) > { > struct y030xx067a *priv = spi_get_drvdata(spi); > > drm_panel_remove(&priv->panel); > drm_panel_disable(&priv->panel); > drm_panel_unprepare(&priv->panel); > - > - return 0; > } > > static const struct drm_display_mode y030xx067a_modes[] = { > diff --git a/drivers/gpu/drm/panel/panel-ilitek-ili9322.c b/drivers/gpu/drm/panel/panel-ilitek-ili9322.c > index 8e84df9a0033..3dfafa585127 100644 > --- a/drivers/gpu/drm/panel/panel-ilitek-ili9322.c > +++ b/drivers/gpu/drm/panel/panel-ilitek-ili9322.c > @@ -896,14 +896,12 @@ static int ili9322_probe(struct spi_device *spi) > return 0; > } > > -static int ili9322_remove(struct spi_device *spi) > +static void ili9322_remove(struct spi_device *spi) > { > struct ili9322 *ili = spi_get_drvdata(spi); > > ili9322_power_off(ili); > drm_panel_remove(&ili->panel); > - > - return 0; > } > > /* > diff --git a/drivers/gpu/drm/panel/panel-ilitek-ili9341.c b/drivers/gpu/drm/panel/panel-ilitek-ili9341.c > index 2c3378a259b1..a07ef26234e5 100644 > --- a/drivers/gpu/drm/panel/panel-ilitek-ili9341.c > +++ b/drivers/gpu/drm/panel/panel-ilitek-ili9341.c > @@ -728,7 +728,7 @@ static int ili9341_probe(struct spi_device *spi) > return -1; > } > > -static int ili9341_remove(struct spi_device *spi) > +static void ili9341_remove(struct spi_device *spi) > { > const struct spi_device_id *id = spi_get_device_id(spi); > struct ili9341 *ili = spi_get_drvdata(spi); > @@ -741,7 +741,6 @@ static int ili9341_remove(struct spi_device *spi) > drm_dev_unplug(drm); > drm_atomic_helper_shutdown(drm); > } > - return 0; > } > > static void ili9341_shutdown(struct spi_device *spi) > diff --git a/drivers/gpu/drm/panel/panel-innolux-ej030na.c b/drivers/gpu/drm/panel/panel-innolux-ej030na.c > index c558de3f99be..e3b1daa0cb72 100644 > --- a/drivers/gpu/drm/panel/panel-innolux-ej030na.c > +++ b/drivers/gpu/drm/panel/panel-innolux-ej030na.c > @@ -219,15 +219,13 @@ static int ej030na_probe(struct spi_device *spi) > return 0; > } > > -static int ej030na_remove(struct spi_device *spi) > +static void ej030na_remove(struct spi_device *spi) > { > struct ej030na *priv = spi_get_drvdata(spi); > > drm_panel_remove(&priv->panel); > drm_panel_disable(&priv->panel); > drm_panel_unprepare(&priv->panel); > - > - return 0; > } > > static const struct drm_display_mode ej030na_modes[] = { > diff --git a/drivers/gpu/drm/panel/panel-lg-lb035q02.c b/drivers/gpu/drm/panel/panel-lg-lb035q02.c > index f3183b68704f..9d0d4faa3f58 100644 > --- a/drivers/gpu/drm/panel/panel-lg-lb035q02.c > +++ b/drivers/gpu/drm/panel/panel-lg-lb035q02.c > @@ -203,14 +203,12 @@ static int lb035q02_probe(struct spi_device *spi) > return 0; > } > > -static int lb035q02_remove(struct spi_device *spi) > +static void lb035q02_remove(struct spi_device *spi) > { > struct lb035q02_device *lcd = spi_get_drvdata(spi); > > drm_panel_remove(&lcd->panel); > drm_panel_disable(&lcd->panel); > - > - return 0; > } > > static const struct of_device_id lb035q02_of_match[] = { > diff --git a/drivers/gpu/drm/panel/panel-lg-lg4573.c b/drivers/gpu/drm/panel/panel-lg-lg4573.c > index 8e5160af1de5..cf246d15b7b6 100644 > --- a/drivers/gpu/drm/panel/panel-lg-lg4573.c > +++ b/drivers/gpu/drm/panel/panel-lg-lg4573.c > @@ -266,14 +266,12 @@ static int lg4573_probe(struct spi_device *spi) > return 0; > } > > -static int lg4573_remove(struct spi_device *spi) > +static void lg4573_remove(struct spi_device *spi) > { > struct lg4573 *ctx = spi_get_drvdata(spi); > > lg4573_display_off(ctx); > drm_panel_remove(&ctx->panel); > - > - return 0; > } > > static const struct of_device_id lg4573_of_match[] = { > diff --git a/drivers/gpu/drm/panel/panel-nec-nl8048hl11.c b/drivers/gpu/drm/panel/panel-nec-nl8048hl11.c > index 6e5ab1debc8b..81c5c541a351 100644 > --- a/drivers/gpu/drm/panel/panel-nec-nl8048hl11.c > +++ b/drivers/gpu/drm/panel/panel-nec-nl8048hl11.c > @@ -212,15 +212,13 @@ static int nl8048_probe(struct spi_device *spi) > return 0; > } > > -static int nl8048_remove(struct spi_device *spi) > +static void nl8048_remove(struct spi_device *spi) > { > struct nl8048_panel *lcd = spi_get_drvdata(spi); > > drm_panel_remove(&lcd->panel); > drm_panel_disable(&lcd->panel); > drm_panel_unprepare(&lcd->panel); > - > - return 0; > } > > static const struct of_device_id nl8048_of_match[] = { > diff --git a/drivers/gpu/drm/panel/panel-novatek-nt39016.c b/drivers/gpu/drm/panel/panel-novatek-nt39016.c > index d036853db865..f58cfb10b58a 100644 > --- a/drivers/gpu/drm/panel/panel-novatek-nt39016.c > +++ b/drivers/gpu/drm/panel/panel-novatek-nt39016.c > @@ -292,7 +292,7 @@ static int nt39016_probe(struct spi_device *spi) > return 0; > } > > -static int nt39016_remove(struct spi_device *spi) > +static void nt39016_remove(struct spi_device *spi) > { > struct nt39016 *panel = spi_get_drvdata(spi); > > @@ -300,8 +300,6 @@ static int nt39016_remove(struct spi_device *spi) > > nt39016_disable(&panel->drm_panel); > nt39016_unprepare(&panel->drm_panel); > - > - return 0; > } > > static const struct drm_display_mode kd035g6_display_modes[] = { > diff --git a/drivers/gpu/drm/panel/panel-samsung-db7430.c b/drivers/gpu/drm/panel/panel-samsung-db7430.c > index ead479719f00..04640c5256a8 100644 > --- a/drivers/gpu/drm/panel/panel-samsung-db7430.c > +++ b/drivers/gpu/drm/panel/panel-samsung-db7430.c > @@ -314,12 +314,11 @@ static int db7430_probe(struct spi_device *spi) > return 0; > } > > -static int db7430_remove(struct spi_device *spi) > +static void db7430_remove(struct spi_device *spi) > { > struct db7430 *db = spi_get_drvdata(spi); > > drm_panel_remove(&db->panel); > - return 0; > } > > /* > diff --git a/drivers/gpu/drm/panel/panel-samsung-ld9040.c b/drivers/gpu/drm/panel/panel-samsung-ld9040.c > index c4b388850a13..01eb211f32f7 100644 > --- a/drivers/gpu/drm/panel/panel-samsung-ld9040.c > +++ b/drivers/gpu/drm/panel/panel-samsung-ld9040.c > @@ -358,14 +358,12 @@ static int ld9040_probe(struct spi_device *spi) > return 0; > } > > -static int ld9040_remove(struct spi_device *spi) > +static void ld9040_remove(struct spi_device *spi) > { > struct ld9040 *ctx = spi_get_drvdata(spi); > > ld9040_power_off(ctx); > drm_panel_remove(&ctx->panel); > - > - return 0; > } > > static const struct of_device_id ld9040_of_match[] = { > diff --git a/drivers/gpu/drm/panel/panel-samsung-s6d27a1.c b/drivers/gpu/drm/panel/panel-samsung-s6d27a1.c > index 1696ceb36aa0..2adb223a895c 100644 > --- a/drivers/gpu/drm/panel/panel-samsung-s6d27a1.c > +++ b/drivers/gpu/drm/panel/panel-samsung-s6d27a1.c > @@ -291,12 +291,11 @@ static int s6d27a1_probe(struct spi_device *spi) > return 0; > } > > -static int s6d27a1_remove(struct spi_device *spi) > +static void s6d27a1_remove(struct spi_device *spi) > { > struct s6d27a1 *ctx = spi_get_drvdata(spi); > > drm_panel_remove(&ctx->panel); > - return 0; > } > > static const struct of_device_id s6d27a1_match[] = { > diff --git a/drivers/gpu/drm/panel/panel-samsung-s6e63m0-spi.c b/drivers/gpu/drm/panel/panel-samsung-s6e63m0-spi.c > index c178d962b0d5..d99afcc672ca 100644 > --- a/drivers/gpu/drm/panel/panel-samsung-s6e63m0-spi.c > +++ b/drivers/gpu/drm/panel/panel-samsung-s6e63m0-spi.c > @@ -62,10 +62,9 @@ static int s6e63m0_spi_probe(struct spi_device *spi) > s6e63m0_spi_dcs_write, false); > } > > -static int s6e63m0_spi_remove(struct spi_device *spi) > +static void s6e63m0_spi_remove(struct spi_device *spi) > { > s6e63m0_remove(&spi->dev); > - return 0; > } > > static const struct of_device_id s6e63m0_spi_of_match[] = { > diff --git a/drivers/gpu/drm/panel/panel-sitronix-st7789v.c b/drivers/gpu/drm/panel/panel-sitronix-st7789v.c > index 61e565524542..bbc4569cbcdc 100644 > --- a/drivers/gpu/drm/panel/panel-sitronix-st7789v.c > +++ b/drivers/gpu/drm/panel/panel-sitronix-st7789v.c > @@ -387,13 +387,11 @@ static int st7789v_probe(struct spi_device *spi) > return 0; > } > > -static int st7789v_remove(struct spi_device *spi) > +static void st7789v_remove(struct spi_device *spi) > { > struct st7789v *ctx = spi_get_drvdata(spi); > > drm_panel_remove(&ctx->panel); > - > - return 0; > } > > static const struct of_device_id st7789v_of_match[] = { > diff --git a/drivers/gpu/drm/panel/panel-sony-acx565akm.c b/drivers/gpu/drm/panel/panel-sony-acx565akm.c > index ba0b3ead150f..0d7541a33f87 100644 > --- a/drivers/gpu/drm/panel/panel-sony-acx565akm.c > +++ b/drivers/gpu/drm/panel/panel-sony-acx565akm.c > @@ -655,7 +655,7 @@ static int acx565akm_probe(struct spi_device *spi) > return 0; > } > > -static int acx565akm_remove(struct spi_device *spi) > +static void acx565akm_remove(struct spi_device *spi) > { > struct acx565akm_panel *lcd = spi_get_drvdata(spi); > > @@ -666,8 +666,6 @@ static int acx565akm_remove(struct spi_device *spi) > > drm_panel_disable(&lcd->panel); > drm_panel_unprepare(&lcd->panel); > - > - return 0; > } > > static const struct of_device_id acx565akm_of_match[] = { > diff --git a/drivers/gpu/drm/panel/panel-tpo-td028ttec1.c b/drivers/gpu/drm/panel/panel-tpo-td028ttec1.c > index ba0c00d1a001..4dbf8b88f264 100644 > --- a/drivers/gpu/drm/panel/panel-tpo-td028ttec1.c > +++ b/drivers/gpu/drm/panel/panel-tpo-td028ttec1.c > @@ -350,15 +350,13 @@ static int td028ttec1_probe(struct spi_device *spi) > return 0; > } > > -static int td028ttec1_remove(struct spi_device *spi) > +static void td028ttec1_remove(struct spi_device *spi) > { > struct td028ttec1_panel *lcd = spi_get_drvdata(spi); > > drm_panel_remove(&lcd->panel); > drm_panel_disable(&lcd->panel); > drm_panel_unprepare(&lcd->panel); > - > - return 0; > } > > static const struct of_device_id td028ttec1_of_match[] = { > diff --git a/drivers/gpu/drm/panel/panel-tpo-td043mtea1.c b/drivers/gpu/drm/panel/panel-tpo-td043mtea1.c > index 1866cdb8f9c1..cf4609bb9b1d 100644 > --- a/drivers/gpu/drm/panel/panel-tpo-td043mtea1.c > +++ b/drivers/gpu/drm/panel/panel-tpo-td043mtea1.c > @@ -463,7 +463,7 @@ static int td043mtea1_probe(struct spi_device *spi) > return 0; > } > > -static int td043mtea1_remove(struct spi_device *spi) > +static void td043mtea1_remove(struct spi_device *spi) > { > struct td043mtea1_panel *lcd = spi_get_drvdata(spi); > > @@ -472,8 +472,6 @@ static int td043mtea1_remove(struct spi_device *spi) > drm_panel_unprepare(&lcd->panel); > > sysfs_remove_group(&spi->dev.kobj, &td043mtea1_attr_group); > - > - return 0; > } > > static const struct of_device_id td043mtea1_of_match[] = { > diff --git a/drivers/gpu/drm/panel/panel-tpo-tpg110.c b/drivers/gpu/drm/panel/panel-tpo-tpg110.c > index e3791dad6830..0b1f5a11a055 100644 > --- a/drivers/gpu/drm/panel/panel-tpo-tpg110.c > +++ b/drivers/gpu/drm/panel/panel-tpo-tpg110.c > @@ -450,12 +450,11 @@ static int tpg110_probe(struct spi_device *spi) > return 0; > } > > -static int tpg110_remove(struct spi_device *spi) > +static void tpg110_remove(struct spi_device *spi) > { > struct tpg110 *tpg = spi_get_drvdata(spi); > > drm_panel_remove(&tpg->panel); > - return 0; > } > > static const struct of_device_id tpg110_match[] = { > diff --git a/drivers/gpu/drm/panel/panel-widechips-ws2401.c b/drivers/gpu/drm/panel/panel-widechips-ws2401.c > index 8bc976f54b80..236f3cb2b594 100644 > --- a/drivers/gpu/drm/panel/panel-widechips-ws2401.c > +++ b/drivers/gpu/drm/panel/panel-widechips-ws2401.c > @@ -407,12 +407,11 @@ static int ws2401_probe(struct spi_device *spi) > return 0; > } > > -static int ws2401_remove(struct spi_device *spi) > +static void ws2401_remove(struct spi_device *spi) > { > struct ws2401 *ws = spi_get_drvdata(spi); > > drm_panel_remove(&ws->panel); > - return 0; > } > > /* > diff --git a/drivers/gpu/drm/tiny/hx8357d.c b/drivers/gpu/drm/tiny/hx8357d.c > index 9b33c05732aa..ebb025543f8d 100644 > --- a/drivers/gpu/drm/tiny/hx8357d.c > +++ b/drivers/gpu/drm/tiny/hx8357d.c > @@ -263,14 +263,12 @@ static int hx8357d_probe(struct spi_device *spi) > return 0; > } > > -static int hx8357d_remove(struct spi_device *spi) > +static void hx8357d_remove(struct spi_device *spi) > { > struct drm_device *drm = spi_get_drvdata(spi); > > drm_dev_unplug(drm); > drm_atomic_helper_shutdown(drm); > - > - return 0; > } > > static void hx8357d_shutdown(struct spi_device *spi) > diff --git a/drivers/gpu/drm/tiny/ili9163.c b/drivers/gpu/drm/tiny/ili9163.c > index bcc181351236..fc8ed245b0bc 100644 > --- a/drivers/gpu/drm/tiny/ili9163.c > +++ b/drivers/gpu/drm/tiny/ili9163.c > @@ -193,14 +193,12 @@ static int ili9163_probe(struct spi_device *spi) > return 0; > } > > -static int ili9163_remove(struct spi_device *spi) > +static void ili9163_remove(struct spi_device *spi) > { > struct drm_device *drm = spi_get_drvdata(spi); > > drm_dev_unplug(drm); > drm_atomic_helper_shutdown(drm); > - > - return 0; > } > > static void ili9163_shutdown(struct spi_device *spi) > diff --git a/drivers/gpu/drm/tiny/ili9225.c b/drivers/gpu/drm/tiny/ili9225.c > index 976d3209f164..cc92eb9f2a07 100644 > --- a/drivers/gpu/drm/tiny/ili9225.c > +++ b/drivers/gpu/drm/tiny/ili9225.c > @@ -411,14 +411,12 @@ static int ili9225_probe(struct spi_device *spi) > return 0; > } > > -static int ili9225_remove(struct spi_device *spi) > +static void ili9225_remove(struct spi_device *spi) > { > struct drm_device *drm = spi_get_drvdata(spi); > > drm_dev_unplug(drm); > drm_atomic_helper_shutdown(drm); > - > - return 0; > } > > static void ili9225_shutdown(struct spi_device *spi) > diff --git a/drivers/gpu/drm/tiny/ili9341.c b/drivers/gpu/drm/tiny/ili9341.c > index 37e0c33399c8..5b8cc770ee7b 100644 > --- a/drivers/gpu/drm/tiny/ili9341.c > +++ b/drivers/gpu/drm/tiny/ili9341.c > @@ -225,14 +225,12 @@ static int ili9341_probe(struct spi_device *spi) > return 0; > } > > -static int ili9341_remove(struct spi_device *spi) > +static void ili9341_remove(struct spi_device *spi) > { > struct drm_device *drm = spi_get_drvdata(spi); > > drm_dev_unplug(drm); > drm_atomic_helper_shutdown(drm); > - > - return 0; > } > > static void ili9341_shutdown(struct spi_device *spi) > diff --git a/drivers/gpu/drm/tiny/ili9486.c b/drivers/gpu/drm/tiny/ili9486.c > index e9a63f4b2993..6d655e18e0aa 100644 > --- a/drivers/gpu/drm/tiny/ili9486.c > +++ b/drivers/gpu/drm/tiny/ili9486.c > @@ -243,14 +243,12 @@ static int ili9486_probe(struct spi_device *spi) > return 0; > } > > -static int ili9486_remove(struct spi_device *spi) > +static void ili9486_remove(struct spi_device *spi) > { > struct drm_device *drm = spi_get_drvdata(spi); > > drm_dev_unplug(drm); > drm_atomic_helper_shutdown(drm); > - > - return 0; > } > > static void ili9486_shutdown(struct spi_device *spi) > diff --git a/drivers/gpu/drm/tiny/mi0283qt.c b/drivers/gpu/drm/tiny/mi0283qt.c > index 023de49e7a8e..5e060f6910bb 100644 > --- a/drivers/gpu/drm/tiny/mi0283qt.c > +++ b/drivers/gpu/drm/tiny/mi0283qt.c > @@ -233,14 +233,12 @@ static int mi0283qt_probe(struct spi_device *spi) > return 0; > } > > -static int mi0283qt_remove(struct spi_device *spi) > +static void mi0283qt_remove(struct spi_device *spi) > { > struct drm_device *drm = spi_get_drvdata(spi); > > drm_dev_unplug(drm); > drm_atomic_helper_shutdown(drm); > - > - return 0; > } > > static void mi0283qt_shutdown(struct spi_device *spi) > diff --git a/drivers/gpu/drm/tiny/repaper.c b/drivers/gpu/drm/tiny/repaper.c > index 97a775c48cea..beeeb170d0b1 100644 > --- a/drivers/gpu/drm/tiny/repaper.c > +++ b/drivers/gpu/drm/tiny/repaper.c > @@ -1140,14 +1140,12 @@ static int repaper_probe(struct spi_device *spi) > return 0; > } > > -static int repaper_remove(struct spi_device *spi) > +static void repaper_remove(struct spi_device *spi) > { > struct drm_device *drm = spi_get_drvdata(spi); > > drm_dev_unplug(drm); > drm_atomic_helper_shutdown(drm); > - > - return 0; > } > > static void repaper_shutdown(struct spi_device *spi) > diff --git a/drivers/gpu/drm/tiny/st7586.c b/drivers/gpu/drm/tiny/st7586.c > index 51b9b9fb3ead..3f38faa1cd8c 100644 > --- a/drivers/gpu/drm/tiny/st7586.c > +++ b/drivers/gpu/drm/tiny/st7586.c > @@ -360,14 +360,12 @@ static int st7586_probe(struct spi_device *spi) > return 0; > } > > -static int st7586_remove(struct spi_device *spi) > +static void st7586_remove(struct spi_device *spi) > { > struct drm_device *drm = spi_get_drvdata(spi); > > drm_dev_unplug(drm); > drm_atomic_helper_shutdown(drm); > - > - return 0; > } > > static void st7586_shutdown(struct spi_device *spi) > diff --git a/drivers/gpu/drm/tiny/st7735r.c b/drivers/gpu/drm/tiny/st7735r.c > index fc40dd10efa8..29d618093e94 100644 > --- a/drivers/gpu/drm/tiny/st7735r.c > +++ b/drivers/gpu/drm/tiny/st7735r.c > @@ -247,14 +247,12 @@ static int st7735r_probe(struct spi_device *spi) > return 0; > } > > -static int st7735r_remove(struct spi_device *spi) > +static void st7735r_remove(struct spi_device *spi) > { > struct drm_device *drm = spi_get_drvdata(spi); > > drm_dev_unplug(drm); > drm_atomic_helper_shutdown(drm); > - > - return 0; > } > > static void st7735r_shutdown(struct spi_device *spi) > diff --git a/drivers/hwmon/adcxx.c b/drivers/hwmon/adcxx.c > index e5bc5ce09f4e..de37bce24fa6 100644 > --- a/drivers/hwmon/adcxx.c > +++ b/drivers/hwmon/adcxx.c > @@ -194,7 +194,7 @@ static int adcxx_probe(struct spi_device *spi) > return status; > } > > -static int adcxx_remove(struct spi_device *spi) > +static void adcxx_remove(struct spi_device *spi) > { > struct adcxx *adc = spi_get_drvdata(spi); > int i; > @@ -205,8 +205,6 @@ static int adcxx_remove(struct spi_device *spi) > device_remove_file(&spi->dev, &ad_input[i].dev_attr); > > mutex_unlock(&adc->lock); > - > - return 0; > } > > static const struct spi_device_id adcxx_ids[] = { > diff --git a/drivers/hwmon/adt7310.c b/drivers/hwmon/adt7310.c > index c40cac16af68..832d9ec64934 100644 > --- a/drivers/hwmon/adt7310.c > +++ b/drivers/hwmon/adt7310.c > @@ -88,10 +88,9 @@ static int adt7310_spi_probe(struct spi_device *spi) > &adt7310_spi_ops); > } > > -static int adt7310_spi_remove(struct spi_device *spi) > +static void adt7310_spi_remove(struct spi_device *spi) > { > adt7x10_remove(&spi->dev, spi->irq); > - return 0; > } > > static const struct spi_device_id adt7310_id[] = { > diff --git a/drivers/hwmon/max1111.c b/drivers/hwmon/max1111.c > index 5fcfd57df61e..4c5487aeb3cf 100644 > --- a/drivers/hwmon/max1111.c > +++ b/drivers/hwmon/max1111.c > @@ -254,7 +254,7 @@ static int max1111_probe(struct spi_device *spi) > return err; > } > > -static int max1111_remove(struct spi_device *spi) > +static void max1111_remove(struct spi_device *spi) > { > struct max1111_data *data = spi_get_drvdata(spi); > > @@ -265,7 +265,6 @@ static int max1111_remove(struct spi_device *spi) > sysfs_remove_group(&spi->dev.kobj, &max1110_attr_group); > sysfs_remove_group(&spi->dev.kobj, &max1111_attr_group); > mutex_destroy(&data->drvdata_lock); > - return 0; > } > > static const struct spi_device_id max1111_ids[] = { > diff --git a/drivers/hwmon/max31722.c b/drivers/hwmon/max31722.c > index 4cf4fe6809a3..93e048ee4955 100644 > --- a/drivers/hwmon/max31722.c > +++ b/drivers/hwmon/max31722.c > @@ -100,7 +100,7 @@ static int max31722_probe(struct spi_device *spi) > return 0; > } > > -static int max31722_remove(struct spi_device *spi) > +static void max31722_remove(struct spi_device *spi) > { > struct max31722_data *data = spi_get_drvdata(spi); > int ret; > @@ -111,8 +111,6 @@ static int max31722_remove(struct spi_device *spi) > if (ret) > /* There is nothing we can do about this ... */ > dev_warn(&spi->dev, "Failed to put device in stand-by mode\n"); > - > - return 0; > } > > static int __maybe_unused max31722_suspend(struct device *dev) > diff --git a/drivers/iio/accel/bma400_spi.c b/drivers/iio/accel/bma400_spi.c > index 9f622e37477b..9040a717b247 100644 > --- a/drivers/iio/accel/bma400_spi.c > +++ b/drivers/iio/accel/bma400_spi.c > @@ -87,11 +87,9 @@ static int bma400_spi_probe(struct spi_device *spi) > return bma400_probe(&spi->dev, regmap, id->name); > } > > -static int bma400_spi_remove(struct spi_device *spi) > +static void bma400_spi_remove(struct spi_device *spi) > { > bma400_remove(&spi->dev); > - > - return 0; > } > > static const struct spi_device_id bma400_spi_ids[] = { > diff --git a/drivers/iio/accel/bmc150-accel-spi.c b/drivers/iio/accel/bmc150-accel-spi.c > index 11559567cb39..80007cc2d044 100644 > --- a/drivers/iio/accel/bmc150-accel-spi.c > +++ b/drivers/iio/accel/bmc150-accel-spi.c > @@ -35,11 +35,9 @@ static int bmc150_accel_probe(struct spi_device *spi) > true); > } > > -static int bmc150_accel_remove(struct spi_device *spi) > +static void bmc150_accel_remove(struct spi_device *spi) > { > bmc150_accel_core_remove(&spi->dev); > - > - return 0; > } > > static const struct acpi_device_id bmc150_accel_acpi_match[] = { > diff --git a/drivers/iio/accel/bmi088-accel-spi.c b/drivers/iio/accel/bmi088-accel-spi.c > index 758ad2f12896..06d99d9949f3 100644 > --- a/drivers/iio/accel/bmi088-accel-spi.c > +++ b/drivers/iio/accel/bmi088-accel-spi.c > @@ -56,11 +56,9 @@ static int bmi088_accel_probe(struct spi_device *spi) > true); > } > > -static int bmi088_accel_remove(struct spi_device *spi) > +static void bmi088_accel_remove(struct spi_device *spi) > { > bmi088_accel_core_remove(&spi->dev); > - > - return 0; > } > > static const struct spi_device_id bmi088_accel_id[] = { > diff --git a/drivers/iio/accel/kxsd9-spi.c b/drivers/iio/accel/kxsd9-spi.c > index 441e6b764281..57c451cfb9e5 100644 > --- a/drivers/iio/accel/kxsd9-spi.c > +++ b/drivers/iio/accel/kxsd9-spi.c > @@ -32,11 +32,9 @@ static int kxsd9_spi_probe(struct spi_device *spi) > spi_get_device_id(spi)->name); > } > > -static int kxsd9_spi_remove(struct spi_device *spi) > +static void kxsd9_spi_remove(struct spi_device *spi) > { > kxsd9_common_remove(&spi->dev); > - > - return 0; > } > > static const struct spi_device_id kxsd9_spi_id[] = { > diff --git a/drivers/iio/accel/mma7455_spi.c b/drivers/iio/accel/mma7455_spi.c > index ecf690692dcc..b746031551a3 100644 > --- a/drivers/iio/accel/mma7455_spi.c > +++ b/drivers/iio/accel/mma7455_spi.c > @@ -22,11 +22,9 @@ static int mma7455_spi_probe(struct spi_device *spi) > return mma7455_core_probe(&spi->dev, regmap, id->name); > } > > -static int mma7455_spi_remove(struct spi_device *spi) > +static void mma7455_spi_remove(struct spi_device *spi) > { > mma7455_core_remove(&spi->dev); > - > - return 0; > } > > static const struct spi_device_id mma7455_spi_ids[] = { > diff --git a/drivers/iio/accel/sca3000.c b/drivers/iio/accel/sca3000.c > index 43ecacbdc95a..83c81072511e 100644 > --- a/drivers/iio/accel/sca3000.c > +++ b/drivers/iio/accel/sca3000.c > @@ -1524,7 +1524,7 @@ static int sca3000_stop_all_interrupts(struct sca3000_state *st) > return ret; > } > > -static int sca3000_remove(struct spi_device *spi) > +static void sca3000_remove(struct spi_device *spi) > { > struct iio_dev *indio_dev = spi_get_drvdata(spi); > struct sca3000_state *st = iio_priv(indio_dev); > @@ -1535,8 +1535,6 @@ static int sca3000_remove(struct spi_device *spi) > sca3000_stop_all_interrupts(st); > if (spi->irq) > free_irq(spi->irq, indio_dev); > - > - return 0; > } > > static const struct spi_device_id sca3000_id[] = { > diff --git a/drivers/iio/adc/ad7266.c b/drivers/iio/adc/ad7266.c > index 1d345d66742d..c17d9b5fbaf6 100644 > --- a/drivers/iio/adc/ad7266.c > +++ b/drivers/iio/adc/ad7266.c > @@ -479,7 +479,7 @@ static int ad7266_probe(struct spi_device *spi) > return ret; > } > > -static int ad7266_remove(struct spi_device *spi) > +static void ad7266_remove(struct spi_device *spi) > { > struct iio_dev *indio_dev = spi_get_drvdata(spi); > struct ad7266_state *st = iio_priv(indio_dev); > @@ -488,8 +488,6 @@ static int ad7266_remove(struct spi_device *spi) > iio_triggered_buffer_cleanup(indio_dev); > if (!IS_ERR(st->reg)) > regulator_disable(st->reg); > - > - return 0; > } > > static const struct spi_device_id ad7266_id[] = { > diff --git a/drivers/iio/adc/ltc2496.c b/drivers/iio/adc/ltc2496.c > index dd956a7c216e..5a55f79f2574 100644 > --- a/drivers/iio/adc/ltc2496.c > +++ b/drivers/iio/adc/ltc2496.c > @@ -78,13 +78,11 @@ static int ltc2496_probe(struct spi_device *spi) > return ltc2497core_probe(dev, indio_dev); > } > > -static int ltc2496_remove(struct spi_device *spi) > +static void ltc2496_remove(struct spi_device *spi) > { > struct iio_dev *indio_dev = spi_get_drvdata(spi); > > ltc2497core_remove(indio_dev); > - > - return 0; > } > > static const struct of_device_id ltc2496_of_match[] = { > diff --git a/drivers/iio/adc/mcp320x.c b/drivers/iio/adc/mcp320x.c > index 8d1cff28cae0..b4c69acb33e3 100644 > --- a/drivers/iio/adc/mcp320x.c > +++ b/drivers/iio/adc/mcp320x.c > @@ -459,15 +459,13 @@ static int mcp320x_probe(struct spi_device *spi) > return ret; > } > > -static int mcp320x_remove(struct spi_device *spi) > +static void mcp320x_remove(struct spi_device *spi) > { > struct iio_dev *indio_dev = spi_get_drvdata(spi); > struct mcp320x *adc = iio_priv(indio_dev); > > iio_device_unregister(indio_dev); > regulator_disable(adc->reg); > - > - return 0; > } > > static const struct of_device_id mcp320x_dt_ids[] = { > diff --git a/drivers/iio/adc/mcp3911.c b/drivers/iio/adc/mcp3911.c > index 13535f148c4c..1cb4590fe412 100644 > --- a/drivers/iio/adc/mcp3911.c > +++ b/drivers/iio/adc/mcp3911.c > @@ -321,7 +321,7 @@ static int mcp3911_probe(struct spi_device *spi) > return ret; > } > > -static int mcp3911_remove(struct spi_device *spi) > +static void mcp3911_remove(struct spi_device *spi) > { > struct iio_dev *indio_dev = spi_get_drvdata(spi); > struct mcp3911 *adc = iio_priv(indio_dev); > @@ -331,8 +331,6 @@ static int mcp3911_remove(struct spi_device *spi) > clk_disable_unprepare(adc->clki); > if (adc->vref) > regulator_disable(adc->vref); > - > - return 0; > } > > static const struct of_device_id mcp3911_dt_ids[] = { > diff --git a/drivers/iio/adc/ti-adc12138.c b/drivers/iio/adc/ti-adc12138.c > index 6eb62b564dae..59d75d09604f 100644 > --- a/drivers/iio/adc/ti-adc12138.c > +++ b/drivers/iio/adc/ti-adc12138.c > @@ -503,7 +503,7 @@ static int adc12138_probe(struct spi_device *spi) > return ret; > } > > -static int adc12138_remove(struct spi_device *spi) > +static void adc12138_remove(struct spi_device *spi) > { > struct iio_dev *indio_dev = spi_get_drvdata(spi); > struct adc12138 *adc = iio_priv(indio_dev); > @@ -514,8 +514,6 @@ static int adc12138_remove(struct spi_device *spi) > regulator_disable(adc->vref_n); > regulator_disable(adc->vref_p); > clk_disable_unprepare(adc->cclk); > - > - return 0; > } > > static const struct of_device_id adc12138_dt_ids[] = { > diff --git a/drivers/iio/adc/ti-ads7950.c b/drivers/iio/adc/ti-ads7950.c > index a7efa3eada2c..e3658b969c5b 100644 > --- a/drivers/iio/adc/ti-ads7950.c > +++ b/drivers/iio/adc/ti-ads7950.c > @@ -662,7 +662,7 @@ static int ti_ads7950_probe(struct spi_device *spi) > return ret; > } > > -static int ti_ads7950_remove(struct spi_device *spi) > +static void ti_ads7950_remove(struct spi_device *spi) > { > struct iio_dev *indio_dev = spi_get_drvdata(spi); > struct ti_ads7950_state *st = iio_priv(indio_dev); > @@ -672,8 +672,6 @@ static int ti_ads7950_remove(struct spi_device *spi) > iio_triggered_buffer_cleanup(indio_dev); > regulator_disable(st->reg); > mutex_destroy(&st->slock); > - > - return 0; > } > > static const struct spi_device_id ti_ads7950_id[] = { > diff --git a/drivers/iio/adc/ti-ads8688.c b/drivers/iio/adc/ti-ads8688.c > index 2e24717d7f55..22c2583eedd0 100644 > --- a/drivers/iio/adc/ti-ads8688.c > +++ b/drivers/iio/adc/ti-ads8688.c > @@ -479,7 +479,7 @@ static int ads8688_probe(struct spi_device *spi) > return ret; > } > > -static int ads8688_remove(struct spi_device *spi) > +static void ads8688_remove(struct spi_device *spi) > { > struct iio_dev *indio_dev = spi_get_drvdata(spi); > struct ads8688_state *st = iio_priv(indio_dev); > @@ -489,8 +489,6 @@ static int ads8688_remove(struct spi_device *spi) > > if (!IS_ERR(st->reg)) > regulator_disable(st->reg); > - > - return 0; > } > > static const struct spi_device_id ads8688_id[] = { > diff --git a/drivers/iio/adc/ti-tlc4541.c b/drivers/iio/adc/ti-tlc4541.c > index 403b787f9f7e..2406eda9dfc6 100644 > --- a/drivers/iio/adc/ti-tlc4541.c > +++ b/drivers/iio/adc/ti-tlc4541.c > @@ -224,7 +224,7 @@ static int tlc4541_probe(struct spi_device *spi) > return ret; > } > > -static int tlc4541_remove(struct spi_device *spi) > +static void tlc4541_remove(struct spi_device *spi) > { > struct iio_dev *indio_dev = spi_get_drvdata(spi); > struct tlc4541_state *st = iio_priv(indio_dev); > @@ -232,8 +232,6 @@ static int tlc4541_remove(struct spi_device *spi) > iio_device_unregister(indio_dev); > iio_triggered_buffer_cleanup(indio_dev); > regulator_disable(st->reg); > - > - return 0; > } > > static const struct of_device_id tlc4541_dt_ids[] = { > diff --git a/drivers/iio/amplifiers/ad8366.c b/drivers/iio/amplifiers/ad8366.c > index cfcf18a0bce8..1134ae12e531 100644 > --- a/drivers/iio/amplifiers/ad8366.c > +++ b/drivers/iio/amplifiers/ad8366.c > @@ -298,7 +298,7 @@ static int ad8366_probe(struct spi_device *spi) > return ret; > } > > -static int ad8366_remove(struct spi_device *spi) > +static void ad8366_remove(struct spi_device *spi) > { > struct iio_dev *indio_dev = spi_get_drvdata(spi); > struct ad8366_state *st = iio_priv(indio_dev); > @@ -308,8 +308,6 @@ static int ad8366_remove(struct spi_device *spi) > > if (!IS_ERR(reg)) > regulator_disable(reg); > - > - return 0; > } > > static const struct spi_device_id ad8366_id[] = { > diff --git a/drivers/iio/common/ssp_sensors/ssp_dev.c b/drivers/iio/common/ssp_sensors/ssp_dev.c > index 1aee87100038..eafaf4529df5 100644 > --- a/drivers/iio/common/ssp_sensors/ssp_dev.c > +++ b/drivers/iio/common/ssp_sensors/ssp_dev.c > @@ -586,7 +586,7 @@ static int ssp_probe(struct spi_device *spi) > return ret; > } > > -static int ssp_remove(struct spi_device *spi) > +static void ssp_remove(struct spi_device *spi) > { > struct ssp_data *data = spi_get_drvdata(spi); > > @@ -608,8 +608,6 @@ static int ssp_remove(struct spi_device *spi) > mutex_destroy(&data->pending_lock); > > mfd_remove_devices(&spi->dev); > - > - return 0; > } > > #ifdef CONFIG_PM_SLEEP > diff --git a/drivers/iio/dac/ad5360.c b/drivers/iio/dac/ad5360.c > index 2d3b14c407d8..ecbc6a51d60f 100644 > --- a/drivers/iio/dac/ad5360.c > +++ b/drivers/iio/dac/ad5360.c > @@ -521,7 +521,7 @@ static int ad5360_probe(struct spi_device *spi) > return ret; > } > > -static int ad5360_remove(struct spi_device *spi) > +static void ad5360_remove(struct spi_device *spi) > { > struct iio_dev *indio_dev = spi_get_drvdata(spi); > struct ad5360_state *st = iio_priv(indio_dev); > @@ -531,8 +531,6 @@ static int ad5360_remove(struct spi_device *spi) > kfree(indio_dev->channels); > > regulator_bulk_disable(st->chip_info->num_vrefs, st->vref_reg); > - > - return 0; > } > > static const struct spi_device_id ad5360_ids[] = { > diff --git a/drivers/iio/dac/ad5380.c b/drivers/iio/dac/ad5380.c > index e38860a6a9f3..82e1d9bd773e 100644 > --- a/drivers/iio/dac/ad5380.c > +++ b/drivers/iio/dac/ad5380.c > @@ -488,11 +488,9 @@ static int ad5380_spi_probe(struct spi_device *spi) > return ad5380_probe(&spi->dev, regmap, id->driver_data, id->name); > } > > -static int ad5380_spi_remove(struct spi_device *spi) > +static void ad5380_spi_remove(struct spi_device *spi) > { > ad5380_remove(&spi->dev); > - > - return 0; > } > > static const struct spi_device_id ad5380_spi_ids[] = { > diff --git a/drivers/iio/dac/ad5446.c b/drivers/iio/dac/ad5446.c > index 1c9b54c012a7..14cfabacbea5 100644 > --- a/drivers/iio/dac/ad5446.c > +++ b/drivers/iio/dac/ad5446.c > @@ -491,11 +491,9 @@ static int ad5446_spi_probe(struct spi_device *spi) > &ad5446_spi_chip_info[id->driver_data]); > } > > -static int ad5446_spi_remove(struct spi_device *spi) > +static void ad5446_spi_remove(struct spi_device *spi) > { > ad5446_remove(&spi->dev); > - > - return 0; > } > > static struct spi_driver ad5446_spi_driver = { > diff --git a/drivers/iio/dac/ad5449.c b/drivers/iio/dac/ad5449.c > index f5e93c6acc9d..bad9bdaafa94 100644 > --- a/drivers/iio/dac/ad5449.c > +++ b/drivers/iio/dac/ad5449.c > @@ -330,7 +330,7 @@ static int ad5449_spi_probe(struct spi_device *spi) > return ret; > } > > -static int ad5449_spi_remove(struct spi_device *spi) > +static void ad5449_spi_remove(struct spi_device *spi) > { > struct iio_dev *indio_dev = spi_get_drvdata(spi); > struct ad5449 *st = iio_priv(indio_dev); > @@ -338,8 +338,6 @@ static int ad5449_spi_remove(struct spi_device *spi) > iio_device_unregister(indio_dev); > > regulator_bulk_disable(st->chip_info->num_channels, st->vref_reg); > - > - return 0; > } > > static const struct spi_device_id ad5449_spi_ids[] = { > diff --git a/drivers/iio/dac/ad5504.c b/drivers/iio/dac/ad5504.c > index b631261efa97..8507573aa13e 100644 > --- a/drivers/iio/dac/ad5504.c > +++ b/drivers/iio/dac/ad5504.c > @@ -336,7 +336,7 @@ static int ad5504_probe(struct spi_device *spi) > return ret; > } > > -static int ad5504_remove(struct spi_device *spi) > +static void ad5504_remove(struct spi_device *spi) > { > struct iio_dev *indio_dev = spi_get_drvdata(spi); > struct ad5504_state *st = iio_priv(indio_dev); > @@ -345,8 +345,6 @@ static int ad5504_remove(struct spi_device *spi) > > if (!IS_ERR(st->reg)) > regulator_disable(st->reg); > - > - return 0; > } > > static const struct spi_device_id ad5504_id[] = { > diff --git a/drivers/iio/dac/ad5592r.c b/drivers/iio/dac/ad5592r.c > index 6bfd7951e18c..0f7abfa75bec 100644 > --- a/drivers/iio/dac/ad5592r.c > +++ b/drivers/iio/dac/ad5592r.c > @@ -130,11 +130,9 @@ static int ad5592r_spi_probe(struct spi_device *spi) > return ad5592r_probe(&spi->dev, id->name, &ad5592r_rw_ops); > } > > -static int ad5592r_spi_remove(struct spi_device *spi) > +static void ad5592r_spi_remove(struct spi_device *spi) > { > ad5592r_remove(&spi->dev); > - > - return 0; > } > > static const struct spi_device_id ad5592r_spi_ids[] = { > diff --git a/drivers/iio/dac/ad5624r_spi.c b/drivers/iio/dac/ad5624r_spi.c > index 3c98941b9f99..371e812850eb 100644 > --- a/drivers/iio/dac/ad5624r_spi.c > +++ b/drivers/iio/dac/ad5624r_spi.c > @@ -293,7 +293,7 @@ static int ad5624r_probe(struct spi_device *spi) > return ret; > } > > -static int ad5624r_remove(struct spi_device *spi) > +static void ad5624r_remove(struct spi_device *spi) > { > struct iio_dev *indio_dev = spi_get_drvdata(spi); > struct ad5624r_state *st = iio_priv(indio_dev); > @@ -301,8 +301,6 @@ static int ad5624r_remove(struct spi_device *spi) > iio_device_unregister(indio_dev); > if (!IS_ERR(st->reg)) > regulator_disable(st->reg); > - > - return 0; > } > > static const struct spi_device_id ad5624r_id[] = { > diff --git a/drivers/iio/dac/ad5686-spi.c b/drivers/iio/dac/ad5686-spi.c > index 2628810fdbb1..d26fb29b6b04 100644 > --- a/drivers/iio/dac/ad5686-spi.c > +++ b/drivers/iio/dac/ad5686-spi.c > @@ -95,11 +95,9 @@ static int ad5686_spi_probe(struct spi_device *spi) > ad5686_spi_write, ad5686_spi_read); > } > > -static int ad5686_spi_remove(struct spi_device *spi) > +static void ad5686_spi_remove(struct spi_device *spi) > { > ad5686_remove(&spi->dev); > - > - return 0; > } > > static const struct spi_device_id ad5686_spi_id[] = { > diff --git a/drivers/iio/dac/ad5761.c b/drivers/iio/dac/ad5761.c > index e37e095e94fc..4cb8471db81e 100644 > --- a/drivers/iio/dac/ad5761.c > +++ b/drivers/iio/dac/ad5761.c > @@ -394,7 +394,7 @@ static int ad5761_probe(struct spi_device *spi) > return ret; > } > > -static int ad5761_remove(struct spi_device *spi) > +static void ad5761_remove(struct spi_device *spi) > { > struct iio_dev *iio_dev = spi_get_drvdata(spi); > struct ad5761_state *st = iio_priv(iio_dev); > @@ -403,8 +403,6 @@ static int ad5761_remove(struct spi_device *spi) > > if (!IS_ERR_OR_NULL(st->vref_reg)) > regulator_disable(st->vref_reg); > - > - return 0; > } > > static const struct spi_device_id ad5761_id[] = { > diff --git a/drivers/iio/dac/ad5764.c b/drivers/iio/dac/ad5764.c > index ae089b9145cb..d235a8047ba0 100644 > --- a/drivers/iio/dac/ad5764.c > +++ b/drivers/iio/dac/ad5764.c > @@ -332,7 +332,7 @@ static int ad5764_probe(struct spi_device *spi) > return ret; > } > > -static int ad5764_remove(struct spi_device *spi) > +static void ad5764_remove(struct spi_device *spi) > { > struct iio_dev *indio_dev = spi_get_drvdata(spi); > struct ad5764_state *st = iio_priv(indio_dev); > @@ -341,8 +341,6 @@ static int ad5764_remove(struct spi_device *spi) > > if (st->chip_info->int_vref == 0) > regulator_bulk_disable(ARRAY_SIZE(st->vref_reg), st->vref_reg); > - > - return 0; > } > > static const struct spi_device_id ad5764_ids[] = { > diff --git a/drivers/iio/dac/ad5791.c b/drivers/iio/dac/ad5791.c > index 7b4579d73d18..2b14914b4050 100644 > --- a/drivers/iio/dac/ad5791.c > +++ b/drivers/iio/dac/ad5791.c > @@ -428,7 +428,7 @@ static int ad5791_probe(struct spi_device *spi) > return ret; > } > > -static int ad5791_remove(struct spi_device *spi) > +static void ad5791_remove(struct spi_device *spi) > { > struct iio_dev *indio_dev = spi_get_drvdata(spi); > struct ad5791_state *st = iio_priv(indio_dev); > @@ -439,8 +439,6 @@ static int ad5791_remove(struct spi_device *spi) > > if (!IS_ERR(st->reg_vss)) > regulator_disable(st->reg_vss); > - > - return 0; > } > > static const struct spi_device_id ad5791_id[] = { > diff --git a/drivers/iio/dac/ad8801.c b/drivers/iio/dac/ad8801.c > index 5ecfdad54dec..6be35c92d435 100644 > --- a/drivers/iio/dac/ad8801.c > +++ b/drivers/iio/dac/ad8801.c > @@ -193,7 +193,7 @@ static int ad8801_probe(struct spi_device *spi) > return ret; > } > > -static int ad8801_remove(struct spi_device *spi) > +static void ad8801_remove(struct spi_device *spi) > { > struct iio_dev *indio_dev = spi_get_drvdata(spi); > struct ad8801_state *state = iio_priv(indio_dev); > @@ -202,8 +202,6 @@ static int ad8801_remove(struct spi_device *spi) > if (state->vrefl_reg) > regulator_disable(state->vrefl_reg); > regulator_disable(state->vrefh_reg); > - > - return 0; > } > > static const struct spi_device_id ad8801_ids[] = { > diff --git a/drivers/iio/dac/ltc1660.c b/drivers/iio/dac/ltc1660.c > index f6ec9bf5815e..c76233c9bb72 100644 > --- a/drivers/iio/dac/ltc1660.c > +++ b/drivers/iio/dac/ltc1660.c > @@ -206,15 +206,13 @@ static int ltc1660_probe(struct spi_device *spi) > return ret; > } > > -static int ltc1660_remove(struct spi_device *spi) > +static void ltc1660_remove(struct spi_device *spi) > { > struct iio_dev *indio_dev = spi_get_drvdata(spi); > struct ltc1660_priv *priv = iio_priv(indio_dev); > > iio_device_unregister(indio_dev); > regulator_disable(priv->vref_reg); > - > - return 0; > } > > static const struct of_device_id ltc1660_dt_ids[] = { > diff --git a/drivers/iio/dac/ltc2632.c b/drivers/iio/dac/ltc2632.c > index 53e4b887d372..aed46c80757e 100644 > --- a/drivers/iio/dac/ltc2632.c > +++ b/drivers/iio/dac/ltc2632.c > @@ -372,7 +372,7 @@ static int ltc2632_probe(struct spi_device *spi) > return iio_device_register(indio_dev); > } > > -static int ltc2632_remove(struct spi_device *spi) > +static void ltc2632_remove(struct spi_device *spi) > { > struct iio_dev *indio_dev = spi_get_drvdata(spi); > struct ltc2632_state *st = iio_priv(indio_dev); > @@ -381,8 +381,6 @@ static int ltc2632_remove(struct spi_device *spi) > > if (st->vref_reg) > regulator_disable(st->vref_reg); > - > - return 0; > } > > static const struct spi_device_id ltc2632_id[] = { > diff --git a/drivers/iio/dac/mcp4922.c b/drivers/iio/dac/mcp4922.c > index 0ae414ee1716..cb9e60e71b91 100644 > --- a/drivers/iio/dac/mcp4922.c > +++ b/drivers/iio/dac/mcp4922.c > @@ -172,7 +172,7 @@ static int mcp4922_probe(struct spi_device *spi) > return ret; > } > > -static int mcp4922_remove(struct spi_device *spi) > +static void mcp4922_remove(struct spi_device *spi) > { > struct iio_dev *indio_dev = spi_get_drvdata(spi); > struct mcp4922_state *state; > @@ -180,8 +180,6 @@ static int mcp4922_remove(struct spi_device *spi) > iio_device_unregister(indio_dev); > state = iio_priv(indio_dev); > regulator_disable(state->vref_reg); > - > - return 0; > } > > static const struct spi_device_id mcp4922_id[] = { > diff --git a/drivers/iio/dac/ti-dac082s085.c b/drivers/iio/dac/ti-dac082s085.c > index 6beda2193683..4e1156e6deb2 100644 > --- a/drivers/iio/dac/ti-dac082s085.c > +++ b/drivers/iio/dac/ti-dac082s085.c > @@ -313,7 +313,7 @@ static int ti_dac_probe(struct spi_device *spi) > return ret; > } > > -static int ti_dac_remove(struct spi_device *spi) > +static void ti_dac_remove(struct spi_device *spi) > { > struct iio_dev *indio_dev = spi_get_drvdata(spi); > struct ti_dac_chip *ti_dac = iio_priv(indio_dev); > @@ -321,8 +321,6 @@ static int ti_dac_remove(struct spi_device *spi) > iio_device_unregister(indio_dev); > mutex_destroy(&ti_dac->lock); > regulator_disable(ti_dac->vref); > - > - return 0; > } > > static const struct of_device_id ti_dac_of_id[] = { > diff --git a/drivers/iio/dac/ti-dac7311.c b/drivers/iio/dac/ti-dac7311.c > index 99f275829ec2..e10d17e60ed3 100644 > --- a/drivers/iio/dac/ti-dac7311.c > +++ b/drivers/iio/dac/ti-dac7311.c > @@ -292,7 +292,7 @@ static int ti_dac_probe(struct spi_device *spi) > return ret; > } > > -static int ti_dac_remove(struct spi_device *spi) > +static void ti_dac_remove(struct spi_device *spi) > { > struct iio_dev *indio_dev = spi_get_drvdata(spi); > struct ti_dac_chip *ti_dac = iio_priv(indio_dev); > @@ -300,7 +300,6 @@ static int ti_dac_remove(struct spi_device *spi) > iio_device_unregister(indio_dev); > mutex_destroy(&ti_dac->lock); > regulator_disable(ti_dac->vref); > - return 0; > } > > static const struct of_device_id ti_dac_of_id[] = { > diff --git a/drivers/iio/frequency/adf4350.c b/drivers/iio/frequency/adf4350.c > index 3d9eba716b69..f3521330f6fb 100644 > --- a/drivers/iio/frequency/adf4350.c > +++ b/drivers/iio/frequency/adf4350.c > @@ -589,7 +589,7 @@ static int adf4350_probe(struct spi_device *spi) > return ret; > } > > -static int adf4350_remove(struct spi_device *spi) > +static void adf4350_remove(struct spi_device *spi) > { > struct iio_dev *indio_dev = spi_get_drvdata(spi); > struct adf4350_state *st = iio_priv(indio_dev); > @@ -604,8 +604,6 @@ static int adf4350_remove(struct spi_device *spi) > > if (!IS_ERR(reg)) > regulator_disable(reg); > - > - return 0; > } > > static const struct of_device_id adf4350_of_match[] = { > diff --git a/drivers/iio/gyro/bmg160_spi.c b/drivers/iio/gyro/bmg160_spi.c > index 745962e1e423..fc2e453527b9 100644 > --- a/drivers/iio/gyro/bmg160_spi.c > +++ b/drivers/iio/gyro/bmg160_spi.c > @@ -27,11 +27,9 @@ static int bmg160_spi_probe(struct spi_device *spi) > return bmg160_core_probe(&spi->dev, regmap, spi->irq, id->name); > } > > -static int bmg160_spi_remove(struct spi_device *spi) > +static void bmg160_spi_remove(struct spi_device *spi) > { > bmg160_core_remove(&spi->dev); > - > - return 0; > } > > static const struct spi_device_id bmg160_spi_id[] = { > diff --git a/drivers/iio/gyro/fxas21002c_spi.c b/drivers/iio/gyro/fxas21002c_spi.c > index 77ceebef4e34..c3ac169facf9 100644 > --- a/drivers/iio/gyro/fxas21002c_spi.c > +++ b/drivers/iio/gyro/fxas21002c_spi.c > @@ -34,11 +34,9 @@ static int fxas21002c_spi_probe(struct spi_device *spi) > return fxas21002c_core_probe(&spi->dev, regmap, spi->irq, id->name); > } > > -static int fxas21002c_spi_remove(struct spi_device *spi) > +static void fxas21002c_spi_remove(struct spi_device *spi) > { > fxas21002c_core_remove(&spi->dev); > - > - return 0; > } > > static const struct spi_device_id fxas21002c_spi_id[] = { > diff --git a/drivers/iio/health/afe4403.c b/drivers/iio/health/afe4403.c > index 273f16dcaff8..856ec901b091 100644 > --- a/drivers/iio/health/afe4403.c > +++ b/drivers/iio/health/afe4403.c > @@ -570,7 +570,7 @@ static int afe4403_probe(struct spi_device *spi) > return ret; > } > > -static int afe4403_remove(struct spi_device *spi) > +static void afe4403_remove(struct spi_device *spi) > { > struct iio_dev *indio_dev = spi_get_drvdata(spi); > struct afe4403_data *afe = iio_priv(indio_dev); > @@ -586,8 +586,6 @@ static int afe4403_remove(struct spi_device *spi) > ret = regulator_disable(afe->regulator); > if (ret) > dev_warn(afe->dev, "Unable to disable regulator\n"); > - > - return 0; > } > > static const struct spi_device_id afe4403_ids[] = { > diff --git a/drivers/iio/magnetometer/bmc150_magn_spi.c b/drivers/iio/magnetometer/bmc150_magn_spi.c > index c6ed3ea8460a..4c570412d65c 100644 > --- a/drivers/iio/magnetometer/bmc150_magn_spi.c > +++ b/drivers/iio/magnetometer/bmc150_magn_spi.c > @@ -29,11 +29,9 @@ static int bmc150_magn_spi_probe(struct spi_device *spi) > return bmc150_magn_probe(&spi->dev, regmap, spi->irq, id->name); > } > > -static int bmc150_magn_spi_remove(struct spi_device *spi) > +static void bmc150_magn_spi_remove(struct spi_device *spi) > { > bmc150_magn_remove(&spi->dev); > - > - return 0; > } > > static const struct spi_device_id bmc150_magn_spi_id[] = { > diff --git a/drivers/iio/magnetometer/hmc5843_spi.c b/drivers/iio/magnetometer/hmc5843_spi.c > index 89cf59a62c28..a99dd9b33e95 100644 > --- a/drivers/iio/magnetometer/hmc5843_spi.c > +++ b/drivers/iio/magnetometer/hmc5843_spi.c > @@ -74,11 +74,9 @@ static int hmc5843_spi_probe(struct spi_device *spi) > id->driver_data, id->name); > } > > -static int hmc5843_spi_remove(struct spi_device *spi) > +static void hmc5843_spi_remove(struct spi_device *spi) > { > hmc5843_common_remove(&spi->dev); > - > - return 0; > } > > static const struct spi_device_id hmc5843_id[] = { > diff --git a/drivers/iio/potentiometer/max5487.c b/drivers/iio/potentiometer/max5487.c > index 007c2bd324cb..42723c996c9f 100644 > --- a/drivers/iio/potentiometer/max5487.c > +++ b/drivers/iio/potentiometer/max5487.c > @@ -112,7 +112,7 @@ static int max5487_spi_probe(struct spi_device *spi) > return iio_device_register(indio_dev); > } > > -static int max5487_spi_remove(struct spi_device *spi) > +static void max5487_spi_remove(struct spi_device *spi) > { > struct iio_dev *indio_dev = spi_get_drvdata(spi); > int ret; > @@ -123,8 +123,6 @@ static int max5487_spi_remove(struct spi_device *spi) > ret = max5487_write_cmd(spi, MAX5487_COPY_AB_TO_NV); > if (ret) > dev_warn(&spi->dev, "Failed to save wiper regs to NV regs\n"); > - > - return 0; > } > > static const struct spi_device_id max5487_id[] = { > diff --git a/drivers/iio/pressure/ms5611_spi.c b/drivers/iio/pressure/ms5611_spi.c > index 9fa2dcd71760..7ccd960ced5d 100644 > --- a/drivers/iio/pressure/ms5611_spi.c > +++ b/drivers/iio/pressure/ms5611_spi.c > @@ -107,11 +107,9 @@ static int ms5611_spi_probe(struct spi_device *spi) > spi_get_device_id(spi)->driver_data); > } > > -static int ms5611_spi_remove(struct spi_device *spi) > +static void ms5611_spi_remove(struct spi_device *spi) > { > ms5611_remove(spi_get_drvdata(spi)); > - > - return 0; > } > > static const struct of_device_id ms5611_spi_matches[] = { > diff --git a/drivers/iio/pressure/zpa2326_spi.c b/drivers/iio/pressure/zpa2326_spi.c > index 85201a4bae44..ee8ed77536ca 100644 > --- a/drivers/iio/pressure/zpa2326_spi.c > +++ b/drivers/iio/pressure/zpa2326_spi.c > @@ -57,11 +57,9 @@ static int zpa2326_probe_spi(struct spi_device *spi) > spi->irq, ZPA2326_DEVICE_ID, regmap); > } > > -static int zpa2326_remove_spi(struct spi_device *spi) > +static void zpa2326_remove_spi(struct spi_device *spi) > { > zpa2326_remove(&spi->dev); > - > - return 0; > } > > static const struct spi_device_id zpa2326_spi_ids[] = { > diff --git a/drivers/input/keyboard/applespi.c b/drivers/input/keyboard/applespi.c > index eda1b23002b5..d1f5354d5ea2 100644 > --- a/drivers/input/keyboard/applespi.c > +++ b/drivers/input/keyboard/applespi.c > @@ -1858,7 +1858,7 @@ static void applespi_drain_reads(struct applespi_data *applespi) > spin_unlock_irqrestore(&applespi->cmd_msg_lock, flags); > } > > -static int applespi_remove(struct spi_device *spi) > +static void applespi_remove(struct spi_device *spi) > { > struct applespi_data *applespi = spi_get_drvdata(spi); > > @@ -1871,8 +1871,6 @@ static int applespi_remove(struct spi_device *spi) > applespi_drain_reads(applespi); > > debugfs_remove_recursive(applespi->debugfs_root); > - > - return 0; > } > > static void applespi_shutdown(struct spi_device *spi) > diff --git a/drivers/input/misc/adxl34x-spi.c b/drivers/input/misc/adxl34x-spi.c > index 6e51c9bc619f..91e44d4c66f7 100644 > --- a/drivers/input/misc/adxl34x-spi.c > +++ b/drivers/input/misc/adxl34x-spi.c > @@ -87,13 +87,11 @@ static int adxl34x_spi_probe(struct spi_device *spi) > return 0; > } > > -static int adxl34x_spi_remove(struct spi_device *spi) > +static void adxl34x_spi_remove(struct spi_device *spi) > { > struct adxl34x *ac = spi_get_drvdata(spi); > > adxl34x_remove(ac); > - > - return 0; > } > > static int __maybe_unused adxl34x_spi_suspend(struct device *dev) > diff --git a/drivers/input/touchscreen/ads7846.c b/drivers/input/touchscreen/ads7846.c > index a25a77dd9a32..bed68a68f330 100644 > --- a/drivers/input/touchscreen/ads7846.c > +++ b/drivers/input/touchscreen/ads7846.c > @@ -1411,13 +1411,11 @@ static int ads7846_probe(struct spi_device *spi) > return 0; > } > > -static int ads7846_remove(struct spi_device *spi) > +static void ads7846_remove(struct spi_device *spi) > { > struct ads7846 *ts = spi_get_drvdata(spi); > > ads7846_stop(ts); > - > - return 0; > } > > static struct spi_driver ads7846_driver = { > diff --git a/drivers/input/touchscreen/cyttsp4_spi.c b/drivers/input/touchscreen/cyttsp4_spi.c > index 2aec41eb76b7..5d7db84f2749 100644 > --- a/drivers/input/touchscreen/cyttsp4_spi.c > +++ b/drivers/input/touchscreen/cyttsp4_spi.c > @@ -164,12 +164,10 @@ static int cyttsp4_spi_probe(struct spi_device *spi) > return PTR_ERR_OR_ZERO(ts); > } > > -static int cyttsp4_spi_remove(struct spi_device *spi) > +static void cyttsp4_spi_remove(struct spi_device *spi) > { > struct cyttsp4 *ts = spi_get_drvdata(spi); > cyttsp4_remove(ts); > - > - return 0; > } > > static struct spi_driver cyttsp4_spi_driver = { > diff --git a/drivers/input/touchscreen/tsc2005.c b/drivers/input/touchscreen/tsc2005.c > index a2f55920b9b2..555dfe98b3c4 100644 > --- a/drivers/input/touchscreen/tsc2005.c > +++ b/drivers/input/touchscreen/tsc2005.c > @@ -64,11 +64,9 @@ static int tsc2005_probe(struct spi_device *spi) > tsc2005_cmd); > } > > -static int tsc2005_remove(struct spi_device *spi) > +static void tsc2005_remove(struct spi_device *spi) > { > tsc200x_remove(&spi->dev); > - > - return 0; > } > > #ifdef CONFIG_OF > diff --git a/drivers/leds/leds-cr0014114.c b/drivers/leds/leds-cr0014114.c > index d03cfd3c0bfb..c87686bd7c18 100644 > --- a/drivers/leds/leds-cr0014114.c > +++ b/drivers/leds/leds-cr0014114.c > @@ -266,14 +266,12 @@ static int cr0014114_probe(struct spi_device *spi) > return 0; > } > > -static int cr0014114_remove(struct spi_device *spi) > +static void cr0014114_remove(struct spi_device *spi) > { > struct cr0014114 *priv = spi_get_drvdata(spi); > > cancel_delayed_work_sync(&priv->work); > mutex_destroy(&priv->lock); > - > - return 0; > } > > static const struct of_device_id cr0014114_dt_ids[] = { > diff --git a/drivers/leds/leds-dac124s085.c b/drivers/leds/leds-dac124s085.c > index 20dc9b9d7dea..cf5fb1195f87 100644 > --- a/drivers/leds/leds-dac124s085.c > +++ b/drivers/leds/leds-dac124s085.c > @@ -85,15 +85,13 @@ static int dac124s085_probe(struct spi_device *spi) > return ret; > } > > -static int dac124s085_remove(struct spi_device *spi) > +static void dac124s085_remove(struct spi_device *spi) > { > struct dac124s085 *dac = spi_get_drvdata(spi); > int i; > > for (i = 0; i < ARRAY_SIZE(dac->leds); i++) > led_classdev_unregister(&dac->leds[i].ldev); > - > - return 0; > } > > static struct spi_driver dac124s085_driver = { > diff --git a/drivers/leds/leds-el15203000.c b/drivers/leds/leds-el15203000.c > index f9eb59a25570..7e7b617bcd56 100644 > --- a/drivers/leds/leds-el15203000.c > +++ b/drivers/leds/leds-el15203000.c > @@ -315,13 +315,11 @@ static int el15203000_probe(struct spi_device *spi) > return el15203000_probe_dt(priv); > } > > -static int el15203000_remove(struct spi_device *spi) > +static void el15203000_remove(struct spi_device *spi) > { > struct el15203000 *priv = spi_get_drvdata(spi); > > mutex_destroy(&priv->lock); > - > - return 0; > } > > static const struct of_device_id el15203000_dt_ids[] = { > diff --git a/drivers/leds/leds-spi-byte.c b/drivers/leds/leds-spi-byte.c > index f1964c96fb15..2bc5c99daf51 100644 > --- a/drivers/leds/leds-spi-byte.c > +++ b/drivers/leds/leds-spi-byte.c > @@ -130,13 +130,11 @@ static int spi_byte_probe(struct spi_device *spi) > return 0; > } > > -static int spi_byte_remove(struct spi_device *spi) > +static void spi_byte_remove(struct spi_device *spi) > { > struct spi_byte_led *led = spi_get_drvdata(spi); > > mutex_destroy(&led->mutex); > - > - return 0; > } > > static struct spi_driver spi_byte_driver = { > diff --git a/drivers/media/spi/cxd2880-spi.c b/drivers/media/spi/cxd2880-spi.c > index 6f2a66bc87fb..6be4e5528879 100644 > --- a/drivers/media/spi/cxd2880-spi.c > +++ b/drivers/media/spi/cxd2880-spi.c > @@ -625,7 +625,7 @@ cxd2880_spi_probe(struct spi_device *spi) > return ret; > } > > -static int > +static void > cxd2880_spi_remove(struct spi_device *spi) > { > struct cxd2880_dvb_spi *dvb_spi = spi_get_drvdata(spi); > @@ -643,8 +643,6 @@ cxd2880_spi_remove(struct spi_device *spi) > > kfree(dvb_spi); > pr_info("cxd2880_spi remove ok.\n"); > - > - return 0; > } > > static const struct spi_device_id cxd2880_spi_id[] = { > diff --git a/drivers/media/spi/gs1662.c b/drivers/media/spi/gs1662.c > index f86ef1ca1288..75c21a93e6d0 100644 > --- a/drivers/media/spi/gs1662.c > +++ b/drivers/media/spi/gs1662.c > @@ -458,13 +458,11 @@ static int gs_probe(struct spi_device *spi) > return ret; > } > > -static int gs_remove(struct spi_device *spi) > +static void gs_remove(struct spi_device *spi) > { > struct v4l2_subdev *sd = spi_get_drvdata(spi); > > v4l2_device_unregister_subdev(sd); > - > - return 0; > } > > static struct spi_driver gs_driver = { > diff --git a/drivers/media/tuners/msi001.c b/drivers/media/tuners/msi001.c > index 44247049a319..ad6c72c1ed04 100644 > --- a/drivers/media/tuners/msi001.c > +++ b/drivers/media/tuners/msi001.c > @@ -472,7 +472,7 @@ static int msi001_probe(struct spi_device *spi) > return ret; > } > > -static int msi001_remove(struct spi_device *spi) > +static void msi001_remove(struct spi_device *spi) > { > struct v4l2_subdev *sd = spi_get_drvdata(spi); > struct msi001_dev *dev = sd_to_msi001_dev(sd); > @@ -486,7 +486,6 @@ static int msi001_remove(struct spi_device *spi) > v4l2_device_unregister_subdev(&dev->sd); > v4l2_ctrl_handler_free(&dev->hdl); > kfree(dev); > - return 0; > } > > static const struct spi_device_id msi001_id_table[] = { > diff --git a/drivers/mfd/arizona-spi.c b/drivers/mfd/arizona-spi.c > index 9fe06dda3782..03620c8efe34 100644 > --- a/drivers/mfd/arizona-spi.c > +++ b/drivers/mfd/arizona-spi.c > @@ -206,13 +206,11 @@ static int arizona_spi_probe(struct spi_device *spi) > return arizona_dev_init(arizona); > } > > -static int arizona_spi_remove(struct spi_device *spi) > +static void arizona_spi_remove(struct spi_device *spi) > { > struct arizona *arizona = spi_get_drvdata(spi); > > arizona_dev_exit(arizona); > - > - return 0; > } > > static const struct spi_device_id arizona_spi_ids[] = { > diff --git a/drivers/mfd/da9052-spi.c b/drivers/mfd/da9052-spi.c > index 5faf3766a5e2..b79a57b45c1e 100644 > --- a/drivers/mfd/da9052-spi.c > +++ b/drivers/mfd/da9052-spi.c > @@ -55,12 +55,11 @@ static int da9052_spi_probe(struct spi_device *spi) > return da9052_device_init(da9052, id->driver_data); > } > > -static int da9052_spi_remove(struct spi_device *spi) > +static void da9052_spi_remove(struct spi_device *spi) > { > struct da9052 *da9052 = spi_get_drvdata(spi); > > da9052_device_exit(da9052); > - return 0; > } > > static const struct spi_device_id da9052_spi_id[] = { > diff --git a/drivers/mfd/ezx-pcap.c b/drivers/mfd/ezx-pcap.c > index 70fa18b04ad2..2280f756f422 100644 > --- a/drivers/mfd/ezx-pcap.c > +++ b/drivers/mfd/ezx-pcap.c > @@ -392,7 +392,7 @@ static int pcap_add_subdev(struct pcap_chip *pcap, > return ret; > } > > -static int ezx_pcap_remove(struct spi_device *spi) > +static void ezx_pcap_remove(struct spi_device *spi) > { > struct pcap_chip *pcap = spi_get_drvdata(spi); > unsigned long flags; > @@ -412,8 +412,6 @@ static int ezx_pcap_remove(struct spi_device *spi) > irq_set_chip_and_handler(i, NULL, NULL); > > destroy_workqueue(pcap->workqueue); > - > - return 0; > } > > static int ezx_pcap_probe(struct spi_device *spi) > diff --git a/drivers/mfd/madera-spi.c b/drivers/mfd/madera-spi.c > index e860f5ff0933..da84eb50e53a 100644 > --- a/drivers/mfd/madera-spi.c > +++ b/drivers/mfd/madera-spi.c > @@ -112,13 +112,11 @@ static int madera_spi_probe(struct spi_device *spi) > return madera_dev_init(madera); > } > > -static int madera_spi_remove(struct spi_device *spi) > +static void madera_spi_remove(struct spi_device *spi) > { > struct madera *madera = spi_get_drvdata(spi); > > madera_dev_exit(madera); > - > - return 0; > } > > static const struct spi_device_id madera_spi_ids[] = { > diff --git a/drivers/mfd/mc13xxx-spi.c b/drivers/mfd/mc13xxx-spi.c > index 4d8913d647e6..f803527e5819 100644 > --- a/drivers/mfd/mc13xxx-spi.c > +++ b/drivers/mfd/mc13xxx-spi.c > @@ -166,10 +166,9 @@ static int mc13xxx_spi_probe(struct spi_device *spi) > return mc13xxx_common_init(&spi->dev); > } > > -static int mc13xxx_spi_remove(struct spi_device *spi) > +static void mc13xxx_spi_remove(struct spi_device *spi) > { > mc13xxx_common_exit(&spi->dev); > - return 0; > } > > static struct spi_driver mc13xxx_spi_driver = { > diff --git a/drivers/mfd/rsmu_spi.c b/drivers/mfd/rsmu_spi.c > index fec2b4ec477c..d2f3d8f1e05a 100644 > --- a/drivers/mfd/rsmu_spi.c > +++ b/drivers/mfd/rsmu_spi.c > @@ -220,13 +220,11 @@ static int rsmu_spi_probe(struct spi_device *client) > return rsmu_core_init(rsmu); > } > > -static int rsmu_spi_remove(struct spi_device *client) > +static void rsmu_spi_remove(struct spi_device *client) > { > struct rsmu_ddata *rsmu = spi_get_drvdata(client); > > rsmu_core_exit(rsmu); > - > - return 0; > } > > static const struct spi_device_id rsmu_spi_id[] = { > diff --git a/drivers/mfd/stmpe-spi.c b/drivers/mfd/stmpe-spi.c > index 6c5915016be5..ad8055a0e286 100644 > --- a/drivers/mfd/stmpe-spi.c > +++ b/drivers/mfd/stmpe-spi.c > @@ -102,13 +102,11 @@ stmpe_spi_probe(struct spi_device *spi) > return stmpe_probe(&spi_ci, id->driver_data); > } > > -static int stmpe_spi_remove(struct spi_device *spi) > +static void stmpe_spi_remove(struct spi_device *spi) > { > struct stmpe *stmpe = spi_get_drvdata(spi); > > stmpe_remove(stmpe); > - > - return 0; > } > > static const struct of_device_id stmpe_spi_of_match[] = { > diff --git a/drivers/mfd/tps65912-spi.c b/drivers/mfd/tps65912-spi.c > index d701926aa46e..bba38fbc781d 100644 > --- a/drivers/mfd/tps65912-spi.c > +++ b/drivers/mfd/tps65912-spi.c > @@ -50,13 +50,11 @@ static int tps65912_spi_probe(struct spi_device *spi) > return tps65912_device_init(tps); > } > > -static int tps65912_spi_remove(struct spi_device *spi) > +static void tps65912_spi_remove(struct spi_device *spi) > { > struct tps65912 *tps = spi_get_drvdata(spi); > > tps65912_device_exit(tps); > - > - return 0; > } > > static const struct spi_device_id tps65912_spi_id_table[] = { > diff --git a/drivers/misc/ad525x_dpot-spi.c b/drivers/misc/ad525x_dpot-spi.c > index a9e75d80ad36..263055bda48b 100644 > --- a/drivers/misc/ad525x_dpot-spi.c > +++ b/drivers/misc/ad525x_dpot-spi.c > @@ -90,10 +90,9 @@ static int ad_dpot_spi_probe(struct spi_device *spi) > spi_get_device_id(spi)->name); > } > > -static int ad_dpot_spi_remove(struct spi_device *spi) > +static void ad_dpot_spi_remove(struct spi_device *spi) > { > ad_dpot_remove(&spi->dev); > - return 0; > } > > static const struct spi_device_id ad_dpot_spi_id[] = { > diff --git a/drivers/misc/eeprom/eeprom_93xx46.c b/drivers/misc/eeprom/eeprom_93xx46.c > index 1f15399e5cb4..b630625b3024 100644 > --- a/drivers/misc/eeprom/eeprom_93xx46.c > +++ b/drivers/misc/eeprom/eeprom_93xx46.c > @@ -555,14 +555,12 @@ static int eeprom_93xx46_probe(struct spi_device *spi) > return 0; > } > > -static int eeprom_93xx46_remove(struct spi_device *spi) > +static void eeprom_93xx46_remove(struct spi_device *spi) > { > struct eeprom_93xx46_dev *edev = spi_get_drvdata(spi); > > if (!(edev->pdata->flags & EE_READONLY)) > device_remove_file(&spi->dev, &dev_attr_erase); > - > - return 0; > } > > static struct spi_driver eeprom_93xx46_driver = { > diff --git a/drivers/misc/lattice-ecp3-config.c b/drivers/misc/lattice-ecp3-config.c > index 98828030b5a4..bac4df2e5231 100644 > --- a/drivers/misc/lattice-ecp3-config.c > +++ b/drivers/misc/lattice-ecp3-config.c > @@ -211,13 +211,11 @@ static int lattice_ecp3_probe(struct spi_device *spi) > return 0; > } > > -static int lattice_ecp3_remove(struct spi_device *spi) > +static void lattice_ecp3_remove(struct spi_device *spi) > { > struct fpga_data *data = spi_get_drvdata(spi); > > wait_for_completion(&data->fw_loaded); > - > - return 0; > } > > static const struct spi_device_id lattice_ecp3_id[] = { > diff --git a/drivers/misc/lis3lv02d/lis3lv02d_spi.c b/drivers/misc/lis3lv02d/lis3lv02d_spi.c > index 9e40dfb60742..203a108b8883 100644 > --- a/drivers/misc/lis3lv02d/lis3lv02d_spi.c > +++ b/drivers/misc/lis3lv02d/lis3lv02d_spi.c > @@ -96,15 +96,13 @@ static int lis302dl_spi_probe(struct spi_device *spi) > return lis3lv02d_init_device(&lis3_dev); > } > > -static int lis302dl_spi_remove(struct spi_device *spi) > +static void lis302dl_spi_remove(struct spi_device *spi) > { > struct lis3lv02d *lis3 = spi_get_drvdata(spi); > lis3lv02d_joystick_disable(lis3); > lis3lv02d_poweroff(lis3); > > lis3lv02d_remove_fs(&lis3_dev); > - > - return 0; > } > > #ifdef CONFIG_PM_SLEEP > diff --git a/drivers/mmc/host/mmc_spi.c b/drivers/mmc/host/mmc_spi.c > index a576181e9db0..106dd204b1a7 100644 > --- a/drivers/mmc/host/mmc_spi.c > +++ b/drivers/mmc/host/mmc_spi.c > @@ -1489,7 +1489,7 @@ static int mmc_spi_probe(struct spi_device *spi) > } > > > -static int mmc_spi_remove(struct spi_device *spi) > +static void mmc_spi_remove(struct spi_device *spi) > { > struct mmc_host *mmc = dev_get_drvdata(&spi->dev); > struct mmc_spi_host *host = mmc_priv(mmc); > @@ -1507,7 +1507,6 @@ static int mmc_spi_remove(struct spi_device *spi) > spi->max_speed_hz = mmc->f_max; > mmc_spi_put_pdata(spi); > mmc_free_host(mmc); > - return 0; > } > > static const struct spi_device_id mmc_spi_dev_ids[] = { > diff --git a/drivers/mtd/devices/mchp23k256.c b/drivers/mtd/devices/mchp23k256.c > index a8b31bddf14b..008df9d8898d 100644 > --- a/drivers/mtd/devices/mchp23k256.c > +++ b/drivers/mtd/devices/mchp23k256.c > @@ -209,13 +209,11 @@ static int mchp23k256_probe(struct spi_device *spi) > return 0; > } > > -static int mchp23k256_remove(struct spi_device *spi) > +static void mchp23k256_remove(struct spi_device *spi) > { > struct mchp23k256_flash *flash = spi_get_drvdata(spi); > > WARN_ON(mtd_device_unregister(&flash->mtd)); > - > - return 0; > } > > static const struct of_device_id mchp23k256_of_table[] = { > diff --git a/drivers/mtd/devices/mchp48l640.c b/drivers/mtd/devices/mchp48l640.c > index 231a10790196..a3fd426df74b 100644 > --- a/drivers/mtd/devices/mchp48l640.c > +++ b/drivers/mtd/devices/mchp48l640.c > @@ -341,13 +341,11 @@ static int mchp48l640_probe(struct spi_device *spi) > return 0; > } > > -static int mchp48l640_remove(struct spi_device *spi) > +static void mchp48l640_remove(struct spi_device *spi) > { > struct mchp48l640_flash *flash = spi_get_drvdata(spi); > > WARN_ON(mtd_device_unregister(&flash->mtd)); > - > - return 0; > } > > static const struct of_device_id mchp48l640_of_table[] = { > diff --git a/drivers/mtd/devices/mtd_dataflash.c b/drivers/mtd/devices/mtd_dataflash.c > index 734878abaa23..134e27328597 100644 > --- a/drivers/mtd/devices/mtd_dataflash.c > +++ b/drivers/mtd/devices/mtd_dataflash.c > @@ -916,7 +916,7 @@ static int dataflash_probe(struct spi_device *spi) > return status; > } > > -static int dataflash_remove(struct spi_device *spi) > +static void dataflash_remove(struct spi_device *spi) > { > struct dataflash *flash = spi_get_drvdata(spi); > > @@ -925,8 +925,6 @@ static int dataflash_remove(struct spi_device *spi) > WARN_ON(mtd_device_unregister(&flash->mtd)); > > kfree(flash); > - > - return 0; > } > > static struct spi_driver dataflash_driver = { > diff --git a/drivers/mtd/devices/sst25l.c b/drivers/mtd/devices/sst25l.c > index 7f124c1bfa40..8813994ce9f4 100644 > --- a/drivers/mtd/devices/sst25l.c > +++ b/drivers/mtd/devices/sst25l.c > @@ -398,13 +398,11 @@ static int sst25l_probe(struct spi_device *spi) > return 0; > } > > -static int sst25l_remove(struct spi_device *spi) > +static void sst25l_remove(struct spi_device *spi) > { > struct sst25l_flash *flash = spi_get_drvdata(spi); > > WARN_ON(mtd_device_unregister(&flash->mtd)); > - > - return 0; > } > > static struct spi_driver sst25l_driver = { > diff --git a/drivers/net/can/m_can/tcan4x5x-core.c b/drivers/net/can/m_can/tcan4x5x-core.c > index 04687b15b250..41645a24384c 100644 > --- a/drivers/net/can/m_can/tcan4x5x-core.c > +++ b/drivers/net/can/m_can/tcan4x5x-core.c > @@ -388,7 +388,7 @@ static int tcan4x5x_can_probe(struct spi_device *spi) > return ret; > } > > -static int tcan4x5x_can_remove(struct spi_device *spi) > +static void tcan4x5x_can_remove(struct spi_device *spi) > { > struct tcan4x5x_priv *priv = spi_get_drvdata(spi); > > @@ -397,8 +397,6 @@ static int tcan4x5x_can_remove(struct spi_device *spi) > tcan4x5x_power_enable(priv->power, 0); > > m_can_class_free_dev(priv->cdev.net); > - > - return 0; > } > > static const struct of_device_id tcan4x5x_of_match[] = { > diff --git a/drivers/net/can/spi/hi311x.c b/drivers/net/can/spi/hi311x.c > index cfcc14fe3e42..664b8f14d7b0 100644 > --- a/drivers/net/can/spi/hi311x.c > +++ b/drivers/net/can/spi/hi311x.c > @@ -948,7 +948,7 @@ static int hi3110_can_probe(struct spi_device *spi) > return dev_err_probe(dev, ret, "Probe failed\n"); > } > > -static int hi3110_can_remove(struct spi_device *spi) > +static void hi3110_can_remove(struct spi_device *spi) > { > struct hi3110_priv *priv = spi_get_drvdata(spi); > struct net_device *net = priv->net; > @@ -960,8 +960,6 @@ static int hi3110_can_remove(struct spi_device *spi) > clk_disable_unprepare(priv->clk); > > free_candev(net); > - > - return 0; > } > > static int __maybe_unused hi3110_can_suspend(struct device *dev) > diff --git a/drivers/net/can/spi/mcp251x.c b/drivers/net/can/spi/mcp251x.c > index 025e07cb7439..d23edaf22420 100644 > --- a/drivers/net/can/spi/mcp251x.c > +++ b/drivers/net/can/spi/mcp251x.c > @@ -1427,7 +1427,7 @@ static int mcp251x_can_probe(struct spi_device *spi) > return ret; > } > > -static int mcp251x_can_remove(struct spi_device *spi) > +static void mcp251x_can_remove(struct spi_device *spi) > { > struct mcp251x_priv *priv = spi_get_drvdata(spi); > struct net_device *net = priv->net; > @@ -1442,8 +1442,6 @@ static int mcp251x_can_remove(struct spi_device *spi) > clk_disable_unprepare(priv->clk); > > free_candev(net); > - > - return 0; > } > > static int __maybe_unused mcp251x_can_suspend(struct device *dev) > diff --git a/drivers/net/can/spi/mcp251xfd/mcp251xfd-core.c b/drivers/net/can/spi/mcp251xfd/mcp251xfd-core.c > index b5986df6eca0..65c9b31666a6 100644 > --- a/drivers/net/can/spi/mcp251xfd/mcp251xfd-core.c > +++ b/drivers/net/can/spi/mcp251xfd/mcp251xfd-core.c > @@ -1966,7 +1966,7 @@ static int mcp251xfd_probe(struct spi_device *spi) > return err; > } > > -static int mcp251xfd_remove(struct spi_device *spi) > +static void mcp251xfd_remove(struct spi_device *spi) > { > struct mcp251xfd_priv *priv = spi_get_drvdata(spi); > struct net_device *ndev = priv->ndev; > @@ -1975,8 +1975,6 @@ static int mcp251xfd_remove(struct spi_device *spi) > mcp251xfd_unregister(priv); > spi->max_speed_hz = priv->spi_max_speed_hz_orig; > free_candev(ndev); > - > - return 0; > } > > static int __maybe_unused mcp251xfd_runtime_suspend(struct device *device) > diff --git a/drivers/net/dsa/b53/b53_spi.c b/drivers/net/dsa/b53/b53_spi.c > index 2b88f03e5252..0e54b2a0c211 100644 > --- a/drivers/net/dsa/b53/b53_spi.c > +++ b/drivers/net/dsa/b53/b53_spi.c > @@ -314,7 +314,7 @@ static int b53_spi_probe(struct spi_device *spi) > return 0; > } > > -static int b53_spi_remove(struct spi_device *spi) > +static void b53_spi_remove(struct spi_device *spi) > { > struct b53_device *dev = spi_get_drvdata(spi); > > @@ -322,8 +322,6 @@ static int b53_spi_remove(struct spi_device *spi) > b53_switch_remove(dev); > > spi_set_drvdata(spi, NULL); > - > - return 0; > } > > static void b53_spi_shutdown(struct spi_device *spi) > diff --git a/drivers/net/dsa/microchip/ksz8795_spi.c b/drivers/net/dsa/microchip/ksz8795_spi.c > index 866767b70d65..673589dc88ab 100644 > --- a/drivers/net/dsa/microchip/ksz8795_spi.c > +++ b/drivers/net/dsa/microchip/ksz8795_spi.c > @@ -87,7 +87,7 @@ static int ksz8795_spi_probe(struct spi_device *spi) > return 0; > } > > -static int ksz8795_spi_remove(struct spi_device *spi) > +static void ksz8795_spi_remove(struct spi_device *spi) > { > struct ksz_device *dev = spi_get_drvdata(spi); > > @@ -95,8 +95,6 @@ static int ksz8795_spi_remove(struct spi_device *spi) > ksz_switch_remove(dev); > > spi_set_drvdata(spi, NULL); > - > - return 0; > } > > static void ksz8795_spi_shutdown(struct spi_device *spi) > diff --git a/drivers/net/dsa/microchip/ksz9477_spi.c b/drivers/net/dsa/microchip/ksz9477_spi.c > index e3cb0e6c9f6f..940bb9665f15 100644 > --- a/drivers/net/dsa/microchip/ksz9477_spi.c > +++ b/drivers/net/dsa/microchip/ksz9477_spi.c > @@ -65,7 +65,7 @@ static int ksz9477_spi_probe(struct spi_device *spi) > return 0; > } > > -static int ksz9477_spi_remove(struct spi_device *spi) > +static void ksz9477_spi_remove(struct spi_device *spi) > { > struct ksz_device *dev = spi_get_drvdata(spi); > > @@ -73,8 +73,6 @@ static int ksz9477_spi_remove(struct spi_device *spi) > ksz_switch_remove(dev); > > spi_set_drvdata(spi, NULL); > - > - return 0; > } > > static void ksz9477_spi_shutdown(struct spi_device *spi) > diff --git a/drivers/net/dsa/sja1105/sja1105_main.c b/drivers/net/dsa/sja1105/sja1105_main.c > index b513713be610..c2a47c6693b8 100644 > --- a/drivers/net/dsa/sja1105/sja1105_main.c > +++ b/drivers/net/dsa/sja1105/sja1105_main.c > @@ -3346,18 +3346,16 @@ static int sja1105_probe(struct spi_device *spi) > return dsa_register_switch(priv->ds); > } > > -static int sja1105_remove(struct spi_device *spi) > +static void sja1105_remove(struct spi_device *spi) > { > struct sja1105_private *priv = spi_get_drvdata(spi); > > if (!priv) > - return 0; > + return; > > dsa_unregister_switch(priv->ds); > > spi_set_drvdata(spi, NULL); > - > - return 0; > } > > static void sja1105_shutdown(struct spi_device *spi) > diff --git a/drivers/net/dsa/vitesse-vsc73xx-spi.c b/drivers/net/dsa/vitesse-vsc73xx-spi.c > index 645398901e05..3110895358d8 100644 > --- a/drivers/net/dsa/vitesse-vsc73xx-spi.c > +++ b/drivers/net/dsa/vitesse-vsc73xx-spi.c > @@ -159,18 +159,16 @@ static int vsc73xx_spi_probe(struct spi_device *spi) > return vsc73xx_probe(&vsc_spi->vsc); > } > > -static int vsc73xx_spi_remove(struct spi_device *spi) > +static void vsc73xx_spi_remove(struct spi_device *spi) > { > struct vsc73xx_spi *vsc_spi = spi_get_drvdata(spi); > > if (!vsc_spi) > - return 0; > + return; > > vsc73xx_remove(&vsc_spi->vsc); > > spi_set_drvdata(spi, NULL); > - > - return 0; > } > > static void vsc73xx_spi_shutdown(struct spi_device *spi) > diff --git a/drivers/net/ethernet/asix/ax88796c_main.c b/drivers/net/ethernet/asix/ax88796c_main.c > index e7a9f9863258..bf70481bb1ca 100644 > --- a/drivers/net/ethernet/asix/ax88796c_main.c > +++ b/drivers/net/ethernet/asix/ax88796c_main.c > @@ -1102,7 +1102,7 @@ static int ax88796c_probe(struct spi_device *spi) > return ret; > } > > -static int ax88796c_remove(struct spi_device *spi) > +static void ax88796c_remove(struct spi_device *spi) > { > struct ax88796c_device *ax_local = dev_get_drvdata(&spi->dev); > struct net_device *ndev = ax_local->ndev; > @@ -1112,8 +1112,6 @@ static int ax88796c_remove(struct spi_device *spi) > netif_info(ax_local, probe, ndev, "removing network device %s %s\n", > dev_driver_string(&spi->dev), > dev_name(&spi->dev)); > - > - return 0; > } > > #ifdef CONFIG_OF > diff --git a/drivers/net/ethernet/micrel/ks8851_spi.c b/drivers/net/ethernet/micrel/ks8851_spi.c > index 0303e727e99f..d167d93e4c12 100644 > --- a/drivers/net/ethernet/micrel/ks8851_spi.c > +++ b/drivers/net/ethernet/micrel/ks8851_spi.c > @@ -452,11 +452,9 @@ static int ks8851_probe_spi(struct spi_device *spi) > return ks8851_probe_common(netdev, dev, msg_enable); > } > > -static int ks8851_remove_spi(struct spi_device *spi) > +static void ks8851_remove_spi(struct spi_device *spi) > { > ks8851_remove_common(&spi->dev); > - > - return 0; > } > > static const struct of_device_id ks8851_match_table[] = { > diff --git a/drivers/net/ethernet/microchip/enc28j60.c b/drivers/net/ethernet/microchip/enc28j60.c > index 634ac7649c43..db5a3edb4c3c 100644 > --- a/drivers/net/ethernet/microchip/enc28j60.c > +++ b/drivers/net/ethernet/microchip/enc28j60.c > @@ -1612,15 +1612,13 @@ static int enc28j60_probe(struct spi_device *spi) > return ret; > } > > -static int enc28j60_remove(struct spi_device *spi) > +static void enc28j60_remove(struct spi_device *spi) > { > struct enc28j60_net *priv = spi_get_drvdata(spi); > > unregister_netdev(priv->netdev); > free_irq(spi->irq, priv); > free_netdev(priv->netdev); > - > - return 0; > } > > static const struct of_device_id enc28j60_dt_ids[] = { > diff --git a/drivers/net/ethernet/microchip/encx24j600.c b/drivers/net/ethernet/microchip/encx24j600.c > index b90efc80fb59..dc1840cb5b10 100644 > --- a/drivers/net/ethernet/microchip/encx24j600.c > +++ b/drivers/net/ethernet/microchip/encx24j600.c > @@ -1093,7 +1093,7 @@ static int encx24j600_spi_probe(struct spi_device *spi) > return ret; > } > > -static int encx24j600_spi_remove(struct spi_device *spi) > +static void encx24j600_spi_remove(struct spi_device *spi) > { > struct encx24j600_priv *priv = dev_get_drvdata(&spi->dev); > > @@ -1101,8 +1101,6 @@ static int encx24j600_spi_remove(struct spi_device *spi) > kthread_stop(priv->kworker_task); > > free_netdev(priv->ndev); > - > - return 0; > } > > static const struct spi_device_id encx24j600_spi_id_table[] = { > diff --git a/drivers/net/ethernet/qualcomm/qca_spi.c b/drivers/net/ethernet/qualcomm/qca_spi.c > index 955cce644392..3c5494afd3c0 100644 > --- a/drivers/net/ethernet/qualcomm/qca_spi.c > +++ b/drivers/net/ethernet/qualcomm/qca_spi.c > @@ -1001,7 +1001,7 @@ qca_spi_probe(struct spi_device *spi) > return 0; > } > > -static int > +static void > qca_spi_remove(struct spi_device *spi) > { > struct net_device *qcaspi_devs = spi_get_drvdata(spi); > @@ -1011,8 +1011,6 @@ qca_spi_remove(struct spi_device *spi) > > unregister_netdev(qcaspi_devs); > free_netdev(qcaspi_devs); > - > - return 0; > } > > static const struct spi_device_id qca_spi_id[] = { > diff --git a/drivers/net/ethernet/vertexcom/mse102x.c b/drivers/net/ethernet/vertexcom/mse102x.c > index 89a31783fbb4..25739b182ac7 100644 > --- a/drivers/net/ethernet/vertexcom/mse102x.c > +++ b/drivers/net/ethernet/vertexcom/mse102x.c > @@ -731,7 +731,7 @@ static int mse102x_probe_spi(struct spi_device *spi) > return 0; > } > > -static int mse102x_remove_spi(struct spi_device *spi) > +static void mse102x_remove_spi(struct spi_device *spi) > { > struct mse102x_net *mse = dev_get_drvdata(&spi->dev); > struct mse102x_net_spi *mses = to_mse102x_spi(mse); > @@ -741,8 +741,6 @@ static int mse102x_remove_spi(struct spi_device *spi) > > mse102x_remove_device_debugfs(mses); > unregister_netdev(mse->ndev); > - > - return 0; > } > > static const struct of_device_id mse102x_match_table[] = { > diff --git a/drivers/net/ethernet/wiznet/w5100-spi.c b/drivers/net/ethernet/wiznet/w5100-spi.c > index 7779a36da3c8..7c52796273a4 100644 > --- a/drivers/net/ethernet/wiznet/w5100-spi.c > +++ b/drivers/net/ethernet/wiznet/w5100-spi.c > @@ -461,11 +461,9 @@ static int w5100_spi_probe(struct spi_device *spi) > return w5100_probe(&spi->dev, ops, priv_size, mac, spi->irq, -EINVAL); > } > > -static int w5100_spi_remove(struct spi_device *spi) > +static void w5100_spi_remove(struct spi_device *spi) > { > w5100_remove(&spi->dev); > - > - return 0; > } > > static const struct spi_device_id w5100_spi_ids[] = { > diff --git a/drivers/net/ieee802154/adf7242.c b/drivers/net/ieee802154/adf7242.c > index 7db9cbd0f5de..6afdf1622944 100644 > --- a/drivers/net/ieee802154/adf7242.c > +++ b/drivers/net/ieee802154/adf7242.c > @@ -1304,7 +1304,7 @@ static int adf7242_probe(struct spi_device *spi) > return ret; > } > > -static int adf7242_remove(struct spi_device *spi) > +static void adf7242_remove(struct spi_device *spi) > { > struct adf7242_local *lp = spi_get_drvdata(spi); > > @@ -1316,8 +1316,6 @@ static int adf7242_remove(struct spi_device *spi) > ieee802154_unregister_hw(lp->hw); > mutex_destroy(&lp->bmux); > ieee802154_free_hw(lp->hw); > - > - return 0; > } > > static const struct of_device_id adf7242_of_match[] = { > diff --git a/drivers/net/ieee802154/at86rf230.c b/drivers/net/ieee802154/at86rf230.c > index 7d67f41387f5..a4734323dc29 100644 > --- a/drivers/net/ieee802154/at86rf230.c > +++ b/drivers/net/ieee802154/at86rf230.c > @@ -1759,7 +1759,7 @@ static int at86rf230_probe(struct spi_device *spi) > return rc; > } > > -static int at86rf230_remove(struct spi_device *spi) > +static void at86rf230_remove(struct spi_device *spi) > { > struct at86rf230_local *lp = spi_get_drvdata(spi); > > @@ -1769,8 +1769,6 @@ static int at86rf230_remove(struct spi_device *spi) > ieee802154_free_hw(lp->hw); > at86rf230_debugfs_remove(); > dev_dbg(&spi->dev, "unregistered at86rf230\n"); > - > - return 0; > } > > static const struct of_device_id at86rf230_of_match[] = { > diff --git a/drivers/net/ieee802154/ca8210.c b/drivers/net/ieee802154/ca8210.c > index ece6ff6049f6..b499bbe4d48f 100644 > --- a/drivers/net/ieee802154/ca8210.c > +++ b/drivers/net/ieee802154/ca8210.c > @@ -831,7 +831,7 @@ static void ca8210_rx_done(struct cas_control *cas_ctl) > finish:; > } > > -static int ca8210_remove(struct spi_device *spi_device); > +static void ca8210_remove(struct spi_device *spi_device); > > /** > * ca8210_spi_transfer_complete() - Called when a single spi transfer has > @@ -3048,7 +3048,7 @@ static void ca8210_test_interface_clear(struct ca8210_priv *priv) > * > * Return: 0 or linux error code > */ > -static int ca8210_remove(struct spi_device *spi_device) > +static void ca8210_remove(struct spi_device *spi_device) > { > struct ca8210_priv *priv; > struct ca8210_platform_data *pdata; > @@ -3088,8 +3088,6 @@ static int ca8210_remove(struct spi_device *spi_device) > if (IS_ENABLED(CONFIG_IEEE802154_CA8210_DEBUGFS)) > ca8210_test_interface_clear(priv); > } > - > - return 0; > } > > /** > diff --git a/drivers/net/ieee802154/cc2520.c b/drivers/net/ieee802154/cc2520.c > index 89c046b204e0..1e1f40f628a0 100644 > --- a/drivers/net/ieee802154/cc2520.c > +++ b/drivers/net/ieee802154/cc2520.c > @@ -1213,7 +1213,7 @@ static int cc2520_probe(struct spi_device *spi) > return ret; > } > > -static int cc2520_remove(struct spi_device *spi) > +static void cc2520_remove(struct spi_device *spi) > { > struct cc2520_private *priv = spi_get_drvdata(spi); > > @@ -1222,8 +1222,6 @@ static int cc2520_remove(struct spi_device *spi) > > ieee802154_unregister_hw(priv->hw); > ieee802154_free_hw(priv->hw); > - > - return 0; > } > > static const struct spi_device_id cc2520_ids[] = { > diff --git a/drivers/net/ieee802154/mcr20a.c b/drivers/net/ieee802154/mcr20a.c > index 8dc04e2590b1..a3af52a8e6dd 100644 > --- a/drivers/net/ieee802154/mcr20a.c > +++ b/drivers/net/ieee802154/mcr20a.c > @@ -1335,7 +1335,7 @@ mcr20a_probe(struct spi_device *spi) > return ret; > } > > -static int mcr20a_remove(struct spi_device *spi) > +static void mcr20a_remove(struct spi_device *spi) > { > struct mcr20a_local *lp = spi_get_drvdata(spi); > > @@ -1343,8 +1343,6 @@ static int mcr20a_remove(struct spi_device *spi) > > ieee802154_unregister_hw(lp->hw); > ieee802154_free_hw(lp->hw); > - > - return 0; > } > > static const struct of_device_id mcr20a_of_match[] = { > diff --git a/drivers/net/ieee802154/mrf24j40.c b/drivers/net/ieee802154/mrf24j40.c > index ff83e00b77af..ee4cfbf2c5cc 100644 > --- a/drivers/net/ieee802154/mrf24j40.c > +++ b/drivers/net/ieee802154/mrf24j40.c > @@ -1356,7 +1356,7 @@ static int mrf24j40_probe(struct spi_device *spi) > return ret; > } > > -static int mrf24j40_remove(struct spi_device *spi) > +static void mrf24j40_remove(struct spi_device *spi) > { > struct mrf24j40 *devrec = spi_get_drvdata(spi); > > @@ -1366,8 +1366,6 @@ static int mrf24j40_remove(struct spi_device *spi) > ieee802154_free_hw(devrec->hw); > /* TODO: Will ieee802154_free_device() wait until ->xmit() is > * complete? */ > - > - return 0; > } > > static const struct of_device_id mrf24j40_of_match[] = { > diff --git a/drivers/net/phy/spi_ks8995.c b/drivers/net/phy/spi_ks8995.c > index 8b5445a724ce..ff37f8ba6758 100644 > --- a/drivers/net/phy/spi_ks8995.c > +++ b/drivers/net/phy/spi_ks8995.c > @@ -517,7 +517,7 @@ static int ks8995_probe(struct spi_device *spi) > return 0; > } > > -static int ks8995_remove(struct spi_device *spi) > +static void ks8995_remove(struct spi_device *spi) > { > struct ks8995_switch *ks = spi_get_drvdata(spi); > > @@ -526,8 +526,6 @@ static int ks8995_remove(struct spi_device *spi) > /* assert reset */ > if (ks->pdata && gpio_is_valid(ks->pdata->reset_gpio)) > gpiod_set_value(gpio_to_desc(ks->pdata->reset_gpio), 1); > - > - return 0; > } > > /* ------------------------------------------------------------------------ */ > diff --git a/drivers/net/wan/slic_ds26522.c b/drivers/net/wan/slic_ds26522.c > index 8e3b1c717c10..6063552cea9b 100644 > --- a/drivers/net/wan/slic_ds26522.c > +++ b/drivers/net/wan/slic_ds26522.c > @@ -194,10 +194,9 @@ static int slic_ds26522_init_configure(struct spi_device *spi) > return 0; > } > > -static int slic_ds26522_remove(struct spi_device *spi) > +static void slic_ds26522_remove(struct spi_device *spi) > { > pr_info("DS26522 module uninstalled\n"); > - return 0; > } > > static int slic_ds26522_probe(struct spi_device *spi) > diff --git a/drivers/net/wireless/intersil/p54/p54spi.c b/drivers/net/wireless/intersil/p54/p54spi.c > index ab0fe8565851..f99b7ba69fc3 100644 > --- a/drivers/net/wireless/intersil/p54/p54spi.c > +++ b/drivers/net/wireless/intersil/p54/p54spi.c > @@ -669,7 +669,7 @@ static int p54spi_probe(struct spi_device *spi) > return ret; > } > > -static int p54spi_remove(struct spi_device *spi) > +static void p54spi_remove(struct spi_device *spi) > { > struct p54s_priv *priv = spi_get_drvdata(spi); > > @@ -684,8 +684,6 @@ static int p54spi_remove(struct spi_device *spi) > mutex_destroy(&priv->mutex); > > p54_free_common(priv->hw); > - > - return 0; > } > > > diff --git a/drivers/net/wireless/marvell/libertas/if_spi.c b/drivers/net/wireless/marvell/libertas/if_spi.c > index cd9f8ecf171f..ff1c7ec8c450 100644 > --- a/drivers/net/wireless/marvell/libertas/if_spi.c > +++ b/drivers/net/wireless/marvell/libertas/if_spi.c > @@ -1195,7 +1195,7 @@ static int if_spi_probe(struct spi_device *spi) > return err; > } > > -static int libertas_spi_remove(struct spi_device *spi) > +static void libertas_spi_remove(struct spi_device *spi) > { > struct if_spi_card *card = spi_get_drvdata(spi); > struct lbs_private *priv = card->priv; > @@ -1212,8 +1212,6 @@ static int libertas_spi_remove(struct spi_device *spi) > if (card->pdata->teardown) > card->pdata->teardown(spi); > free_if_spi_card(card); > - > - return 0; > } > > static int if_spi_suspend(struct device *dev) > diff --git a/drivers/net/wireless/microchip/wilc1000/spi.c b/drivers/net/wireless/microchip/wilc1000/spi.c > index 2c2ed4b09efd..d2db52289399 100644 > --- a/drivers/net/wireless/microchip/wilc1000/spi.c > +++ b/drivers/net/wireless/microchip/wilc1000/spi.c > @@ -240,7 +240,7 @@ static int wilc_bus_probe(struct spi_device *spi) > return ret; > } > > -static int wilc_bus_remove(struct spi_device *spi) > +static void wilc_bus_remove(struct spi_device *spi) > { > struct wilc *wilc = spi_get_drvdata(spi); > struct wilc_spi *spi_priv = wilc->bus_data; > @@ -248,8 +248,6 @@ static int wilc_bus_remove(struct spi_device *spi) > clk_disable_unprepare(wilc->rtc_clk); > wilc_netdev_cleanup(wilc); > kfree(spi_priv); > - > - return 0; > } > > static const struct of_device_id wilc_of_match[] = { > diff --git a/drivers/net/wireless/st/cw1200/cw1200_spi.c b/drivers/net/wireless/st/cw1200/cw1200_spi.c > index 271ed2ce2d7f..fe0d220da44d 100644 > --- a/drivers/net/wireless/st/cw1200/cw1200_spi.c > +++ b/drivers/net/wireless/st/cw1200/cw1200_spi.c > @@ -423,7 +423,7 @@ static int cw1200_spi_probe(struct spi_device *func) > } > > /* Disconnect Function to be called by SPI stack when device is disconnected */ > -static int cw1200_spi_disconnect(struct spi_device *func) > +static void cw1200_spi_disconnect(struct spi_device *func) > { > struct hwbus_priv *self = spi_get_drvdata(func); > > @@ -435,8 +435,6 @@ static int cw1200_spi_disconnect(struct spi_device *func) > } > } > cw1200_spi_off(dev_get_platdata(&func->dev)); > - > - return 0; > } > > static int __maybe_unused cw1200_spi_suspend(struct device *dev) > diff --git a/drivers/net/wireless/ti/wl1251/spi.c b/drivers/net/wireless/ti/wl1251/spi.c > index 5b894bd6237e..9df38726e8b0 100644 > --- a/drivers/net/wireless/ti/wl1251/spi.c > +++ b/drivers/net/wireless/ti/wl1251/spi.c > @@ -327,14 +327,12 @@ static int wl1251_spi_probe(struct spi_device *spi) > return ret; > } > > -static int wl1251_spi_remove(struct spi_device *spi) > +static void wl1251_spi_remove(struct spi_device *spi) > { > struct wl1251 *wl = spi_get_drvdata(spi); > > wl1251_free_hw(wl); > regulator_disable(wl->vio); > - > - return 0; > } > > static struct spi_driver wl1251_spi_driver = { > diff --git a/drivers/net/wireless/ti/wlcore/spi.c b/drivers/net/wireless/ti/wlcore/spi.c > index 354a7e1c3315..7eae1ec2eb2b 100644 > --- a/drivers/net/wireless/ti/wlcore/spi.c > +++ b/drivers/net/wireless/ti/wlcore/spi.c > @@ -546,13 +546,11 @@ static int wl1271_probe(struct spi_device *spi) > return ret; > } > > -static int wl1271_remove(struct spi_device *spi) > +static void wl1271_remove(struct spi_device *spi) > { > struct wl12xx_spi_glue *glue = spi_get_drvdata(spi); > > platform_device_unregister(glue->core); > - > - return 0; > } > > static struct spi_driver wl1271_spi_driver = { > diff --git a/drivers/nfc/nfcmrvl/spi.c b/drivers/nfc/nfcmrvl/spi.c > index 5b833a9a83f8..a38e2fcdfd39 100644 > --- a/drivers/nfc/nfcmrvl/spi.c > +++ b/drivers/nfc/nfcmrvl/spi.c > @@ -174,12 +174,11 @@ static int nfcmrvl_spi_probe(struct spi_device *spi) > return 0; > } > > -static int nfcmrvl_spi_remove(struct spi_device *spi) > +static void nfcmrvl_spi_remove(struct spi_device *spi) > { > struct nfcmrvl_spi_drv_data *drv_data = spi_get_drvdata(spi); > > nfcmrvl_nci_unregister_dev(drv_data->priv); > - return 0; > } > > static const struct of_device_id of_nfcmrvl_spi_match[] __maybe_unused = { > diff --git a/drivers/nfc/st-nci/spi.c b/drivers/nfc/st-nci/spi.c > index 4e723992e74c..169eacc0a32a 100644 > --- a/drivers/nfc/st-nci/spi.c > +++ b/drivers/nfc/st-nci/spi.c > @@ -263,13 +263,11 @@ static int st_nci_spi_probe(struct spi_device *dev) > return r; > } > > -static int st_nci_spi_remove(struct spi_device *dev) > +static void st_nci_spi_remove(struct spi_device *dev) > { > struct st_nci_spi_phy *phy = spi_get_drvdata(dev); > > ndlc_remove(phy->ndlc); > - > - return 0; > } > > static struct spi_device_id st_nci_spi_id_table[] = { > diff --git a/drivers/nfc/st95hf/core.c b/drivers/nfc/st95hf/core.c > index b23f47936473..ed704bb77226 100644 > --- a/drivers/nfc/st95hf/core.c > +++ b/drivers/nfc/st95hf/core.c > @@ -1198,7 +1198,7 @@ static int st95hf_probe(struct spi_device *nfc_spi_dev) > return ret; > } > > -static int st95hf_remove(struct spi_device *nfc_spi_dev) > +static void st95hf_remove(struct spi_device *nfc_spi_dev) > { > int result = 0; > unsigned char reset_cmd = ST95HF_COMMAND_RESET; > @@ -1236,8 +1236,6 @@ static int st95hf_remove(struct spi_device *nfc_spi_dev) > /* disable regulator */ > if (stcontext->st95hf_supply) > regulator_disable(stcontext->st95hf_supply); > - > - return 0; > } > > /* Register as SPI protocol driver */ > diff --git a/drivers/nfc/trf7970a.c b/drivers/nfc/trf7970a.c > index 29ca9c328df2..21d68664fe08 100644 > --- a/drivers/nfc/trf7970a.c > +++ b/drivers/nfc/trf7970a.c > @@ -2144,7 +2144,7 @@ static int trf7970a_probe(struct spi_device *spi) > return ret; > } > > -static int trf7970a_remove(struct spi_device *spi) > +static void trf7970a_remove(struct spi_device *spi) > { > struct trf7970a *trf = spi_get_drvdata(spi); > > @@ -2160,8 +2160,6 @@ static int trf7970a_remove(struct spi_device *spi) > regulator_disable(trf->regulator); > > mutex_destroy(&trf->lock); > - > - return 0; > } > > #ifdef CONFIG_PM_SLEEP > diff --git a/drivers/platform/chrome/cros_ec_spi.c b/drivers/platform/chrome/cros_ec_spi.c > index 713c58687721..8493af0f680e 100644 > --- a/drivers/platform/chrome/cros_ec_spi.c > +++ b/drivers/platform/chrome/cros_ec_spi.c > @@ -786,13 +786,11 @@ static int cros_ec_spi_probe(struct spi_device *spi) > return 0; > } > > -static int cros_ec_spi_remove(struct spi_device *spi) > +static void cros_ec_spi_remove(struct spi_device *spi) > { > struct cros_ec_device *ec_dev = spi_get_drvdata(spi); > > cros_ec_unregister(ec_dev); > - > - return 0; > } > > #ifdef CONFIG_PM_SLEEP > diff --git a/drivers/platform/olpc/olpc-xo175-ec.c b/drivers/platform/olpc/olpc-xo175-ec.c > index 0d46706afd2d..4823bd2819f6 100644 > --- a/drivers/platform/olpc/olpc-xo175-ec.c > +++ b/drivers/platform/olpc/olpc-xo175-ec.c > @@ -648,7 +648,7 @@ static struct olpc_ec_driver olpc_xo175_ec_driver = { > .ec_cmd = olpc_xo175_ec_cmd, > }; > > -static int olpc_xo175_ec_remove(struct spi_device *spi) > +static void olpc_xo175_ec_remove(struct spi_device *spi) > { > if (pm_power_off == olpc_xo175_ec_power_off) > pm_power_off = NULL; > @@ -657,8 +657,6 @@ static int olpc_xo175_ec_remove(struct spi_device *spi) > > platform_device_unregister(olpc_ec); > olpc_ec = NULL; > - > - return 0; > } > > static int olpc_xo175_ec_probe(struct spi_device *spi) > diff --git a/drivers/rtc/rtc-ds1302.c b/drivers/rtc/rtc-ds1302.c > index 2f83adef966e..6d66ab5a8b17 100644 > --- a/drivers/rtc/rtc-ds1302.c > +++ b/drivers/rtc/rtc-ds1302.c > @@ -185,10 +185,9 @@ static int ds1302_probe(struct spi_device *spi) > return 0; > } > > -static int ds1302_remove(struct spi_device *spi) > +static void ds1302_remove(struct spi_device *spi) > { > spi_set_drvdata(spi, NULL); > - return 0; > } > > #ifdef CONFIG_OF > diff --git a/drivers/rtc/rtc-ds1305.c b/drivers/rtc/rtc-ds1305.c > index 9ef107b99b65..ed9360486953 100644 > --- a/drivers/rtc/rtc-ds1305.c > +++ b/drivers/rtc/rtc-ds1305.c > @@ -720,7 +720,7 @@ static int ds1305_probe(struct spi_device *spi) > return 0; > } > > -static int ds1305_remove(struct spi_device *spi) > +static void ds1305_remove(struct spi_device *spi) > { > struct ds1305 *ds1305 = spi_get_drvdata(spi); > > @@ -730,8 +730,6 @@ static int ds1305_remove(struct spi_device *spi) > devm_free_irq(&spi->dev, spi->irq, ds1305); > cancel_work_sync(&ds1305->work); > } > - > - return 0; > } > > static struct spi_driver ds1305_driver = { > diff --git a/drivers/rtc/rtc-ds1343.c b/drivers/rtc/rtc-ds1343.c > index f14ed6c96437..ed5a6ba89a3e 100644 > --- a/drivers/rtc/rtc-ds1343.c > +++ b/drivers/rtc/rtc-ds1343.c > @@ -434,11 +434,9 @@ static int ds1343_probe(struct spi_device *spi) > return 0; > } > > -static int ds1343_remove(struct spi_device *spi) > +static void ds1343_remove(struct spi_device *spi) > { > dev_pm_clear_wake_irq(&spi->dev); > - > - return 0; > } > > #ifdef CONFIG_PM_SLEEP > diff --git a/drivers/spi/spi-mem.c b/drivers/spi/spi-mem.c > index 37f4443ce9a0..e9d83d65873b 100644 > --- a/drivers/spi/spi-mem.c > +++ b/drivers/spi/spi-mem.c > @@ -854,15 +854,13 @@ static int spi_mem_probe(struct spi_device *spi) > return memdrv->probe(mem); > } > > -static int spi_mem_remove(struct spi_device *spi) > +static void spi_mem_remove(struct spi_device *spi) > { > struct spi_mem_driver *memdrv = to_spi_mem_drv(spi->dev.driver); > struct spi_mem *mem = spi_get_drvdata(spi); > > if (memdrv->remove) > - return memdrv->remove(mem); > - > - return 0; > + memdrv->remove(mem); > } > > static void spi_mem_shutdown(struct spi_device *spi) > diff --git a/drivers/spi/spi-slave-system-control.c b/drivers/spi/spi-slave-system-control.c > index 169f3d595f60..d37cfe995a63 100644 > --- a/drivers/spi/spi-slave-system-control.c > +++ b/drivers/spi/spi-slave-system-control.c > @@ -132,13 +132,12 @@ static int spi_slave_system_control_probe(struct spi_device *spi) > return 0; > } > > -static int spi_slave_system_control_remove(struct spi_device *spi) > +static void spi_slave_system_control_remove(struct spi_device *spi) > { > struct spi_slave_system_control_priv *priv = spi_get_drvdata(spi); > > spi_slave_abort(spi); > wait_for_completion(&priv->finished); > - return 0; > } > > static struct spi_driver spi_slave_system_control_driver = { > diff --git a/drivers/spi/spi-slave-time.c b/drivers/spi/spi-slave-time.c > index f2e07a392d68..f56c1afb8534 100644 > --- a/drivers/spi/spi-slave-time.c > +++ b/drivers/spi/spi-slave-time.c > @@ -106,13 +106,12 @@ static int spi_slave_time_probe(struct spi_device *spi) > return 0; > } > > -static int spi_slave_time_remove(struct spi_device *spi) > +static void spi_slave_time_remove(struct spi_device *spi) > { > struct spi_slave_time_priv *priv = spi_get_drvdata(spi); > > spi_slave_abort(spi); > wait_for_completion(&priv->finished); > - return 0; > } > > static struct spi_driver spi_slave_time_driver = { > diff --git a/drivers/spi/spi-tle62x0.c b/drivers/spi/spi-tle62x0.c > index f8ad0709d015..a565352f6381 100644 > --- a/drivers/spi/spi-tle62x0.c > +++ b/drivers/spi/spi-tle62x0.c > @@ -288,7 +288,7 @@ static int tle62x0_probe(struct spi_device *spi) > return ret; > } > > -static int tle62x0_remove(struct spi_device *spi) > +static void tle62x0_remove(struct spi_device *spi) > { > struct tle62x0_state *st = spi_get_drvdata(spi); > int ptr; > @@ -298,7 +298,6 @@ static int tle62x0_remove(struct spi_device *spi) > > device_remove_file(&spi->dev, &dev_attr_status_show); > kfree(st); > - return 0; > } > > static struct spi_driver tle62x0_driver = { > diff --git a/drivers/spi/spi.c b/drivers/spi/spi.c > index 4599b121d744..ead9a132dcb9 100644 > --- a/drivers/spi/spi.c > +++ b/drivers/spi/spi.c > @@ -404,15 +404,8 @@ static void spi_remove(struct device *dev) > { > const struct spi_driver *sdrv = to_spi_driver(dev->driver); > > - if (sdrv->remove) { > - int ret; > - > - ret = sdrv->remove(to_spi_device(dev)); > - if (ret) > - dev_warn(dev, > - "Failed to unbind driver (%pe), ignoring\n", > - ERR_PTR(ret)); > - } > + if (sdrv->remove) > + sdrv->remove(to_spi_device(dev)); > > dev_pm_domain_detach(dev, true); > } > diff --git a/drivers/spi/spidev.c b/drivers/spi/spidev.c > index a5cceca8b82b..9468f74308bd 100644 > --- a/drivers/spi/spidev.c > +++ b/drivers/spi/spidev.c > @@ -803,7 +803,7 @@ static int spidev_probe(struct spi_device *spi) > return status; > } > > -static int spidev_remove(struct spi_device *spi) > +static void spidev_remove(struct spi_device *spi) > { > struct spidev_data *spidev = spi_get_drvdata(spi); > > @@ -820,8 +820,6 @@ static int spidev_remove(struct spi_device *spi) > if (spidev->users == 0) > kfree(spidev); > mutex_unlock(&device_list_lock); > - > - return 0; > } > > static struct spi_driver spidev_spi_driver = { > diff --git a/drivers/staging/fbtft/fbtft.h b/drivers/staging/fbtft/fbtft.h > index 6a7545b5bcd2..b68f5f9b7c78 100644 > --- a/drivers/staging/fbtft/fbtft.h > +++ b/drivers/staging/fbtft/fbtft.h > @@ -286,12 +286,11 @@ static int fbtft_driver_probe_spi(struct spi_device *spi) \ > return fbtft_probe_common(_display, spi, NULL); \ > } \ > \ > -static int fbtft_driver_remove_spi(struct spi_device *spi) \ > +static void fbtft_driver_remove_spi(struct spi_device *spi) \ > { \ > struct fb_info *info = spi_get_drvdata(spi); \ > \ > fbtft_remove_common(&spi->dev, info); \ > - return 0; \ > } \ > \ > static struct spi_driver fbtft_driver_spi_driver = { \ > diff --git a/drivers/staging/pi433/pi433_if.c b/drivers/staging/pi433/pi433_if.c > index 68c09fa016ed..1d31c35875e3 100644 > --- a/drivers/staging/pi433/pi433_if.c > +++ b/drivers/staging/pi433/pi433_if.c > @@ -1264,7 +1264,7 @@ static int pi433_probe(struct spi_device *spi) > return retval; > } > > -static int pi433_remove(struct spi_device *spi) > +static void pi433_remove(struct spi_device *spi) > { > struct pi433_device *device = spi_get_drvdata(spi); > > @@ -1284,8 +1284,6 @@ static int pi433_remove(struct spi_device *spi) > > kfree(device->rx_buffer); > kfree(device); > - > - return 0; > } > > static const struct of_device_id pi433_dt_ids[] = { > diff --git a/drivers/staging/wfx/bus_spi.c b/drivers/staging/wfx/bus_spi.c > index 55ffcd7c42e2..fa0ff66a457d 100644 > --- a/drivers/staging/wfx/bus_spi.c > +++ b/drivers/staging/wfx/bus_spi.c > @@ -232,12 +232,11 @@ static int wfx_spi_probe(struct spi_device *func) > return wfx_probe(bus->core); > } > > -static int wfx_spi_remove(struct spi_device *func) > +static void wfx_spi_remove(struct spi_device *func) > { > struct wfx_spi_priv *bus = spi_get_drvdata(func); > > wfx_release(bus->core); > - return 0; > } > > /* For dynamic driver binding, kernel does not use OF to match driver. It only > diff --git a/drivers/tty/serial/max3100.c b/drivers/tty/serial/max3100.c > index 3c92d4e01488..516cff362434 100644 > --- a/drivers/tty/serial/max3100.c > +++ b/drivers/tty/serial/max3100.c > @@ -805,7 +805,7 @@ static int max3100_probe(struct spi_device *spi) > return 0; > } > > -static int max3100_remove(struct spi_device *spi) > +static void max3100_remove(struct spi_device *spi) > { > struct max3100_port *s = spi_get_drvdata(spi); > int i; > @@ -828,13 +828,12 @@ static int max3100_remove(struct spi_device *spi) > for (i = 0; i < MAX_MAX3100; i++) > if (max3100s[i]) { > mutex_unlock(&max3100s_lock); > - return 0; > + return; > } > pr_debug("removing max3100 driver\n"); > uart_unregister_driver(&max3100_uart_driver); > > mutex_unlock(&max3100s_lock); > - return 0; > } > > #ifdef CONFIG_PM_SLEEP > diff --git a/drivers/tty/serial/max310x.c b/drivers/tty/serial/max310x.c > index dde0824b2fa5..3112b4a05448 100644 > --- a/drivers/tty/serial/max310x.c > +++ b/drivers/tty/serial/max310x.c > @@ -1487,10 +1487,9 @@ static int max310x_spi_probe(struct spi_device *spi) > return max310x_probe(&spi->dev, devtype, regmap, spi->irq); > } > > -static int max310x_spi_remove(struct spi_device *spi) > +static void max310x_spi_remove(struct spi_device *spi) > { > max310x_remove(&spi->dev); > - return 0; > } > > static const struct spi_device_id max310x_id_table[] = { > diff --git a/drivers/tty/serial/sc16is7xx.c b/drivers/tty/serial/sc16is7xx.c > index 64e7e6c8145f..25d67b8c4db7 100644 > --- a/drivers/tty/serial/sc16is7xx.c > +++ b/drivers/tty/serial/sc16is7xx.c > @@ -1440,11 +1440,9 @@ static int sc16is7xx_spi_probe(struct spi_device *spi) > return sc16is7xx_probe(&spi->dev, devtype, regmap, spi->irq); > } > > -static int sc16is7xx_spi_remove(struct spi_device *spi) > +static void sc16is7xx_spi_remove(struct spi_device *spi) > { > sc16is7xx_remove(&spi->dev); > - > - return 0; > } > > static const struct spi_device_id sc16is7xx_spi_id_table[] = { > diff --git a/drivers/usb/gadget/udc/max3420_udc.c b/drivers/usb/gadget/udc/max3420_udc.c > index d2a2b20cc1ad..7d9bd16190c0 100644 > --- a/drivers/usb/gadget/udc/max3420_udc.c > +++ b/drivers/usb/gadget/udc/max3420_udc.c > @@ -1292,7 +1292,7 @@ static int max3420_probe(struct spi_device *spi) > return err; > } > > -static int max3420_remove(struct spi_device *spi) > +static void max3420_remove(struct spi_device *spi) > { > struct max3420_udc *udc = spi_get_drvdata(spi); > unsigned long flags; > @@ -1304,8 +1304,6 @@ static int max3420_remove(struct spi_device *spi) > kthread_stop(udc->thread_task); > > spin_unlock_irqrestore(&udc->lock, flags); > - > - return 0; > } > > static const struct of_device_id max3420_udc_of_match[] = { > diff --git a/drivers/usb/host/max3421-hcd.c b/drivers/usb/host/max3421-hcd.c > index 30de85a707fe..99a5523a79fb 100644 > --- a/drivers/usb/host/max3421-hcd.c > +++ b/drivers/usb/host/max3421-hcd.c > @@ -1926,7 +1926,7 @@ max3421_probe(struct spi_device *spi) > return retval; > } > > -static int > +static void > max3421_remove(struct spi_device *spi) > { > struct max3421_hcd *max3421_hcd; > @@ -1947,7 +1947,6 @@ max3421_remove(struct spi_device *spi) > free_irq(spi->irq, hcd); > > usb_put_hcd(hcd); > - return 0; > } > > static const struct of_device_id max3421_of_match_table[] = { > diff --git a/drivers/video/backlight/ams369fg06.c b/drivers/video/backlight/ams369fg06.c > index 8a4361e95a11..522dd81110b8 100644 > --- a/drivers/video/backlight/ams369fg06.c > +++ b/drivers/video/backlight/ams369fg06.c > @@ -506,12 +506,11 @@ static int ams369fg06_probe(struct spi_device *spi) > return 0; > } > > -static int ams369fg06_remove(struct spi_device *spi) > +static void ams369fg06_remove(struct spi_device *spi) > { > struct ams369fg06 *lcd = spi_get_drvdata(spi); > > ams369fg06_power(lcd, FB_BLANK_POWERDOWN); > - return 0; > } > > #ifdef CONFIG_PM_SLEEP > diff --git a/drivers/video/backlight/corgi_lcd.c b/drivers/video/backlight/corgi_lcd.c > index 33f5d80495e6..0a57033ae31d 100644 > --- a/drivers/video/backlight/corgi_lcd.c > +++ b/drivers/video/backlight/corgi_lcd.c > @@ -542,7 +542,7 @@ static int corgi_lcd_probe(struct spi_device *spi) > return 0; > } > > -static int corgi_lcd_remove(struct spi_device *spi) > +static void corgi_lcd_remove(struct spi_device *spi) > { > struct corgi_lcd *lcd = spi_get_drvdata(spi); > > @@ -550,7 +550,6 @@ static int corgi_lcd_remove(struct spi_device *spi) > lcd->bl_dev->props.brightness = 0; > backlight_update_status(lcd->bl_dev); > corgi_lcd_set_power(lcd->lcd_dev, FB_BLANK_POWERDOWN); > - return 0; > } > > static struct spi_driver corgi_lcd_driver = { > diff --git a/drivers/video/backlight/ili922x.c b/drivers/video/backlight/ili922x.c > index 328aba9cddad..e7b6bd827986 100644 > --- a/drivers/video/backlight/ili922x.c > +++ b/drivers/video/backlight/ili922x.c > @@ -526,10 +526,9 @@ static int ili922x_probe(struct spi_device *spi) > return 0; > } > > -static int ili922x_remove(struct spi_device *spi) > +static void ili922x_remove(struct spi_device *spi) > { > ili922x_poweroff(spi); > - return 0; > } > > static struct spi_driver ili922x_driver = { > diff --git a/drivers/video/backlight/l4f00242t03.c b/drivers/video/backlight/l4f00242t03.c > index 46f97d1c3d21..cc763cf15f53 100644 > --- a/drivers/video/backlight/l4f00242t03.c > +++ b/drivers/video/backlight/l4f00242t03.c > @@ -223,12 +223,11 @@ static int l4f00242t03_probe(struct spi_device *spi) > return 0; > } > > -static int l4f00242t03_remove(struct spi_device *spi) > +static void l4f00242t03_remove(struct spi_device *spi) > { > struct l4f00242t03_priv *priv = spi_get_drvdata(spi); > > l4f00242t03_lcd_power_set(priv->ld, FB_BLANK_POWERDOWN); > - return 0; > } > > static void l4f00242t03_shutdown(struct spi_device *spi) > diff --git a/drivers/video/backlight/lms501kf03.c b/drivers/video/backlight/lms501kf03.c > index f949b66dce1b..5c46df8022bf 100644 > --- a/drivers/video/backlight/lms501kf03.c > +++ b/drivers/video/backlight/lms501kf03.c > @@ -364,12 +364,11 @@ static int lms501kf03_probe(struct spi_device *spi) > return 0; > } > > -static int lms501kf03_remove(struct spi_device *spi) > +static void lms501kf03_remove(struct spi_device *spi) > { > struct lms501kf03 *lcd = spi_get_drvdata(spi); > > lms501kf03_power(lcd, FB_BLANK_POWERDOWN); > - return 0; > } > > #ifdef CONFIG_PM_SLEEP > diff --git a/drivers/video/backlight/ltv350qv.c b/drivers/video/backlight/ltv350qv.c > index 5cbf621e48bd..b6d373af6e3f 100644 > --- a/drivers/video/backlight/ltv350qv.c > +++ b/drivers/video/backlight/ltv350qv.c > @@ -255,12 +255,11 @@ static int ltv350qv_probe(struct spi_device *spi) > return 0; > } > > -static int ltv350qv_remove(struct spi_device *spi) > +static void ltv350qv_remove(struct spi_device *spi) > { > struct ltv350qv *lcd = spi_get_drvdata(spi); > > ltv350qv_power(lcd, FB_BLANK_POWERDOWN); > - return 0; > } > > #ifdef CONFIG_PM_SLEEP > diff --git a/drivers/video/backlight/tdo24m.c b/drivers/video/backlight/tdo24m.c > index 0de044dcafd5..fc6fbaf85594 100644 > --- a/drivers/video/backlight/tdo24m.c > +++ b/drivers/video/backlight/tdo24m.c > @@ -397,12 +397,11 @@ static int tdo24m_probe(struct spi_device *spi) > return 0; > } > > -static int tdo24m_remove(struct spi_device *spi) > +static void tdo24m_remove(struct spi_device *spi) > { > struct tdo24m *lcd = spi_get_drvdata(spi); > > tdo24m_power(lcd, FB_BLANK_POWERDOWN); > - return 0; > } > > #ifdef CONFIG_PM_SLEEP > diff --git a/drivers/video/backlight/tosa_lcd.c b/drivers/video/backlight/tosa_lcd.c > index 38765544345b..23d6c6bf0f54 100644 > --- a/drivers/video/backlight/tosa_lcd.c > +++ b/drivers/video/backlight/tosa_lcd.c > @@ -232,15 +232,13 @@ static int tosa_lcd_probe(struct spi_device *spi) > return ret; > } > > -static int tosa_lcd_remove(struct spi_device *spi) > +static void tosa_lcd_remove(struct spi_device *spi) > { > struct tosa_lcd_data *data = spi_get_drvdata(spi); > > i2c_unregister_device(data->i2c); > > tosa_lcd_tg_off(data); > - > - return 0; > } > > #ifdef CONFIG_PM_SLEEP > diff --git a/drivers/video/backlight/vgg2432a4.c b/drivers/video/backlight/vgg2432a4.c > index 3567b45f9ba9..bfc1913e8b55 100644 > --- a/drivers/video/backlight/vgg2432a4.c > +++ b/drivers/video/backlight/vgg2432a4.c > @@ -233,11 +233,9 @@ static int vgg2432a4_probe(struct spi_device *spi) > return 0; > } > > -static int vgg2432a4_remove(struct spi_device *spi) > +static void vgg2432a4_remove(struct spi_device *spi) > { > ili9320_remove(spi_get_drvdata(spi)); > - > - return 0; > } > > static void vgg2432a4_shutdown(struct spi_device *spi) > diff --git a/drivers/video/fbdev/omap/lcd_mipid.c b/drivers/video/fbdev/omap/lcd_mipid.c > index a75ae0c9b14c..03cff39d392d 100644 > --- a/drivers/video/fbdev/omap/lcd_mipid.c > +++ b/drivers/video/fbdev/omap/lcd_mipid.c > @@ -570,14 +570,12 @@ static int mipid_spi_probe(struct spi_device *spi) > return 0; > } > > -static int mipid_spi_remove(struct spi_device *spi) > +static void mipid_spi_remove(struct spi_device *spi) > { > struct mipid_device *md = dev_get_drvdata(&spi->dev); > > mipid_disable(&md->panel); > kfree(md); > - > - return 0; > } > > static struct spi_driver mipid_spi_driver = { > diff --git a/drivers/video/fbdev/omap2/omapfb/displays/panel-lgphilips-lb035q02.c b/drivers/video/fbdev/omap2/omapfb/displays/panel-lgphilips-lb035q02.c > index 1bec7a4422e8..aab67721263d 100644 > --- a/drivers/video/fbdev/omap2/omapfb/displays/panel-lgphilips-lb035q02.c > +++ b/drivers/video/fbdev/omap2/omapfb/displays/panel-lgphilips-lb035q02.c > @@ -316,7 +316,7 @@ static int lb035q02_panel_spi_probe(struct spi_device *spi) > return r; > } > > -static int lb035q02_panel_spi_remove(struct spi_device *spi) > +static void lb035q02_panel_spi_remove(struct spi_device *spi) > { > struct panel_drv_data *ddata = spi_get_drvdata(spi); > struct omap_dss_device *dssdev = &ddata->dssdev; > @@ -328,8 +328,6 @@ static int lb035q02_panel_spi_remove(struct spi_device *spi) > lb035q02_disconnect(dssdev); > > omap_dss_put_device(in); > - > - return 0; > } > > static const struct of_device_id lb035q02_of_match[] = { > diff --git a/drivers/video/fbdev/omap2/omapfb/displays/panel-nec-nl8048hl11.c b/drivers/video/fbdev/omap2/omapfb/displays/panel-nec-nl8048hl11.c > index dff9ebbadfc0..be9910ff6e62 100644 > --- a/drivers/video/fbdev/omap2/omapfb/displays/panel-nec-nl8048hl11.c > +++ b/drivers/video/fbdev/omap2/omapfb/displays/panel-nec-nl8048hl11.c > @@ -327,7 +327,7 @@ static int nec_8048_probe(struct spi_device *spi) > return r; > } > > -static int nec_8048_remove(struct spi_device *spi) > +static void nec_8048_remove(struct spi_device *spi) > { > struct panel_drv_data *ddata = dev_get_drvdata(&spi->dev); > struct omap_dss_device *dssdev = &ddata->dssdev; > @@ -341,8 +341,6 @@ static int nec_8048_remove(struct spi_device *spi) > nec_8048_disconnect(dssdev); > > omap_dss_put_device(in); > - > - return 0; > } > > #ifdef CONFIG_PM_SLEEP > diff --git a/drivers/video/fbdev/omap2/omapfb/displays/panel-sony-acx565akm.c b/drivers/video/fbdev/omap2/omapfb/displays/panel-sony-acx565akm.c > index 8d8b5ff7d43c..a909b5385ca5 100644 > --- a/drivers/video/fbdev/omap2/omapfb/displays/panel-sony-acx565akm.c > +++ b/drivers/video/fbdev/omap2/omapfb/displays/panel-sony-acx565akm.c > @@ -857,7 +857,7 @@ static int acx565akm_probe(struct spi_device *spi) > return r; > } > > -static int acx565akm_remove(struct spi_device *spi) > +static void acx565akm_remove(struct spi_device *spi) > { > struct panel_drv_data *ddata = dev_get_drvdata(&spi->dev); > struct omap_dss_device *dssdev = &ddata->dssdev; > @@ -874,8 +874,6 @@ static int acx565akm_remove(struct spi_device *spi) > acx565akm_disconnect(dssdev); > > omap_dss_put_device(in); > - > - return 0; > } > > static const struct of_device_id acx565akm_of_match[] = { > diff --git a/drivers/video/fbdev/omap2/omapfb/displays/panel-tpo-td028ttec1.c b/drivers/video/fbdev/omap2/omapfb/displays/panel-tpo-td028ttec1.c > index 595ebd8bd5dc..3c0f887d3092 100644 > --- a/drivers/video/fbdev/omap2/omapfb/displays/panel-tpo-td028ttec1.c > +++ b/drivers/video/fbdev/omap2/omapfb/displays/panel-tpo-td028ttec1.c > @@ -425,7 +425,7 @@ static int td028ttec1_panel_probe(struct spi_device *spi) > return r; > } > > -static int td028ttec1_panel_remove(struct spi_device *spi) > +static void td028ttec1_panel_remove(struct spi_device *spi) > { > struct panel_drv_data *ddata = dev_get_drvdata(&spi->dev); > struct omap_dss_device *dssdev = &ddata->dssdev; > @@ -439,8 +439,6 @@ static int td028ttec1_panel_remove(struct spi_device *spi) > td028ttec1_panel_disconnect(dssdev); > > omap_dss_put_device(in); > - > - return 0; > } > > static const struct of_device_id td028ttec1_of_match[] = { > diff --git a/drivers/video/fbdev/omap2/omapfb/displays/panel-tpo-td043mtea1.c b/drivers/video/fbdev/omap2/omapfb/displays/panel-tpo-td043mtea1.c > index afac1d9445aa..58bbba7c037f 100644 > --- a/drivers/video/fbdev/omap2/omapfb/displays/panel-tpo-td043mtea1.c > +++ b/drivers/video/fbdev/omap2/omapfb/displays/panel-tpo-td043mtea1.c > @@ -564,7 +564,7 @@ static int tpo_td043_probe(struct spi_device *spi) > return r; > } > > -static int tpo_td043_remove(struct spi_device *spi) > +static void tpo_td043_remove(struct spi_device *spi) > { > struct panel_drv_data *ddata = dev_get_drvdata(&spi->dev); > struct omap_dss_device *dssdev = &ddata->dssdev; > @@ -580,8 +580,6 @@ static int tpo_td043_remove(struct spi_device *spi) > omap_dss_put_device(in); > > sysfs_remove_group(&spi->dev.kobj, &tpo_td043_attr_group); > - > - return 0; > } > > #ifdef CONFIG_PM_SLEEP > diff --git a/include/linux/spi/spi.h b/include/linux/spi/spi.h > index 7ab3fed7b804..c84e61b99c7b 100644 > --- a/include/linux/spi/spi.h > +++ b/include/linux/spi/spi.h > @@ -280,7 +280,7 @@ struct spi_message; > struct spi_driver { > const struct spi_device_id *id_table; > int (*probe)(struct spi_device *spi); > - int (*remove)(struct spi_device *spi); > + void (*remove)(struct spi_device *spi); > void (*shutdown)(struct spi_device *spi); > struct device_driver driver; > }; > diff --git a/sound/pci/hda/cs35l41_hda_spi.c b/sound/pci/hda/cs35l41_hda_spi.c > index 9f8123893cc8..50eb6c0e6658 100644 > --- a/sound/pci/hda/cs35l41_hda_spi.c > +++ b/sound/pci/hda/cs35l41_hda_spi.c > @@ -28,11 +28,9 @@ static int cs35l41_hda_spi_probe(struct spi_device *spi) > devm_regmap_init_spi(spi, &cs35l41_regmap_spi)); > } > > -static int cs35l41_hda_spi_remove(struct spi_device *spi) > +static void cs35l41_hda_spi_remove(struct spi_device *spi) > { > cs35l41_hda_remove(&spi->dev); > - > - return 0; > } > > static const struct spi_device_id cs35l41_hda_spi_id[] = { > diff --git a/sound/soc/codecs/adau1761-spi.c b/sound/soc/codecs/adau1761-spi.c > index 655689c9778a..7c9242c2ff94 100644 > --- a/sound/soc/codecs/adau1761-spi.c > +++ b/sound/soc/codecs/adau1761-spi.c > @@ -45,10 +45,9 @@ static int adau1761_spi_probe(struct spi_device *spi) > id->driver_data, adau1761_spi_switch_mode); > } > > -static int adau1761_spi_remove(struct spi_device *spi) > +static void adau1761_spi_remove(struct spi_device *spi) > { > adau17x1_remove(&spi->dev); > - return 0; > } > > static const struct spi_device_id adau1761_spi_id[] = { > diff --git a/sound/soc/codecs/adau1781-spi.c b/sound/soc/codecs/adau1781-spi.c > index bb5613574786..1a09633d5a88 100644 > --- a/sound/soc/codecs/adau1781-spi.c > +++ b/sound/soc/codecs/adau1781-spi.c > @@ -45,10 +45,9 @@ static int adau1781_spi_probe(struct spi_device *spi) > id->driver_data, adau1781_spi_switch_mode); > } > > -static int adau1781_spi_remove(struct spi_device *spi) > +static void adau1781_spi_remove(struct spi_device *spi) > { > adau17x1_remove(&spi->dev); > - return 0; > } > > static const struct spi_device_id adau1781_spi_id[] = { > diff --git a/sound/soc/codecs/cs35l41-spi.c b/sound/soc/codecs/cs35l41-spi.c > index 6dfd5459aa20..169221a5b09f 100644 > --- a/sound/soc/codecs/cs35l41-spi.c > +++ b/sound/soc/codecs/cs35l41-spi.c > @@ -55,13 +55,11 @@ static int cs35l41_spi_probe(struct spi_device *spi) > return cs35l41_probe(cs35l41, pdata); > } > > -static int cs35l41_spi_remove(struct spi_device *spi) > +static void cs35l41_spi_remove(struct spi_device *spi) > { > struct cs35l41_private *cs35l41 = spi_get_drvdata(spi); > > cs35l41_remove(cs35l41); > - > - return 0; > } > > #ifdef CONFIG_OF > diff --git a/sound/soc/codecs/pcm3168a-spi.c b/sound/soc/codecs/pcm3168a-spi.c > index ecd379f308e6..b5b08046f545 100644 > --- a/sound/soc/codecs/pcm3168a-spi.c > +++ b/sound/soc/codecs/pcm3168a-spi.c > @@ -26,11 +26,9 @@ static int pcm3168a_spi_probe(struct spi_device *spi) > return pcm3168a_probe(&spi->dev, regmap); > } > > -static int pcm3168a_spi_remove(struct spi_device *spi) > +static void pcm3168a_spi_remove(struct spi_device *spi) > { > pcm3168a_remove(&spi->dev); > - > - return 0; > } > > static const struct spi_device_id pcm3168a_spi_id[] = { > diff --git a/sound/soc/codecs/pcm512x-spi.c b/sound/soc/codecs/pcm512x-spi.c > index 7cf559b47e1c..4d29e7196380 100644 > --- a/sound/soc/codecs/pcm512x-spi.c > +++ b/sound/soc/codecs/pcm512x-spi.c > @@ -26,10 +26,9 @@ static int pcm512x_spi_probe(struct spi_device *spi) > return pcm512x_probe(&spi->dev, regmap); > } > > -static int pcm512x_spi_remove(struct spi_device *spi) > +static void pcm512x_spi_remove(struct spi_device *spi) > { > pcm512x_remove(&spi->dev); > - return 0; > } > > static const struct spi_device_id pcm512x_spi_id[] = { > diff --git a/sound/soc/codecs/tlv320aic32x4-spi.c b/sound/soc/codecs/tlv320aic32x4-spi.c > index a8958cd1c692..03cce8d6404f 100644 > --- a/sound/soc/codecs/tlv320aic32x4-spi.c > +++ b/sound/soc/codecs/tlv320aic32x4-spi.c > @@ -46,11 +46,9 @@ static int aic32x4_spi_probe(struct spi_device *spi) > return aic32x4_probe(&spi->dev, regmap); > } > > -static int aic32x4_spi_remove(struct spi_device *spi) > +static void aic32x4_spi_remove(struct spi_device *spi) > { > aic32x4_remove(&spi->dev); > - > - return 0; > } > > static const struct spi_device_id aic32x4_spi_id[] = { > diff --git a/sound/soc/codecs/tlv320aic3x-spi.c b/sound/soc/codecs/tlv320aic3x-spi.c > index 494e84402232..deed6ec7e081 100644 > --- a/sound/soc/codecs/tlv320aic3x-spi.c > +++ b/sound/soc/codecs/tlv320aic3x-spi.c > @@ -35,11 +35,9 @@ static int aic3x_spi_probe(struct spi_device *spi) > return aic3x_probe(&spi->dev, regmap, id->driver_data); > } > > -static int aic3x_spi_remove(struct spi_device *spi) > +static void aic3x_spi_remove(struct spi_device *spi) > { > aic3x_remove(&spi->dev); > - > - return 0; > } > > static const struct spi_device_id aic3x_spi_id[] = { > diff --git a/sound/soc/codecs/wm0010.c b/sound/soc/codecs/wm0010.c > index 28b4656c4e14..1bef1c500c8e 100644 > --- a/sound/soc/codecs/wm0010.c > +++ b/sound/soc/codecs/wm0010.c > @@ -969,7 +969,7 @@ static int wm0010_spi_probe(struct spi_device *spi) > return 0; > } > > -static int wm0010_spi_remove(struct spi_device *spi) > +static void wm0010_spi_remove(struct spi_device *spi) > { > struct wm0010_priv *wm0010 = spi_get_drvdata(spi); > > @@ -980,8 +980,6 @@ static int wm0010_spi_remove(struct spi_device *spi) > > if (wm0010->irq) > free_irq(wm0010->irq, wm0010); > - > - return 0; > } > > static struct spi_driver wm0010_spi_driver = { > diff --git a/sound/soc/codecs/wm8804-spi.c b/sound/soc/codecs/wm8804-spi.c > index 9a8da1511c34..628568724c20 100644 > --- a/sound/soc/codecs/wm8804-spi.c > +++ b/sound/soc/codecs/wm8804-spi.c > @@ -24,10 +24,9 @@ static int wm8804_spi_probe(struct spi_device *spi) > return wm8804_probe(&spi->dev, regmap); > } > > -static int wm8804_spi_remove(struct spi_device *spi) > +static void wm8804_spi_remove(struct spi_device *spi) > { > wm8804_remove(&spi->dev); > - return 0; > } > > static const struct of_device_id wm8804_of_match[] = { > diff --git a/sound/spi/at73c213.c b/sound/spi/at73c213.c > index 76c0e37a838c..56d2c712e257 100644 > --- a/sound/spi/at73c213.c > +++ b/sound/spi/at73c213.c > @@ -1001,7 +1001,7 @@ static int snd_at73c213_probe(struct spi_device *spi) > return retval; > } > > -static int snd_at73c213_remove(struct spi_device *spi) > +static void snd_at73c213_remove(struct spi_device *spi) > { > struct snd_card *card = dev_get_drvdata(&spi->dev); > struct snd_at73c213 *chip = card->private_data; > @@ -1066,8 +1066,6 @@ static int snd_at73c213_remove(struct spi_device *spi) > > ssc_free(chip->ssc); > snd_card_free(card); > - > - return 0; > } > > #ifdef CONFIG_PM_SLEEP > -- > 2.34.1 > -- Alexandre Belloni, co-owner and COO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com

1 0

Re: [PATCH 0/5] spi: make remove callback a void function
by Lee Jones 25 Jan '22

25 Jan '22

My usual mailer won't let me reply to this many people, so I'm using Gmail. No idea what chaos this will cause, but here goes ... > The value returned by an spi driver's remove function is mostly ignored. > (Only an error message is printed if the value is non-zero that the > error is ignored.) > > So change the prototype of the remove function to return no value. This > way driver authors are not tempted to assume that passing an error to > the upper layer is a good idea. All drivers are adapted accordingly. > There is no intended change of behaviour, all callbacks were prepared to > return 0 before. > > Signed-off-by: Uwe Kleine-König <u.kleine-koenig(a)pengutronix.de> > --- [...] > drivers/mfd/arizona-spi.c | 4 +--- > drivers/mfd/da9052-spi.c | 3 +-- > drivers/mfd/ezx-pcap.c | 4 +--- > drivers/mfd/madera-spi.c | 4 +--- > drivers/mfd/mc13xxx-spi.c | 3 +-- > drivers/mfd/rsmu_spi.c | 4 +--- > drivers/mfd/stmpe-spi.c | 4 +--- > drivers/mfd/tps65912-spi.c | 4 +--- > drivers/video/backlight/ams369fg06.c | 3 +-- > drivers/video/backlight/corgi_lcd.c | 3 +-- > drivers/video/backlight/ili922x.c | 3 +-- > drivers/video/backlight/l4f00242t03.c | 3 +-- > drivers/video/backlight/lms501kf03.c | 3 +-- > drivers/video/backlight/ltv350qv.c | 3 +-- > drivers/video/backlight/tdo24m.c | 3 +-- > drivers/video/backlight/tosa_lcd.c | 4 +--- > drivers/video/backlight/vgg2432a4.c | 4 +--- If it's okay with Mark, it's okay with me. Acked-by: Lee Jones <lee.jones(a)linaro.org> -- Lee Jones [李琼斯] Linaro Services Principle Technical Lead Linaro.org │ Open source software for ARM SoCs Follow Linaro: Facebook | Twitter | Blog

1 0

[PATCH 1/6] ASoC: dt-bindings: samsung, aries-wm8994: require sound-dai property
by Krzysztof Kozlowski 25 Jan '22

25 Jan '22

The cpu and codec nodes must provide sound-dai property. Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski(a)canonical.com> --- .../devicetree/bindings/sound/samsung,aries-wm8994.yaml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Documentation/devicetree/bindings/sound/samsung,aries-wm8994.yaml b/Documentation/devicetree/bindings/sound/samsung,aries-wm8994.yaml index eb487ed3ca3b..d5cc221787cf 100644 --- a/Documentation/devicetree/bindings/sound/samsung,aries-wm8994.yaml +++ b/Documentation/devicetree/bindings/sound/samsung,aries-wm8994.yaml @@ -33,6 +33,8 @@ properties: description: | phandles to the I2S controller and bluetooth codec, in that order + required: + - sound-dai codec: type: object @@ -40,6 +42,8 @@ properties: sound-dai: $ref: /schemas/types.yaml#/definitions/phandle-array description: phandle to the WM8994 CODEC + required: + - sound-dai samsung,audio-routing: $ref: /schemas/types.yaml#/definitions/non-unique-string-array -- 2.32.0

2 6

[PATCH] dt-bindings: Improve phandle-array schemas
by Rob Herring 24 Jan '22

24 Jan '22

The 'phandle-array' type is a bit ambiguous. It can be either just an array of phandles or an array of phandles plus args. Many schemas for phandle-array properties aren't clear in the schema which case applies though the description usually describes it. The array of phandles case boils down to needing: items: maxItems: 1 The phandle plus args cases should typically take this form: items: - items: - description: A phandle - description: 1st arg cell - description: 2nd arg cell With this change, some examples need updating so that the bracketing of property values matches the schema. Cc: Damien Le Moal <damien.lemoal(a)opensource.wdc.com> Cc: Herbert Xu <herbert(a)gondor.apana.org.au> Cc: "David S. Miller" <davem(a)davemloft.net> Cc: Chun-Kuang Hu <chunkuang.hu(a)kernel.org> Cc: Philipp Zabel <p.zabel(a)pengutronix.de> Cc: Laurent Pinchart <laurent.pinchart(a)ideasonboard.com> Cc: Kieran Bingham <kieran.bingham+renesas(a)ideasonboard.com> Cc: Vinod Koul <vkoul(a)kernel.org> Cc: Georgi Djakov <djakov(a)kernel.org> Cc: Thomas Gleixner <tglx(a)linutronix.de> Cc: Marc Zyngier <maz(a)kernel.org> Cc: Joerg Roedel <joro(a)8bytes.org> Cc: Lee Jones <lee.jones(a)linaro.org> Cc: Daniel Thompson <daniel.thompson(a)linaro.org> Cc: Jingoo Han <jingoohan1(a)gmail.com> Cc: Pavel Machek <pavel(a)ucw.cz> Cc: Mauro Carvalho Chehab <mchehab(a)kernel.org> Cc: Krzysztof Kozlowski <krzysztof.kozlowski(a)canonical.com> Cc: Jakub Kicinski <kuba(a)kernel.org> Cc: Wolfgang Grandegger <wg(a)grandegger.com> Cc: Marc Kleine-Budde <mkl(a)pengutronix.de> Cc: Andrew Lunn <andrew(a)lunn.ch> Cc: Vivien Didelot <vivien.didelot(a)gmail.com> Cc: Florian Fainelli <f.fainelli(a)gmail.com> Cc: Vladimir Oltean <olteanv(a)gmail.com> Cc: Kalle Valo <kvalo(a)kernel.org> Cc: Viresh Kumar <vireshk(a)kernel.org> Cc: Stephen Boyd <sboyd(a)kernel.org> Cc: Kishon Vijay Abraham I <kishon(a)ti.com> Cc: Linus Walleij <linus.walleij(a)linaro.org> Cc: "Rafael J. Wysocki" <rafael(a)kernel.org> Cc: Kevin Hilman <khilman(a)kernel.org> Cc: Ulf Hansson <ulf.hansson(a)linaro.org> Cc: Sebastian Reichel <sre(a)kernel.org> Cc: Mark Brown <broonie(a)kernel.org> Cc: Mathieu Poirier <mathieu.poirier(a)linaro.org> Cc: Daniel Lezcano <daniel.lezcano(a)linaro.org> Cc: Zhang Rui <rui.zhang(a)intel.com> Cc: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> Cc: Thierry Reding <thierry.reding(a)gmail.com> Cc: Jonathan Hunter <jonathanh(a)nvidia.com> Cc: Sudeep Holla <sudeep.holla(a)arm.com> Cc: Geert Uytterhoeven <geert+renesas(a)glider.be> Cc: linux-ide(a)vger.kernel.org Cc: linux-crypto(a)vger.kernel.org Cc: dri-devel(a)lists.freedesktop.org Cc: dmaengine(a)vger.kernel.org Cc: linux-pm(a)vger.kernel.org Cc: iommu(a)lists.linux-foundation.org Cc: linux-leds(a)vger.kernel.org Cc: linux-media(a)vger.kernel.org Cc: netdev(a)vger.kernel.org Cc: linux-can(a)vger.kernel.org Cc: linux-wireless(a)vger.kernel.org Cc: linux-phy(a)lists.infradead.org Cc: linux-gpio(a)vger.kernel.org Cc: linux-riscv(a)lists.infradead.org Cc: linux-remoteproc(a)vger.kernel.org Cc: alsa-devel(a)alsa-project.org Cc: linux-usb(a)vger.kernel.org Signed-off-by: Rob Herring <robh(a)kernel.org> --- .../devicetree/bindings/arm/cpus.yaml | 2 + .../devicetree/bindings/arm/idle-states.yaml | 80 +++++++++---------- .../devicetree/bindings/arm/pmu.yaml | 2 + .../bindings/ata/sata_highbank.yaml | 3 + .../bus/allwinner,sun50i-a64-de2.yaml | 5 +- .../bindings/crypto/intel,ixp4xx-crypto.yaml | 15 +++- .../allwinner,sun4i-a10-display-engine.yaml | 2 + .../display/mediatek/mediatek,hdmi.yaml | 5 +- .../devicetree/bindings/display/msm/gpu.yaml | 2 + .../bindings/display/renesas,du.yaml | 10 ++- .../display/rockchip/rockchip-drm.yaml | 2 + .../display/sprd/sprd,display-subsystem.yaml | 2 + .../bindings/display/ti/ti,am65x-dss.yaml | 3 +- .../devicetree/bindings/dma/dma-router.yaml | 2 + .../bindings/dma/st,stm32-dmamux.yaml | 2 +- .../bindings/dvfs/performance-domain.yaml | 1 - .../bindings/interconnect/qcom,rpmh.yaml | 2 + .../interrupt-controller/arm,gic-v3.yaml | 6 +- .../interrupt-controller/ti,sci-inta.yaml | 2 + .../bindings/iommu/mediatek,iommu.yaml | 6 +- .../bindings/iommu/renesas,ipmmu-vmsa.yaml | 6 ++ .../leds/backlight/led-backlight.yaml | 2 + .../allwinner,sun4i-a10-video-engine.yaml | 4 + .../bindings/media/nxp,imx8mq-mipi-csi2.yaml | 10 +-- .../devicetree/bindings/media/ti,cal.yaml | 4 + .../memory-controllers/mediatek,smi-larb.yaml | 2 +- .../samsung,exynos5422-dmc.yaml | 2 + .../net/allwinner,sun4i-a10-emac.yaml | 4 + .../bindings/net/can/bosch,c_can.yaml | 8 +- .../bindings/net/can/fsl,flexcan.yaml | 12 +-- .../devicetree/bindings/net/dsa/dsa-port.yaml | 2 + .../devicetree/bindings/net/fsl,fec.yaml | 8 +- .../bindings/net/intel,ixp4xx-ethernet.yaml | 15 +++- .../bindings/net/intel,ixp4xx-hss.yaml | 33 ++++++-- .../bindings/net/nxp,dwmac-imx.yaml | 4 + .../bindings/net/socionext,uniphier-ave4.yaml | 4 + .../devicetree/bindings/net/stm32-dwmac.yaml | 4 + .../bindings/net/ti,k3-am654-cpsw-nuss.yaml | 5 ++ .../bindings/net/wireless/mediatek,mt76.yaml | 4 + .../devicetree/bindings/opp/opp-v2-base.yaml | 2 + .../devicetree/bindings/perf/arm,dsu-pmu.yaml | 2 + .../bindings/phy/intel,combo-phy.yaml | 8 ++ .../devicetree/bindings/phy/ti,omap-usb2.yaml | 4 + .../pinctrl/aspeed,ast2500-pinctrl.yaml | 2 + .../bindings/pinctrl/canaan,k210-fpioa.yaml | 4 + .../pinctrl/mediatek,mt65xx-pinctrl.yaml | 2 + .../bindings/pinctrl/st,stm32-pinctrl.yaml | 10 ++- .../bindings/power/power-domain.yaml | 4 + .../bindings/power/renesas,apmu.yaml | 2 + .../power/rockchip,power-controller.yaml | 2 + .../bindings/power/supply/cw2015_battery.yaml | 6 +- .../bindings/power/supply/power-supply.yaml | 2 + .../bindings/regulator/regulator.yaml | 2 + .../bindings/regulator/st,stm32-booster.yaml | 2 +- .../bindings/remoteproc/qcom,adsp.yaml | 6 ++ .../bindings/remoteproc/st,stm32-rproc.yaml | 33 ++++++-- .../bindings/remoteproc/ti,k3-dsp-rproc.yaml | 2 + .../bindings/remoteproc/ti,k3-r5f-rproc.yaml | 2 + .../remoteproc/ti,omap-remoteproc.yaml | 19 +++-- .../bindings/soc/samsung/exynos-usi.yaml | 4 + .../bindings/sound/samsung,aries-wm8994.yaml | 2 + .../bindings/sound/samsung,midas-audio.yaml | 3 +- .../bindings/sound/st,stm32-sai.yaml | 8 +- .../thermal/thermal-cooling-devices.yaml | 6 +- .../bindings/thermal/thermal-idle.yaml | 8 +- .../bindings/usb/nvidia,tegra-xudc.yaml | 2 +- 66 files changed, 317 insertions(+), 119 deletions(-) diff --git a/Documentation/devicetree/bindings/arm/cpus.yaml b/Documentation/devicetree/bindings/arm/cpus.yaml index 0dcebc48ea22..916a5aebefff 100644 --- a/Documentation/devicetree/bindings/arm/cpus.yaml +++ b/Documentation/devicetree/bindings/arm/cpus.yaml @@ -243,6 +243,8 @@ properties: cpu-idle-states: $ref: '/schemas/types.yaml#/definitions/phandle-array' + items: + maxItems: 1 description: | List of phandles to idle state nodes supported by this cpu (see ./idle-states.yaml). diff --git a/Documentation/devicetree/bindings/arm/idle-states.yaml b/Documentation/devicetree/bindings/arm/idle-states.yaml index 52bce5dbb11f..4d381fa1ee57 100644 --- a/Documentation/devicetree/bindings/arm/idle-states.yaml +++ b/Documentation/devicetree/bindings/arm/idle-states.yaml @@ -337,8 +337,8 @@ examples: compatible = "arm,cortex-a57"; reg = <0x0 0x0>; enable-method = "psci"; - cpu-idle-states = <&CPU_RETENTION_0_0 &CPU_SLEEP_0_0 - &CLUSTER_RETENTION_0 &CLUSTER_SLEEP_0>; + cpu-idle-states = <&CPU_RETENTION_0_0>, <&CPU_SLEEP_0_0>, + <&CLUSTER_RETENTION_0>, <&CLUSTER_SLEEP_0>; }; cpu@1 { @@ -346,8 +346,8 @@ examples: compatible = "arm,cortex-a57"; reg = <0x0 0x1>; enable-method = "psci"; - cpu-idle-states = <&CPU_RETENTION_0_0 &CPU_SLEEP_0_0 - &CLUSTER_RETENTION_0 &CLUSTER_SLEEP_0>; + cpu-idle-states = <&CPU_RETENTION_0_0>, <&CPU_SLEEP_0_0>, + <&CLUSTER_RETENTION_0>, <&CLUSTER_SLEEP_0>; }; cpu@100 { @@ -355,8 +355,8 @@ examples: compatible = "arm,cortex-a57"; reg = <0x0 0x100>; enable-method = "psci"; - cpu-idle-states = <&CPU_RETENTION_0_0 &CPU_SLEEP_0_0 - &CLUSTER_RETENTION_0 &CLUSTER_SLEEP_0>; + cpu-idle-states = <&CPU_RETENTION_0_0>, <&CPU_SLEEP_0_0>, + <&CLUSTER_RETENTION_0>, <&CLUSTER_SLEEP_0>; }; cpu@101 { @@ -364,8 +364,8 @@ examples: compatible = "arm,cortex-a57"; reg = <0x0 0x101>; enable-method = "psci"; - cpu-idle-states = <&CPU_RETENTION_0_0 &CPU_SLEEP_0_0 - &CLUSTER_RETENTION_0 &CLUSTER_SLEEP_0>; + cpu-idle-states = <&CPU_RETENTION_0_0>, <&CPU_SLEEP_0_0>, + <&CLUSTER_RETENTION_0>, <&CLUSTER_SLEEP_0>; }; cpu@10000 { @@ -373,8 +373,8 @@ examples: compatible = "arm,cortex-a57"; reg = <0x0 0x10000>; enable-method = "psci"; - cpu-idle-states = <&CPU_RETENTION_0_0 &CPU_SLEEP_0_0 - &CLUSTER_RETENTION_0 &CLUSTER_SLEEP_0>; + cpu-idle-states = <&CPU_RETENTION_0_0>, <&CPU_SLEEP_0_0>, + <&CLUSTER_RETENTION_0>, <&CLUSTER_SLEEP_0>; }; cpu@10001 { @@ -382,8 +382,8 @@ examples: compatible = "arm,cortex-a57"; reg = <0x0 0x10001>; enable-method = "psci"; - cpu-idle-states = <&CPU_RETENTION_0_0 &CPU_SLEEP_0_0 - &CLUSTER_RETENTION_0 &CLUSTER_SLEEP_0>; + cpu-idle-states = <&CPU_RETENTION_0_0>, <&CPU_SLEEP_0_0>, + <&CLUSTER_RETENTION_0>, <&CLUSTER_SLEEP_0>; }; cpu@10100 { @@ -391,8 +391,8 @@ examples: compatible = "arm,cortex-a57"; reg = <0x0 0x10100>; enable-method = "psci"; - cpu-idle-states = <&CPU_RETENTION_0_0 &CPU_SLEEP_0_0 - &CLUSTER_RETENTION_0 &CLUSTER_SLEEP_0>; + cpu-idle-states = <&CPU_RETENTION_0_0>, <&CPU_SLEEP_0_0>, + <&CLUSTER_RETENTION_0>, <&CLUSTER_SLEEP_0>; }; cpu@10101 { @@ -400,8 +400,8 @@ examples: compatible = "arm,cortex-a57"; reg = <0x0 0x10101>; enable-method = "psci"; - cpu-idle-states = <&CPU_RETENTION_0_0 &CPU_SLEEP_0_0 - &CLUSTER_RETENTION_0 &CLUSTER_SLEEP_0>; + cpu-idle-states = <&CPU_RETENTION_0_0>, <&CPU_SLEEP_0_0>, + <&CLUSTER_RETENTION_0>, <&CLUSTER_SLEEP_0>; }; cpu@100000000 { @@ -409,8 +409,8 @@ examples: compatible = "arm,cortex-a53"; reg = <0x1 0x0>; enable-method = "psci"; - cpu-idle-states = <&CPU_RETENTION_1_0 &CPU_SLEEP_1_0 - &CLUSTER_RETENTION_1 &CLUSTER_SLEEP_1>; + cpu-idle-states = <&CPU_RETENTION_1_0>, <&CPU_SLEEP_1_0>, + <&CLUSTER_RETENTION_1>, <&CLUSTER_SLEEP_1>; }; cpu@100000001 { @@ -418,8 +418,8 @@ examples: compatible = "arm,cortex-a53"; reg = <0x1 0x1>; enable-method = "psci"; - cpu-idle-states = <&CPU_RETENTION_1_0 &CPU_SLEEP_1_0 - &CLUSTER_RETENTION_1 &CLUSTER_SLEEP_1>; + cpu-idle-states = <&CPU_RETENTION_1_0>, <&CPU_SLEEP_1_0>, + <&CLUSTER_RETENTION_1>, <&CLUSTER_SLEEP_1>; }; cpu@100000100 { @@ -427,8 +427,8 @@ examples: compatible = "arm,cortex-a53"; reg = <0x1 0x100>; enable-method = "psci"; - cpu-idle-states = <&CPU_RETENTION_1_0 &CPU_SLEEP_1_0 - &CLUSTER_RETENTION_1 &CLUSTER_SLEEP_1>; + cpu-idle-states = <&CPU_RETENTION_1_0>, <&CPU_SLEEP_1_0>, + <&CLUSTER_RETENTION_1>, <&CLUSTER_SLEEP_1>; }; cpu@100000101 { @@ -436,8 +436,8 @@ examples: compatible = "arm,cortex-a53"; reg = <0x1 0x101>; enable-method = "psci"; - cpu-idle-states = <&CPU_RETENTION_1_0 &CPU_SLEEP_1_0 - &CLUSTER_RETENTION_1 &CLUSTER_SLEEP_1>; + cpu-idle-states = <&CPU_RETENTION_1_0>, <&CPU_SLEEP_1_0>, + <&CLUSTER_RETENTION_1>, <&CLUSTER_SLEEP_1>; }; cpu@100010000 { @@ -445,8 +445,8 @@ examples: compatible = "arm,cortex-a53"; reg = <0x1 0x10000>; enable-method = "psci"; - cpu-idle-states = <&CPU_RETENTION_1_0 &CPU_SLEEP_1_0 - &CLUSTER_RETENTION_1 &CLUSTER_SLEEP_1>; + cpu-idle-states = <&CPU_RETENTION_1_0>, <&CPU_SLEEP_1_0>, + <&CLUSTER_RETENTION_1>, <&CLUSTER_SLEEP_1>; }; cpu@100010001 { @@ -454,8 +454,8 @@ examples: compatible = "arm,cortex-a53"; reg = <0x1 0x10001>; enable-method = "psci"; - cpu-idle-states = <&CPU_RETENTION_1_0 &CPU_SLEEP_1_0 - &CLUSTER_RETENTION_1 &CLUSTER_SLEEP_1>; + cpu-idle-states = <&CPU_RETENTION_1_0>, <&CPU_SLEEP_1_0>, + <&CLUSTER_RETENTION_1>, <&CLUSTER_SLEEP_1>; }; cpu@100010100 { @@ -463,8 +463,8 @@ examples: compatible = "arm,cortex-a53"; reg = <0x1 0x10100>; enable-method = "psci"; - cpu-idle-states = <&CPU_RETENTION_1_0 &CPU_SLEEP_1_0 - &CLUSTER_RETENTION_1 &CLUSTER_SLEEP_1>; + cpu-idle-states = <&CPU_RETENTION_1_0>, <&CPU_SLEEP_1_0>, + <&CLUSTER_RETENTION_1>, <&CLUSTER_SLEEP_1>; }; cpu@100010101 { @@ -472,8 +472,8 @@ examples: compatible = "arm,cortex-a53"; reg = <0x1 0x10101>; enable-method = "psci"; - cpu-idle-states = <&CPU_RETENTION_1_0 &CPU_SLEEP_1_0 - &CLUSTER_RETENTION_1 &CLUSTER_SLEEP_1>; + cpu-idle-states = <&CPU_RETENTION_1_0>, <&CPU_SLEEP_1_0>, + <&CLUSTER_RETENTION_1>, <&CLUSTER_SLEEP_1>; }; idle-states { @@ -567,56 +567,56 @@ examples: device_type = "cpu"; compatible = "arm,cortex-a15"; reg = <0x0>; - cpu-idle-states = <&cpu_sleep_0_0 &cluster_sleep_0>; + cpu-idle-states = <&cpu_sleep_0_0>, <&cluster_sleep_0>; }; cpu@1 { device_type = "cpu"; compatible = "arm,cortex-a15"; reg = <0x1>; - cpu-idle-states = <&cpu_sleep_0_0 &cluster_sleep_0>; + cpu-idle-states = <&cpu_sleep_0_0>, <&cluster_sleep_0>; }; cpu@2 { device_type = "cpu"; compatible = "arm,cortex-a15"; reg = <0x2>; - cpu-idle-states = <&cpu_sleep_0_0 &cluster_sleep_0>; + cpu-idle-states = <&cpu_sleep_0_0>, <&cluster_sleep_0>; }; cpu@3 { device_type = "cpu"; compatible = "arm,cortex-a15"; reg = <0x3>; - cpu-idle-states = <&cpu_sleep_0_0 &cluster_sleep_0>; + cpu-idle-states = <&cpu_sleep_0_0>, <&cluster_sleep_0>; }; cpu@100 { device_type = "cpu"; compatible = "arm,cortex-a7"; reg = <0x100>; - cpu-idle-states = <&cpu_sleep_1_0 &cluster_sleep_1>; + cpu-idle-states = <&cpu_sleep_1_0>, <&cluster_sleep_1>; }; cpu@101 { device_type = "cpu"; compatible = "arm,cortex-a7"; reg = <0x101>; - cpu-idle-states = <&cpu_sleep_1_0 &cluster_sleep_1>; + cpu-idle-states = <&cpu_sleep_1_0>, <&cluster_sleep_1>; }; cpu@102 { device_type = "cpu"; compatible = "arm,cortex-a7"; reg = <0x102>; - cpu-idle-states = <&cpu_sleep_1_0 &cluster_sleep_1>; + cpu-idle-states = <&cpu_sleep_1_0>, <&cluster_sleep_1>; }; cpu@103 { device_type = "cpu"; compatible = "arm,cortex-a7"; reg = <0x103>; - cpu-idle-states = <&cpu_sleep_1_0 &cluster_sleep_1>; + cpu-idle-states = <&cpu_sleep_1_0>, <&cluster_sleep_1>; }; idle-states { diff --git a/Documentation/devicetree/bindings/arm/pmu.yaml b/Documentation/devicetree/bindings/arm/pmu.yaml index 981bac451698..2e2308d73408 100644 --- a/Documentation/devicetree/bindings/arm/pmu.yaml +++ b/Documentation/devicetree/bindings/arm/pmu.yaml @@ -66,6 +66,8 @@ properties: interrupt-affinity: $ref: /schemas/types.yaml#/definitions/phandle-array + items: + maxItems: 1 description: When using SPIs, specifies a list of phandles to CPU nodes corresponding directly to the affinity of diff --git a/Documentation/devicetree/bindings/ata/sata_highbank.yaml b/Documentation/devicetree/bindings/ata/sata_highbank.yaml index ce75d77e9289..49679b58041c 100644 --- a/Documentation/devicetree/bindings/ata/sata_highbank.yaml +++ b/Documentation/devicetree/bindings/ata/sata_highbank.yaml @@ -51,6 +51,9 @@ properties: $ref: /schemas/types.yaml#/definitions/phandle-array minItems: 1 maxItems: 8 + items: + minItems: 2 + maxItems: 2 calxeda,tx-atten: description: | diff --git a/Documentation/devicetree/bindings/bus/allwinner,sun50i-a64-de2.yaml b/Documentation/devicetree/bindings/bus/allwinner,sun50i-a64-de2.yaml index 863a287ebc7e..ad313ccaaaef 100644 --- a/Documentation/devicetree/bindings/bus/allwinner,sun50i-a64-de2.yaml +++ b/Documentation/devicetree/bindings/bus/allwinner,sun50i-a64-de2.yaml @@ -35,7 +35,10 @@ properties: The SRAM that needs to be claimed to access the display engine bus. $ref: /schemas/types.yaml#/definitions/phandle-array - maxItems: 1 + items: + - items: + - description: phandle to SRAM + - description: register value for device ranges: true diff --git a/Documentation/devicetree/bindings/crypto/intel,ixp4xx-crypto.yaml b/Documentation/devicetree/bindings/crypto/intel,ixp4xx-crypto.yaml index 9c53c27bd20a..e0fe63957888 100644 --- a/Documentation/devicetree/bindings/crypto/intel,ixp4xx-crypto.yaml +++ b/Documentation/devicetree/bindings/crypto/intel,ixp4xx-crypto.yaml @@ -22,19 +22,28 @@ properties: intel,npe-handle: $ref: '/schemas/types.yaml#/definitions/phandle-array' - maxItems: 1 + items: + - items: + - description: phandle to the NPE this crypto engine + - description: the NPE instance number description: phandle to the NPE this crypto engine is using, the cell describing the NPE instance to be used. queue-rx: $ref: /schemas/types.yaml#/definitions/phandle-array - maxItems: 1 + items: + - items: + - description: phandle to the RX queue on the NPE + - description: the queue instance number description: phandle to the RX queue on the NPE, the cell describing the queue instance to be used. queue-txready: $ref: /schemas/types.yaml#/definitions/phandle-array - maxItems: 1 + items: + - items: + - description: phandle to the TX READY queue on the NPE + - description: the queue instance number description: phandle to the TX READY queue on the NPE, the cell describing the queue instance to be used. diff --git a/Documentation/devicetree/bindings/display/allwinner,sun4i-a10-display-engine.yaml b/Documentation/devicetree/bindings/display/allwinner,sun4i-a10-display-engine.yaml index e77523b02fad..d4412aea7b73 100644 --- a/Documentation/devicetree/bindings/display/allwinner,sun4i-a10-display-engine.yaml +++ b/Documentation/devicetree/bindings/display/allwinner,sun4i-a10-display-engine.yaml @@ -69,6 +69,8 @@ properties: $ref: /schemas/types.yaml#/definitions/phandle-array minItems: 1 maxItems: 2 + items: + maxItems: 1 description: | Available display engine frontends (DE 1.0) or mixers (DE 2.0/3.0) available. diff --git a/Documentation/devicetree/bindings/display/mediatek/mediatek,hdmi.yaml b/Documentation/devicetree/bindings/display/mediatek/mediatek,hdmi.yaml index 111967efa999..bdaf0b51e68c 100644 --- a/Documentation/devicetree/bindings/display/mediatek/mediatek,hdmi.yaml +++ b/Documentation/devicetree/bindings/display/mediatek/mediatek,hdmi.yaml @@ -51,7 +51,10 @@ properties: mediatek,syscon-hdmi: $ref: '/schemas/types.yaml#/definitions/phandle-array' - maxItems: 1 + items: + - items: + - description: phandle to system configuration registers + - description: register offset in the system configuration registers description: | phandle link and register offset to the system configuration registers. diff --git a/Documentation/devicetree/bindings/display/msm/gpu.yaml b/Documentation/devicetree/bindings/display/msm/gpu.yaml index 99a1ba3ada56..3397bc31d087 100644 --- a/Documentation/devicetree/bindings/display/msm/gpu.yaml +++ b/Documentation/devicetree/bindings/display/msm/gpu.yaml @@ -64,6 +64,8 @@ properties: $ref: /schemas/types.yaml#/definitions/phandle-array minItems: 1 maxItems: 4 + items: + maxItems: 1 description: | phandles to one or more reserved on-chip SRAM regions. phandle to the On Chip Memory (OCMEM) that's present on some a3xx and diff --git a/Documentation/devicetree/bindings/display/renesas,du.yaml b/Documentation/devicetree/bindings/display/renesas,du.yaml index 13efea574584..56cedcd6d576 100644 --- a/Documentation/devicetree/bindings/display/renesas,du.yaml +++ b/Documentation/devicetree/bindings/display/renesas,du.yaml @@ -76,17 +76,21 @@ properties: renesas,cmms: $ref: "/schemas/types.yaml#/definitions/phandle-array" + items: + maxItems: 1 description: A list of phandles to the CMM instances present in the SoC, one for each available DU channel. renesas,vsps: $ref: "/schemas/types.yaml#/definitions/phandle-array" + items: + items: + - description: phandle to VSP instance that serves the DU channel + - description: Channel index identifying the LIF instance in that VSP description: A list of phandle and channel index tuples to the VSPs that handle the - memory interfaces for the DU channels. The phandle identifies the VSP - instance that serves the DU channel, and the channel index identifies - the LIF instance in that VSP. + memory interfaces for the DU channels. required: - compatible diff --git a/Documentation/devicetree/bindings/display/rockchip/rockchip-drm.yaml b/Documentation/devicetree/bindings/display/rockchip/rockchip-drm.yaml index 7204da5eb4c5..a8d18a37cb23 100644 --- a/Documentation/devicetree/bindings/display/rockchip/rockchip-drm.yaml +++ b/Documentation/devicetree/bindings/display/rockchip/rockchip-drm.yaml @@ -21,6 +21,8 @@ properties: ports: $ref: /schemas/types.yaml#/definitions/phandle-array + items: + maxItems: 1 description: | Should contain a list of phandles pointing to display interface port of vop devices. vop definitions as defined in diff --git a/Documentation/devicetree/bindings/display/sprd/sprd,display-subsystem.yaml b/Documentation/devicetree/bindings/display/sprd/sprd,display-subsystem.yaml index 3d107e9434be..d0a5592bd89d 100644 --- a/Documentation/devicetree/bindings/display/sprd/sprd,display-subsystem.yaml +++ b/Documentation/devicetree/bindings/display/sprd/sprd,display-subsystem.yaml @@ -45,6 +45,8 @@ properties: ports: $ref: /schemas/types.yaml#/definitions/phandle-array + items: + maxItems: 1 description: Should contain a list of phandles pointing to display interface port of DPU devices. diff --git a/Documentation/devicetree/bindings/display/ti/ti,am65x-dss.yaml b/Documentation/devicetree/bindings/display/ti/ti,am65x-dss.yaml index 781c1868b0b8..5c7d2cbc4aac 100644 --- a/Documentation/devicetree/bindings/display/ti/ti,am65x-dss.yaml +++ b/Documentation/devicetree/bindings/display/ti/ti,am65x-dss.yaml @@ -88,8 +88,7 @@ properties: The DSS DPI output port node from video port 2 ti,am65x-oldi-io-ctrl: - $ref: "/schemas/types.yaml#/definitions/phandle-array" - maxItems: 1 + $ref: "/schemas/types.yaml#/definitions/phandle" description: phandle to syscon device node mapping OLDI IO_CTRL registers. The mapped range should point to OLDI_DAT0_IO_CTRL, map it and diff --git a/Documentation/devicetree/bindings/dma/dma-router.yaml b/Documentation/devicetree/bindings/dma/dma-router.yaml index e72748496fd9..4b817f5dc30e 100644 --- a/Documentation/devicetree/bindings/dma/dma-router.yaml +++ b/Documentation/devicetree/bindings/dma/dma-router.yaml @@ -24,6 +24,8 @@ properties: dma-masters: $ref: /schemas/types.yaml#/definitions/phandle-array + items: + maxItems: 1 description: Array of phandles to the DMA controllers the router can direct the signal to. diff --git a/Documentation/devicetree/bindings/dma/st,stm32-dmamux.yaml b/Documentation/devicetree/bindings/dma/st,stm32-dmamux.yaml index f751796531c9..7b1833d6caa2 100644 --- a/Documentation/devicetree/bindings/dma/st,stm32-dmamux.yaml +++ b/Documentation/devicetree/bindings/dma/st,stm32-dmamux.yaml @@ -46,7 +46,7 @@ examples: #dma-cells = <3>; dma-requests = <128>; dma-channels = <16>; - dma-masters = <&dma1 &dma2>; + dma-masters = <&dma1>, <&dma2>; clocks = <&timer_clk>; }; diff --git a/Documentation/devicetree/bindings/dvfs/performance-domain.yaml b/Documentation/devicetree/bindings/dvfs/performance-domain.yaml index c8b91207f34d..7959d40ded5a 100644 --- a/Documentation/devicetree/bindings/dvfs/performance-domain.yaml +++ b/Documentation/devicetree/bindings/dvfs/performance-domain.yaml @@ -43,7 +43,6 @@ properties: performance-domains: $ref: '/schemas/types.yaml#/definitions/phandle-array' - maxItems: 1 description: A phandle and performance domain specifier as defined by bindings of the performance controller/provider specified by phandle. diff --git a/Documentation/devicetree/bindings/interconnect/qcom,rpmh.yaml b/Documentation/devicetree/bindings/interconnect/qcom,rpmh.yaml index cbb24f9bb609..5a911be0c2ea 100644 --- a/Documentation/devicetree/bindings/interconnect/qcom,rpmh.yaml +++ b/Documentation/devicetree/bindings/interconnect/qcom,rpmh.yaml @@ -121,6 +121,8 @@ properties: qcom,bcm-voters: $ref: /schemas/types.yaml#/definitions/phandle-array + items: + maxItems: 1 description: | List of phandles to qcom,bcm-voter nodes that are required by this interconnect to send RPMh commands. diff --git a/Documentation/devicetree/bindings/interrupt-controller/arm,gic-v3.yaml b/Documentation/devicetree/bindings/interrupt-controller/arm,gic-v3.yaml index cfb3ec27bd2b..b7197f78e158 100644 --- a/Documentation/devicetree/bindings/interrupt-controller/arm,gic-v3.yaml +++ b/Documentation/devicetree/bindings/interrupt-controller/arm,gic-v3.yaml @@ -138,6 +138,8 @@ properties: properties: affinity: $ref: /schemas/types.yaml#/definitions/phandle-array + items: + maxItems: 1 description: Should be a list of phandles to CPU nodes (as described in Documentation/devicetree/bindings/arm/cpus.yaml). @@ -273,11 +275,11 @@ examples: ppi-partitions { part0: interrupt-partition-0 { - affinity = <&cpu0 &cpu2>; + affinity = <&cpu0>, <&cpu2>; }; part1: interrupt-partition-1 { - affinity = <&cpu1 &cpu3>; + affinity = <&cpu1>, <&cpu3>; }; }; }; diff --git a/Documentation/devicetree/bindings/interrupt-controller/ti,sci-inta.yaml b/Documentation/devicetree/bindings/interrupt-controller/ti,sci-inta.yaml index 3d89668573e8..88c46e61732e 100644 --- a/Documentation/devicetree/bindings/interrupt-controller/ti,sci-inta.yaml +++ b/Documentation/devicetree/bindings/interrupt-controller/ti,sci-inta.yaml @@ -77,6 +77,8 @@ properties: ti,unmapped-event-sources: $ref: /schemas/types.yaml#/definitions/phandle-array + items: + maxItems: 1 description: Array of phandles to DMA controllers where the unmapped events originate. diff --git a/Documentation/devicetree/bindings/iommu/mediatek,iommu.yaml b/Documentation/devicetree/bindings/iommu/mediatek,iommu.yaml index 0f26fe14c8e2..97e8c471a5e8 100644 --- a/Documentation/devicetree/bindings/iommu/mediatek,iommu.yaml +++ b/Documentation/devicetree/bindings/iommu/mediatek,iommu.yaml @@ -101,6 +101,8 @@ properties: $ref: /schemas/types.yaml#/definitions/phandle-array minItems: 1 maxItems: 32 + items: + maxItems: 1 description: | List of phandle to the local arbiters in the current Socs. Refer to bindings/memory-controllers/mediatek,smi-larb.yaml. It must sort @@ -167,8 +169,8 @@ examples: interrupts = <GIC_SPI 139 IRQ_TYPE_LEVEL_LOW>; clocks = <&infracfg CLK_INFRA_M4U>; clock-names = "bclk"; - mediatek,larbs = <&larb0 &larb1 &larb2 - &larb3 &larb4 &larb5>; + mediatek,larbs = <&larb0>, <&larb1>, <&larb2>, + <&larb3>, <&larb4>, <&larb5>; #iommu-cells = <1>; }; diff --git a/Documentation/devicetree/bindings/iommu/renesas,ipmmu-vmsa.yaml b/Documentation/devicetree/bindings/iommu/renesas,ipmmu-vmsa.yaml index ce0c715205c6..507853fcc746 100644 --- a/Documentation/devicetree/bindings/iommu/renesas,ipmmu-vmsa.yaml +++ b/Documentation/devicetree/bindings/iommu/renesas,ipmmu-vmsa.yaml @@ -66,6 +66,12 @@ properties: renesas,ipmmu-main: $ref: /schemas/types.yaml#/definitions/phandle-array + items: + - items: + - description: phandle to main IPMMU + - description: the interrupt bit number associated with the particular + cache IPMMU device. The interrupt bit number needs to match the main + IPMMU IMSSTR register. Only used by cache IPMMU instances. description: Reference to the main IPMMU phandle plus 1 cell. The cell is the interrupt bit number associated with the particular cache IPMMU diff --git a/Documentation/devicetree/bindings/leds/backlight/led-backlight.yaml b/Documentation/devicetree/bindings/leds/backlight/led-backlight.yaml index 625082bf3892..f5822f4ea667 100644 --- a/Documentation/devicetree/bindings/leds/backlight/led-backlight.yaml +++ b/Documentation/devicetree/bindings/leds/backlight/led-backlight.yaml @@ -23,6 +23,8 @@ properties: leds: description: A list of LED nodes $ref: /schemas/types.yaml#/definitions/phandle-array + items: + maxItems: 1 brightness-levels: description: diff --git a/Documentation/devicetree/bindings/media/allwinner,sun4i-a10-video-engine.yaml b/Documentation/devicetree/bindings/media/allwinner,sun4i-a10-video-engine.yaml index c3de96d10396..ee7fc3515d89 100644 --- a/Documentation/devicetree/bindings/media/allwinner,sun4i-a10-video-engine.yaml +++ b/Documentation/devicetree/bindings/media/allwinner,sun4i-a10-video-engine.yaml @@ -48,6 +48,10 @@ properties: allwinner,sram: $ref: /schemas/types.yaml#/definitions/phandle-array + items: + - items: + - description: phandle to SRAM + - description: register value for device description: Phandle to the device SRAM iommus: diff --git a/Documentation/devicetree/bindings/media/nxp,imx8mq-mipi-csi2.yaml b/Documentation/devicetree/bindings/media/nxp,imx8mq-mipi-csi2.yaml index 9c04fa85ee5c..d13c9233a7c8 100644 --- a/Documentation/devicetree/bindings/media/nxp,imx8mq-mipi-csi2.yaml +++ b/Documentation/devicetree/bindings/media/nxp,imx8mq-mipi-csi2.yaml @@ -58,11 +58,11 @@ properties: req_gpr is the gpr register offset of RX_ENABLE for the mipi phy. $ref: /schemas/types.yaml#/definitions/phandle-array items: - items: - - description: The 'gpr' is the phandle to general purpose register node. - - description: The 'req_gpr' is the gpr register offset containing - CSI2_1_RX_ENABLE or CSI2_2_RX_ENABLE respectively. - maximum: 0xff + - items: + - description: The 'gpr' is the phandle to general purpose register node. + - description: The 'req_gpr' is the gpr register offset containing + CSI2_1_RX_ENABLE or CSI2_2_RX_ENABLE respectively. + maximum: 0xff interconnects: maxItems: 1 diff --git a/Documentation/devicetree/bindings/media/ti,cal.yaml b/Documentation/devicetree/bindings/media/ti,cal.yaml index 66c5d392fa75..7e078424ca4d 100644 --- a/Documentation/devicetree/bindings/media/ti,cal.yaml +++ b/Documentation/devicetree/bindings/media/ti,cal.yaml @@ -48,6 +48,10 @@ properties: ti,camerrx-control: $ref: "/schemas/types.yaml#/definitions/phandle-array" + items: + - items: + - description: phandle to device control module + - description: offset to the control_camerarx_core register description: phandle to the device control module and offset to the control_camerarx_core register diff --git a/Documentation/devicetree/bindings/memory-controllers/mediatek,smi-larb.yaml b/Documentation/devicetree/bindings/memory-controllers/mediatek,smi-larb.yaml index eaeff1ada7f8..822ade9e9bab 100644 --- a/Documentation/devicetree/bindings/memory-controllers/mediatek,smi-larb.yaml +++ b/Documentation/devicetree/bindings/memory-controllers/mediatek,smi-larb.yaml @@ -52,7 +52,7 @@ properties: maxItems: 1 mediatek,smi: - $ref: /schemas/types.yaml#/definitions/phandle-array + $ref: /schemas/types.yaml#/definitions/phandle description: a phandle to the smi_common node. mediatek,larb-id: diff --git a/Documentation/devicetree/bindings/memory-controllers/samsung,exynos5422-dmc.yaml b/Documentation/devicetree/bindings/memory-controllers/samsung,exynos5422-dmc.yaml index fe8639dcffab..895c3b5c9aaa 100644 --- a/Documentation/devicetree/bindings/memory-controllers/samsung,exynos5422-dmc.yaml +++ b/Documentation/devicetree/bindings/memory-controllers/samsung,exynos5422-dmc.yaml @@ -45,6 +45,8 @@ properties: $ref: '/schemas/types.yaml#/definitions/phandle-array' minItems: 1 maxItems: 16 + items: + maxItems: 1 description: phandles of the PPMU events used by the controller. device-handle: diff --git a/Documentation/devicetree/bindings/net/allwinner,sun4i-a10-emac.yaml b/Documentation/devicetree/bindings/net/allwinner,sun4i-a10-emac.yaml index 8d8560a67abf..098b2bf7d976 100644 --- a/Documentation/devicetree/bindings/net/allwinner,sun4i-a10-emac.yaml +++ b/Documentation/devicetree/bindings/net/allwinner,sun4i-a10-emac.yaml @@ -29,6 +29,10 @@ properties: allwinner,sram: description: Phandle to the device SRAM $ref: /schemas/types.yaml#/definitions/phandle-array + items: + - items: + - description: phandle to SRAM + - description: register value for device required: - compatible diff --git a/Documentation/devicetree/bindings/net/can/bosch,c_can.yaml b/Documentation/devicetree/bindings/net/can/bosch,c_can.yaml index 2cd145a642f1..8bad328b184d 100644 --- a/Documentation/devicetree/bindings/net/can/bosch,c_can.yaml +++ b/Documentation/devicetree/bindings/net/can/bosch,c_can.yaml @@ -56,10 +56,10 @@ properties: offset). $ref: /schemas/types.yaml#/definitions/phandle-array items: - items: - - description: The phandle to the system control region. - - description: The register offset. - - description: The CAN instance number. + - items: + - description: The phandle to the system control region. + - description: The register offset. + - description: The CAN instance number. resets: maxItems: 1 diff --git a/Documentation/devicetree/bindings/net/can/fsl,flexcan.yaml b/Documentation/devicetree/bindings/net/can/fsl,flexcan.yaml index 3f0ee17c1461..e52db841bb8c 100644 --- a/Documentation/devicetree/bindings/net/can/fsl,flexcan.yaml +++ b/Documentation/devicetree/bindings/net/can/fsl,flexcan.yaml @@ -84,12 +84,12 @@ properties: req_bit is the bit offset of CAN stop request. $ref: /schemas/types.yaml#/definitions/phandle-array items: - items: - - description: The 'gpr' is the phandle to general purpose register node. - - description: The 'req_gpr' is the gpr register offset of CAN stop request. - maximum: 0xff - - description: The 'req_bit' is the bit offset of CAN stop request. - maximum: 0x1f + - items: + - description: The 'gpr' is the phandle to general purpose register node. + - description: The 'req_gpr' is the gpr register offset of CAN stop request. + maximum: 0xff + - description: The 'req_bit' is the bit offset of CAN stop request. + maximum: 0x1f fsl,clk-source: description: | diff --git a/Documentation/devicetree/bindings/net/dsa/dsa-port.yaml b/Documentation/devicetree/bindings/net/dsa/dsa-port.yaml index 702df848a71d..c504feeec6db 100644 --- a/Documentation/devicetree/bindings/net/dsa/dsa-port.yaml +++ b/Documentation/devicetree/bindings/net/dsa/dsa-port.yaml @@ -34,6 +34,8 @@ properties: full routing information must be given, not just the one hop routes to neighbouring switches $ref: /schemas/types.yaml#/definitions/phandle-array + items: + maxItems: 1 ethernet: description: diff --git a/Documentation/devicetree/bindings/net/fsl,fec.yaml b/Documentation/devicetree/bindings/net/fsl,fec.yaml index fd8371e31867..daa2f79a294f 100644 --- a/Documentation/devicetree/bindings/net/fsl,fec.yaml +++ b/Documentation/devicetree/bindings/net/fsl,fec.yaml @@ -158,11 +158,13 @@ properties: fsl,stop-mode: $ref: /schemas/types.yaml#/definitions/phandle-array + items: + - items: + - description: phandle to general purpose register node + - description: the gpr register offset for ENET stop request + - description: the gpr bit offset for ENET stop request description: Register bits of stop mode control, the format is <&gpr req_gpr req_bit>. - gpr is the phandle to general purpose register node. - req_gpr is the gpr register offset for ENET stop request. - req_bit is the gpr bit offset for ENET stop request. mdio: $ref: mdio.yaml# diff --git a/Documentation/devicetree/bindings/net/intel,ixp4xx-ethernet.yaml b/Documentation/devicetree/bindings/net/intel,ixp4xx-ethernet.yaml index 67eaf02dda80..4e1b79818aff 100644 --- a/Documentation/devicetree/bindings/net/intel,ixp4xx-ethernet.yaml +++ b/Documentation/devicetree/bindings/net/intel,ixp4xx-ethernet.yaml @@ -29,12 +29,18 @@ properties: queue-rx: $ref: '/schemas/types.yaml#/definitions/phandle-array' - maxItems: 1 + items: + - items: + - description: phandle to the RX queue node + - description: RX queue instance to use description: phandle to the RX queue on the NPE queue-txready: $ref: '/schemas/types.yaml#/definitions/phandle-array' - maxItems: 1 + items: + - items: + - description: phandle to the TX READY queue node + - description: TX READY queue instance to use description: phandle to the TX READY queue on the NPE phy-mode: true @@ -43,7 +49,10 @@ properties: intel,npe-handle: $ref: '/schemas/types.yaml#/definitions/phandle-array' - maxItems: 1 + items: + - items: + - description: phandle to the NPE this ethernet instance is using + - description: the NPE instance to use description: phandle to the NPE this ethernet instance is using and the instance to use in the second cell diff --git a/Documentation/devicetree/bindings/net/intel,ixp4xx-hss.yaml b/Documentation/devicetree/bindings/net/intel,ixp4xx-hss.yaml index 4dcd53c3e0b4..e6329febb60c 100644 --- a/Documentation/devicetree/bindings/net/intel,ixp4xx-hss.yaml +++ b/Documentation/devicetree/bindings/net/intel,ixp4xx-hss.yaml @@ -25,39 +25,62 @@ properties: intel,npe-handle: $ref: '/schemas/types.yaml#/definitions/phandle-array' - maxItems: 1 + items: + items: + - description: phandle to the NPE this HSS instance is using + - description: the NPE instance number description: phandle to the NPE this HSS instance is using and the instance to use in the second cell intel,queue-chl-rxtrig: $ref: '/schemas/types.yaml#/definitions/phandle-array' - maxItems: 1 + items: + - items: + - description: phandle to the RX trigger queue on the NPE + - description: the queue instance number description: phandle to the RX trigger queue on the NPE intel,queue-chl-txready: $ref: '/schemas/types.yaml#/definitions/phandle-array' - maxItems: 1 + items: + - items: + - description: phandle to the TX ready queue on the NPE + - description: the queue instance number description: phandle to the TX ready queue on the NPE intel,queue-pkt-rx: $ref: '/schemas/types.yaml#/definitions/phandle-array' - maxItems: 1 + items: + - items: + - description: phandle to the RX queue on the NPE + - description: the queue instance number description: phandle to the packet RX queue on the NPE intel,queue-pkt-tx: $ref: '/schemas/types.yaml#/definitions/phandle-array' maxItems: 4 + items: + items: + - description: phandle to the TX queue on the NPE + - description: the queue instance number description: phandle to the packet TX0, TX1, TX2 and TX3 queues on the NPE intel,queue-pkt-rxfree: $ref: '/schemas/types.yaml#/definitions/phandle-array' maxItems: 4 + items: + items: + - description: phandle to the RXFREE queue on the NPE + - description: the queue instance number description: phandle to the packet RXFREE0, RXFREE1, RXFREE2 and RXFREE3 queues on the NPE intel,queue-pkt-txdone: $ref: '/schemas/types.yaml#/definitions/phandle-array' - maxItems: 1 + items: + - items: + - description: phandle to the TXDONE queue on the NPE + - description: the queue instance number description: phandle to the packet TXDONE queue on the NPE cts-gpios: diff --git a/Documentation/devicetree/bindings/net/nxp,dwmac-imx.yaml b/Documentation/devicetree/bindings/net/nxp,dwmac-imx.yaml index ee4afe361fac..011363166789 100644 --- a/Documentation/devicetree/bindings/net/nxp,dwmac-imx.yaml +++ b/Documentation/devicetree/bindings/net/nxp,dwmac-imx.yaml @@ -54,6 +54,10 @@ properties: intf_mode: $ref: /schemas/types.yaml#/definitions/phandle-array + items: + - items: + - description: phandle to the GPR syscon + - description: the offset of the GPR register description: Should be phandle/offset pair. The phandle to the syscon node which encompases the GPR register, and the offset of the GPR register. diff --git a/Documentation/devicetree/bindings/net/socionext,uniphier-ave4.yaml b/Documentation/devicetree/bindings/net/socionext,uniphier-ave4.yaml index aad5a9f3f962..1ab41cfdb865 100644 --- a/Documentation/devicetree/bindings/net/socionext,uniphier-ave4.yaml +++ b/Documentation/devicetree/bindings/net/socionext,uniphier-ave4.yaml @@ -66,6 +66,10 @@ properties: socionext,syscon-phy-mode: $ref: /schemas/types.yaml#/definitions/phandle-array + items: + - items: + - description: phandle to syscon that configures phy mode + - description: ID of MAC instance description: A phandle to syscon with one argument that configures phy mode. The argument is the ID of MAC instance. diff --git a/Documentation/devicetree/bindings/net/stm32-dwmac.yaml b/Documentation/devicetree/bindings/net/stm32-dwmac.yaml index 3d8a3b763ae6..89a858de68af 100644 --- a/Documentation/devicetree/bindings/net/stm32-dwmac.yaml +++ b/Documentation/devicetree/bindings/net/stm32-dwmac.yaml @@ -74,6 +74,10 @@ properties: st,syscon: $ref: "/schemas/types.yaml#/definitions/phandle-array" + items: + - items: + - description: phandle to the syscon node which encompases the glue register + - description: offset of the control register description: Should be phandle/offset pair. The phandle to the syscon node which encompases the glue register, and the offset of the control register diff --git a/Documentation/devicetree/bindings/net/ti,k3-am654-cpsw-nuss.yaml b/Documentation/devicetree/bindings/net/ti,k3-am654-cpsw-nuss.yaml index 4b97a0f1175b..c6596fad5b20 100644 --- a/Documentation/devicetree/bindings/net/ti,k3-am654-cpsw-nuss.yaml +++ b/Documentation/devicetree/bindings/net/ti,k3-am654-cpsw-nuss.yaml @@ -136,6 +136,11 @@ properties: ti,syscon-efuse: $ref: /schemas/types.yaml#/definitions/phandle-array + items: + - items: + - description: Phandle to the system control device node which + provides access to efuse + - description: offset to efuse registers??? description: Phandle to the system control device node which provides access to efuse IO range with MAC addresses diff --git a/Documentation/devicetree/bindings/net/wireless/mediatek,mt76.yaml b/Documentation/devicetree/bindings/net/wireless/mediatek,mt76.yaml index 269cd63fb544..42e1f4dddca8 100644 --- a/Documentation/devicetree/bindings/net/wireless/mediatek,mt76.yaml +++ b/Documentation/devicetree/bindings/net/wireless/mediatek,mt76.yaml @@ -54,6 +54,10 @@ properties: mediatek,mtd-eeprom: $ref: /schemas/types.yaml#/definitions/phandle-array + items: + - items: + - description: phandle to MTD partition + - description: offset containing EEPROM data description: Phandle to a MTD partition + offset containing EEPROM data diff --git a/Documentation/devicetree/bindings/opp/opp-v2-base.yaml b/Documentation/devicetree/bindings/opp/opp-v2-base.yaml index 15a76bcd6d42..da0f09eedc0c 100644 --- a/Documentation/devicetree/bindings/opp/opp-v2-base.yaml +++ b/Documentation/devicetree/bindings/opp/opp-v2-base.yaml @@ -177,6 +177,8 @@ patternProperties: for the functioning of the current device at the current OPP (where this property is present). $ref: /schemas/types.yaml#/definitions/phandle-array + items: + maxItems: 1 patternProperties: '^opp-microvolt-': diff --git a/Documentation/devicetree/bindings/perf/arm,dsu-pmu.yaml b/Documentation/devicetree/bindings/perf/arm,dsu-pmu.yaml index aef63a542f34..c87821be158b 100644 --- a/Documentation/devicetree/bindings/perf/arm,dsu-pmu.yaml +++ b/Documentation/devicetree/bindings/perf/arm,dsu-pmu.yaml @@ -35,6 +35,8 @@ properties: $ref: /schemas/types.yaml#/definitions/phandle-array minItems: 1 maxItems: 12 + items: + maxItems: 1 description: List of phandles for the CPUs connected to this DSU instance. required: diff --git a/Documentation/devicetree/bindings/phy/intel,combo-phy.yaml b/Documentation/devicetree/bindings/phy/intel,combo-phy.yaml index 347d0cdfb80d..5d54b0a0e873 100644 --- a/Documentation/devicetree/bindings/phy/intel,combo-phy.yaml +++ b/Documentation/devicetree/bindings/phy/intel,combo-phy.yaml @@ -47,10 +47,18 @@ properties: intel,syscfg: $ref: /schemas/types.yaml#/definitions/phandle-array + items: + - items: + - description: phandle to Chip configuration registers + - description: ComboPhy instance id description: Chip configuration registers handle and ComboPhy instance id intel,hsio: $ref: /schemas/types.yaml#/definitions/phandle-array + items: + - items: + - description: phandle to HSIO registers + - description: ComboPhy instance id description: HSIO registers handle and ComboPhy instance id on NOC intel,aggregation: diff --git a/Documentation/devicetree/bindings/phy/ti,omap-usb2.yaml b/Documentation/devicetree/bindings/phy/ti,omap-usb2.yaml index cbbf5e8b1197..51c8a36e61f0 100644 --- a/Documentation/devicetree/bindings/phy/ti,omap-usb2.yaml +++ b/Documentation/devicetree/bindings/phy/ti,omap-usb2.yaml @@ -45,6 +45,10 @@ properties: syscon-phy-power: $ref: /schemas/types.yaml#/definitions/phandle-array + items: + - items: + - description: phandle to the system control module + - description: register offset to power on/off the PHY description: phandle/offset pair. Phandle to the system control module and register offset to power on/off the PHY. diff --git a/Documentation/devicetree/bindings/pinctrl/aspeed,ast2500-pinctrl.yaml b/Documentation/devicetree/bindings/pinctrl/aspeed,ast2500-pinctrl.yaml index d316cc082107..acd60c85b4cc 100644 --- a/Documentation/devicetree/bindings/pinctrl/aspeed,ast2500-pinctrl.yaml +++ b/Documentation/devicetree/bindings/pinctrl/aspeed,ast2500-pinctrl.yaml @@ -29,6 +29,8 @@ properties: aspeed,external-nodes: minItems: 2 maxItems: 2 + items: + maxItems: 1 $ref: /schemas/types.yaml#/definitions/phandle-array description: | A cell of phandles to external controller nodes: diff --git a/Documentation/devicetree/bindings/pinctrl/canaan,k210-fpioa.yaml b/Documentation/devicetree/bindings/pinctrl/canaan,k210-fpioa.yaml index a44691d9c57d..53e963e090f2 100644 --- a/Documentation/devicetree/bindings/pinctrl/canaan,k210-fpioa.yaml +++ b/Documentation/devicetree/bindings/pinctrl/canaan,k210-fpioa.yaml @@ -39,6 +39,10 @@ properties: canaan,k210-sysctl-power: $ref: /schemas/types.yaml#/definitions/phandle-array + items: + - items: + - description: phandle of the K210 system controller node + - description: offset of its power domain control register description: | phandle of the K210 system controller node and offset of its power domain control register. diff --git a/Documentation/devicetree/bindings/pinctrl/mediatek,mt65xx-pinctrl.yaml b/Documentation/devicetree/bindings/pinctrl/mediatek,mt65xx-pinctrl.yaml index 6953c958ff7c..161088a8be33 100644 --- a/Documentation/devicetree/bindings/pinctrl/mediatek,mt65xx-pinctrl.yaml +++ b/Documentation/devicetree/bindings/pinctrl/mediatek,mt65xx-pinctrl.yaml @@ -44,6 +44,8 @@ properties: mediatek,pctl-regmap: $ref: /schemas/types.yaml#/definitions/phandle-array + items: + maxItems: 1 minItems: 1 maxItems: 2 description: | diff --git a/Documentation/devicetree/bindings/pinctrl/st,stm32-pinctrl.yaml b/Documentation/devicetree/bindings/pinctrl/st,stm32-pinctrl.yaml index 83a18d0331b1..335ffc1353b5 100644 --- a/Documentation/devicetree/bindings/pinctrl/st,stm32-pinctrl.yaml +++ b/Documentation/devicetree/bindings/pinctrl/st,stm32-pinctrl.yaml @@ -41,11 +41,13 @@ properties: maxItems: 1 st,syscfg: - description: Should be phandle/offset/mask - - Phandle to the syscon node which includes IRQ mux selection. - - The offset of the IRQ mux selection register. - - The field mask of IRQ mux, needed if different of 0xf. + description: Phandle+args to the syscon node which includes IRQ mux selection. $ref: "/schemas/types.yaml#/definitions/phandle-array" + items: + - items: + - description: syscon node which includes IRQ mux selection + - description: The offset of the IRQ mux selection register + - description: The field mask of IRQ mux, needed if different of 0xf st,package: description: diff --git a/Documentation/devicetree/bindings/power/power-domain.yaml b/Documentation/devicetree/bindings/power/power-domain.yaml index 3143ed9a3313..889091b9814f 100644 --- a/Documentation/devicetree/bindings/power/power-domain.yaml +++ b/Documentation/devicetree/bindings/power/power-domain.yaml @@ -29,6 +29,8 @@ properties: domain-idle-states: $ref: /schemas/types.yaml#/definitions/phandle-array + items: + maxItems: 1 description: | Phandles of idle states that defines the available states for the power-domain provider. The idle state definitions are compatible with the @@ -42,6 +44,8 @@ properties: operating-points-v2: $ref: /schemas/types.yaml#/definitions/phandle-array + items: + maxItems: 1 description: Phandles to the OPP tables of power domains provided by a power domain provider. If the provider provides a single power domain only or all diff --git a/Documentation/devicetree/bindings/power/renesas,apmu.yaml b/Documentation/devicetree/bindings/power/renesas,apmu.yaml index 391897d897f2..4d293b2b2f84 100644 --- a/Documentation/devicetree/bindings/power/renesas,apmu.yaml +++ b/Documentation/devicetree/bindings/power/renesas,apmu.yaml @@ -35,6 +35,8 @@ properties: cpus: $ref: /schemas/types.yaml#/definitions/phandle-array + items: + maxItems: 1 description: | Array of phandles pointing to CPU cores, which should match the order of CPU cores used by the WUPCR and PSTR registers in the Advanced Power diff --git a/Documentation/devicetree/bindings/power/rockchip,power-controller.yaml b/Documentation/devicetree/bindings/power/rockchip,power-controller.yaml index 9b9d71087466..3deb0fc8dfd3 100644 --- a/Documentation/devicetree/bindings/power/rockchip,power-controller.yaml +++ b/Documentation/devicetree/bindings/power/rockchip,power-controller.yaml @@ -129,6 +129,8 @@ $defs: pm_qos: $ref: /schemas/types.yaml#/definitions/phandle-array + items: + maxItems: 1 description: | A number of phandles to qos blocks which need to be saved and restored while power domain switches state. diff --git a/Documentation/devicetree/bindings/power/supply/cw2015_battery.yaml b/Documentation/devicetree/bindings/power/supply/cw2015_battery.yaml index c73abb2ff513..2dda91587dc3 100644 --- a/Documentation/devicetree/bindings/power/supply/cw2015_battery.yaml +++ b/Documentation/devicetree/bindings/power/supply/cw2015_battery.yaml @@ -14,6 +14,9 @@ description: | phandle in monitored-battery. If specified the driver uses the charge-full-design-microamp-hours property of the battery. +allOf: + - $ref: power-supply.yaml# + properties: compatible: const: cellwise,cw2015 @@ -37,9 +40,6 @@ properties: minimum: 250 power-supplies: - description: - Specifies supplies used for charging the battery connected to this gauge - $ref: /schemas/types.yaml#/definitions/phandle-array minItems: 1 maxItems: 8 # Should be enough diff --git a/Documentation/devicetree/bindings/power/supply/power-supply.yaml b/Documentation/devicetree/bindings/power/supply/power-supply.yaml index 259760167759..531b67225c74 100644 --- a/Documentation/devicetree/bindings/power/supply/power-supply.yaml +++ b/Documentation/devicetree/bindings/power/supply/power-supply.yaml @@ -12,6 +12,8 @@ maintainers: properties: power-supplies: $ref: /schemas/types.yaml#/definitions/phandle-array + items: + maxItems: 1 description: This property is added to a supply in order to list the devices which supply it power, referenced by their phandles. diff --git a/Documentation/devicetree/bindings/regulator/regulator.yaml b/Documentation/devicetree/bindings/regulator/regulator.yaml index ed560ee8714e..a9b66ececccf 100644 --- a/Documentation/devicetree/bindings/regulator/regulator.yaml +++ b/Documentation/devicetree/bindings/regulator/regulator.yaml @@ -213,6 +213,8 @@ properties: is 2-way - all coupled regulators should be linked with each other. A regulator should not be coupled with its supplier. $ref: "/schemas/types.yaml#/definitions/phandle-array" + items: + maxItems: 1 regulator-coupled-max-spread: description: Array of maximum spread between voltages of coupled regulators diff --git a/Documentation/devicetree/bindings/regulator/st,stm32-booster.yaml b/Documentation/devicetree/bindings/regulator/st,stm32-booster.yaml index df0191b1ceba..38bdaef4fa39 100644 --- a/Documentation/devicetree/bindings/regulator/st,stm32-booster.yaml +++ b/Documentation/devicetree/bindings/regulator/st,stm32-booster.yaml @@ -23,7 +23,7 @@ properties: - st,stm32mp1-booster st,syscfg: - $ref: "/schemas/types.yaml#/definitions/phandle-array" + $ref: "/schemas/types.yaml#/definitions/phandle" description: phandle to system configuration controller. vdda-supply: diff --git a/Documentation/devicetree/bindings/remoteproc/qcom,adsp.yaml b/Documentation/devicetree/bindings/remoteproc/qcom,adsp.yaml index c635c181d2c2..bcad8f4080d4 100644 --- a/Documentation/devicetree/bindings/remoteproc/qcom,adsp.yaml +++ b/Documentation/devicetree/bindings/remoteproc/qcom,adsp.yaml @@ -115,6 +115,12 @@ properties: qcom,halt-regs: $ref: /schemas/types.yaml#/definitions/phandle-array + items: + - items: + - description: Phandle reference to a syscon representing TCSR + - description: offsets within syscon for q6 halt registers + - description: offsets within syscon for modem halt registers + - description: offsets within syscon for nc halt registers description: Phandle reference to a syscon representing TCSR followed by the three offsets within syscon for q6, modem and nc halt registers. diff --git a/Documentation/devicetree/bindings/remoteproc/st,stm32-rproc.yaml b/Documentation/devicetree/bindings/remoteproc/st,stm32-rproc.yaml index b587c97c282b..be3d9b0e876b 100644 --- a/Documentation/devicetree/bindings/remoteproc/st,stm32-rproc.yaml +++ b/Documentation/devicetree/bindings/remoteproc/st,stm32-rproc.yaml @@ -29,17 +29,22 @@ properties: st,syscfg-holdboot: description: remote processor reset hold boot - - Phandle of syscon block. - - The offset of the hold boot setting register. - - The field mask of the hold boot. $ref: "/schemas/types.yaml#/definitions/phandle-array" - maxItems: 1 + items: + - items: + - description: Phandle of syscon block + - description: The offset of the hold boot setting register + - description: The field mask of the hold boot st,syscfg-tz: description: Reference to the system configuration which holds the RCC trust zone mode $ref: "/schemas/types.yaml#/definitions/phandle-array" - maxItems: 1 + items: + - items: + - description: Phandle of syscon block + - description: FIXME + - description: FIXME interrupts: description: Should contain the WWDG1 watchdog reset interrupt @@ -93,20 +98,32 @@ properties: $ref: "/schemas/types.yaml#/definitions/phandle-array" description: | Reference to the system configuration which holds the remote - maxItems: 1 + items: + - items: + - description: Phandle of syscon block + - description: FIXME + - description: FIXME st,syscfg-m4-state: $ref: "/schemas/types.yaml#/definitions/phandle-array" description: | Reference to the tamp register which exposes the Cortex-M4 state. - maxItems: 1 + items: + - items: + - description: Phandle of syscon block with the tamp register + - description: FIXME + - description: FIXME st,syscfg-rsc-tbl: $ref: "/schemas/types.yaml#/definitions/phandle-array" description: | Reference to the tamp register which references the Cortex-M4 resource table address. - maxItems: 1 + items: + - items: + - description: Phandle of syscon block with the tamp register + - description: FIXME + - description: FIXME st,auto-boot: $ref: /schemas/types.yaml#/definitions/flag diff --git a/Documentation/devicetree/bindings/remoteproc/ti,k3-dsp-rproc.yaml b/Documentation/devicetree/bindings/remoteproc/ti,k3-dsp-rproc.yaml index 7b56497eec4d..4323cefdf19b 100644 --- a/Documentation/devicetree/bindings/remoteproc/ti,k3-dsp-rproc.yaml +++ b/Documentation/devicetree/bindings/remoteproc/ti,k3-dsp-rproc.yaml @@ -79,6 +79,8 @@ properties: $ref: /schemas/types.yaml#/definitions/phandle-array minItems: 1 maxItems: 4 + items: + maxItems: 1 description: | phandles to one or more reserved on-chip SRAM regions. The regions should be defined as child nodes of the respective SRAM node, and diff --git a/Documentation/devicetree/bindings/remoteproc/ti,k3-r5f-rproc.yaml b/Documentation/devicetree/bindings/remoteproc/ti,k3-r5f-rproc.yaml index d9c7e8c2b268..0f2bb06cb7b4 100644 --- a/Documentation/devicetree/bindings/remoteproc/ti,k3-r5f-rproc.yaml +++ b/Documentation/devicetree/bindings/remoteproc/ti,k3-r5f-rproc.yaml @@ -189,6 +189,8 @@ patternProperties: $ref: /schemas/types.yaml#/definitions/phandle-array minItems: 1 maxItems: 4 + items: + maxItems: 1 description: | phandles to one or more reserved on-chip SRAM regions. The regions should be defined as child nodes of the respective SRAM node, and diff --git a/Documentation/devicetree/bindings/remoteproc/ti,omap-remoteproc.yaml b/Documentation/devicetree/bindings/remoteproc/ti,omap-remoteproc.yaml index c6c12129d6b7..1fdc2741c36e 100644 --- a/Documentation/devicetree/bindings/remoteproc/ti,omap-remoteproc.yaml +++ b/Documentation/devicetree/bindings/remoteproc/ti,omap-remoteproc.yaml @@ -123,13 +123,14 @@ properties: ti,bootreg: $ref: /schemas/types.yaml#/definitions/phandle-array - description: | - Should be a triple of the phandle to the System Control - Configuration region that contains the boot address - register, the register offset of the boot address - register within the System Control module, and the bit - shift within the register. This property is required for - all the DSP instances on OMAP4, OMAP5 and DRA7xx SoCs. + items: + - items: + - description: phandle to the System Control Configuration region + - description: register offset of the boot address register + - description: the bit shift within the register + description: + This property is required for all the DSP instances on OMAP4, OMAP5 + and DRA7xx SoCs. ti,autosuspend-delay-ms: description: | @@ -140,6 +141,8 @@ properties: ti,timers: $ref: /schemas/types.yaml#/definitions/phandle-array + items: + maxItems: 1 description: | One or more phandles to OMAP DMTimer nodes, that serve as System/Tick timers for the OS running on the remote @@ -156,6 +159,8 @@ properties: ti,watchdog-timers: $ref: /schemas/types.yaml#/definitions/phandle-array + items: + maxItems: 1 description: | One or more phandles to OMAP DMTimer nodes, used to serve as Watchdog timers for the processor cores. This diff --git a/Documentation/devicetree/bindings/soc/samsung/exynos-usi.yaml b/Documentation/devicetree/bindings/soc/samsung/exynos-usi.yaml index 273f2d95a043..58f2e9d8bb0e 100644 --- a/Documentation/devicetree/bindings/soc/samsung/exynos-usi.yaml +++ b/Documentation/devicetree/bindings/soc/samsung/exynos-usi.yaml @@ -48,6 +48,10 @@ properties: samsung,sysreg: $ref: /schemas/types.yaml#/definitions/phandle-array + items: + - items: + - description: phandle to System Register syscon node + - description: offset of SW_CONF register for this USI controller description: Should be phandle/offset pair. The phandle to System Register syscon node (for the same domain where this USI controller resides) and the offset diff --git a/Documentation/devicetree/bindings/sound/samsung,aries-wm8994.yaml b/Documentation/devicetree/bindings/sound/samsung,aries-wm8994.yaml index 5fff586dc802..eb487ed3ca3b 100644 --- a/Documentation/devicetree/bindings/sound/samsung,aries-wm8994.yaml +++ b/Documentation/devicetree/bindings/sound/samsung,aries-wm8994.yaml @@ -27,6 +27,8 @@ properties: sound-dai: minItems: 2 maxItems: 2 + items: + maxItems: 1 $ref: /schemas/types.yaml#/definitions/phandle-array description: | phandles to the I2S controller and bluetooth codec, diff --git a/Documentation/devicetree/bindings/sound/samsung,midas-audio.yaml b/Documentation/devicetree/bindings/sound/samsung,midas-audio.yaml index 095775c598fa..3a4df2ce1728 100644 --- a/Documentation/devicetree/bindings/sound/samsung,midas-audio.yaml +++ b/Documentation/devicetree/bindings/sound/samsung,midas-audio.yaml @@ -21,8 +21,7 @@ properties: type: object properties: sound-dai: - $ref: /schemas/types.yaml#/definitions/phandle-array - maxItems: 1 + $ref: /schemas/types.yaml#/definitions/phandle description: phandle to the I2S controller required: - sound-dai diff --git a/Documentation/devicetree/bindings/sound/st,stm32-sai.yaml b/Documentation/devicetree/bindings/sound/st,stm32-sai.yaml index 1538d11ce9a8..d4fc8fdcb72f 100644 --- a/Documentation/devicetree/bindings/sound/st,stm32-sai.yaml +++ b/Documentation/devicetree/bindings/sound/st,stm32-sai.yaml @@ -102,9 +102,11 @@ patternProperties: By default SAI sub-block is in asynchronous mode. Must contain the phandle and index of the SAI sub-block providing the synchronization. - allOf: - - $ref: /schemas/types.yaml#/definitions/phandle-array - - maxItems: 1 + $ref: /schemas/types.yaml#/definitions/phandle-array + items: + - items: + - description: phandle of the SAI sub-block + - description: index of the SAI sub-block st,iec60958: description: diff --git a/Documentation/devicetree/bindings/thermal/thermal-cooling-devices.yaml b/Documentation/devicetree/bindings/thermal/thermal-cooling-devices.yaml index f004779ba9b3..850a9841b110 100644 --- a/Documentation/devicetree/bindings/thermal/thermal-cooling-devices.yaml +++ b/Documentation/devicetree/bindings/thermal/thermal-cooling-devices.yaml @@ -66,9 +66,9 @@ examples: compatible = "qcom,kryo385"; reg = <0x0 0x0>; enable-method = "psci"; - cpu-idle-states = <&LITTLE_CPU_SLEEP_0 - &LITTLE_CPU_SLEEP_1 - &CLUSTER_SLEEP_0>; + cpu-idle-states = <&LITTLE_CPU_SLEEP_0>, + <&LITTLE_CPU_SLEEP_1>, + <&CLUSTER_SLEEP_0>; capacity-dmips-mhz = <607>; dynamic-power-coefficient = <100>; qcom,freq-domain = <&cpufreq_hw 0>; diff --git a/Documentation/devicetree/bindings/thermal/thermal-idle.yaml b/Documentation/devicetree/bindings/thermal/thermal-idle.yaml index 6278ccf16f3f..cc938d7ad1f3 100644 --- a/Documentation/devicetree/bindings/thermal/thermal-idle.yaml +++ b/Documentation/devicetree/bindings/thermal/thermal-idle.yaml @@ -37,8 +37,8 @@ properties: exit-latency-us: description: | - The exit latency constraint in microsecond for the injected idle state - for the device. It is the latency constraint to apply when selecting an + The exit latency constraint in microsecond for the injected idle state + for the device. It is the latency constraint to apply when selecting an idle state from among all the present ones. required: @@ -65,7 +65,7 @@ examples: capacity-dmips-mhz = <1024>; dynamic-power-coefficient = <436>; #cooling-cells = <2>; /* min followed by max */ - cpu-idle-states = <&CPU_SLEEP &CLUSTER_SLEEP>; + cpu-idle-states = <&CPU_SLEEP>, <&CLUSTER_SLEEP>; thermal-idle { #cooling-cells = <2>; duration-us = <10000>; @@ -81,7 +81,7 @@ examples: capacity-dmips-mhz = <1024>; dynamic-power-coefficient = <436>; #cooling-cells = <2>; /* min followed by max */ - cpu-idle-states = <&CPU_SLEEP &CLUSTER_SLEEP>; + cpu-idle-states = <&CPU_SLEEP>, <&CLUSTER_SLEEP>; thermal-idle { #cooling-cells = <2>; duration-us = <10000>; diff --git a/Documentation/devicetree/bindings/usb/nvidia,tegra-xudc.yaml b/Documentation/devicetree/bindings/usb/nvidia,tegra-xudc.yaml index a39c76b89484..fd6e7c81426e 100644 --- a/Documentation/devicetree/bindings/usb/nvidia,tegra-xudc.yaml +++ b/Documentation/devicetree/bindings/usb/nvidia,tegra-xudc.yaml @@ -83,7 +83,7 @@ properties: - const: ss nvidia,xusb-padctl: - $ref: /schemas/types.yaml#/definitions/phandle-array + $ref: /schemas/types.yaml#/definitions/phandle description: phandle to the XUSB pad controller that is used to configure the USB pads used by the XUDC controller. -- 2.32.0

12 15

No sound on gpd pocket 3
by anthony tonitch 24 Jan '22

24 Jan '22

Hello, I have a problem I guess related to sof... I already asked on the irc #alsa(a)libera.chat and gnarface advised me to come and ask on this mailing list! I am struggling to make the sound of my gpd pocket 3 to work on linux (archlinux to be precise)! In fact, the sound is not supposed to work out of the box as other users tested it before me! but they all had the solution to set the dsp_driver and this didn't worked for me! I checked several times to see if the module was loaded properly and yes it is (as you can also check in the alsa-info at the end of the mail)! If I do aplay -l I get a bunch of hdmi connection that is not working at all! I'm really lost here and I don't even know what to look for anymore The sound works great on windows so This doens't seems to be hardware problem ?! and I tried to plug an usb headset which give me sound so I doesn't seems to be config related either ?! (tho the jack doesn't work) I asked on several places already. I post the different links here in case you want to check but I don't have any response to any post unfortunately! - Post on Archlinux BBS: https://bbs.archlinux.org/viewtopic.php?id=273044 - Post on subreddit GPDPocket: https://www.reddit.com/r/GPDPocket/comments/s31qi8/gpd_p3_no_sound_linux/ - Screenshot and bios picture of maybe relevant informations: - https://imgur.com/a/DouSB3m - https://imgur.com/a/K232PLJ I hope there is enough informations to help me debug this but if you need anything I can provide it! this is a small pc and I'm usualy quarrying it around! I know this is better to send mail but if you need me to chat for any reason (it would be easier for instance) I'm usually hanging on the libera.chat irc as tonitch you can pm or tag me on #alsa Here is the alsa-info.sh : http://alsa-project.org/db/?f=6ddb669a19086cebdb121c97c25bbdccb98e856d Thanks a lot for your help! PS: Ubuntu mate have released their official pocket 3 distribution and I tried it but the sound didn't worked either, here is the alsa-info In case this help ?! : http://alsa-project.org/db/?f=df4c183fd00cec224006ec8caa228705399ad873

2 1

[PATCH v1 1/1] ASoC: madera: Replace kernel.h with the necessary inclusions
by Andy Shevchenko 24 Jan '22

24 Jan '22

When kernel.h is used in the headers it adds a lot into dependency hell, especially when there are circular dependencies are involved. Replace kernel.h inclusion with the list of what is really being used. Signed-off-by: Andy Shevchenko <andriy.shevchenko(a)linux.intel.com> --- include/sound/madera-pdata.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/sound/madera-pdata.h b/include/sound/madera-pdata.h index e3060f48f108..58398d80c3de 100644 --- a/include/sound/madera-pdata.h +++ b/include/sound/madera-pdata.h @@ -9,7 +9,7 @@ #ifndef MADERA_CODEC_PDATA_H #define MADERA_CODEC_PDATA_H -#include <linux/kernel.h> +#include <linux/types.h> #define MADERA_MAX_INPUT 6 #define MADERA_MAX_MUXED_CHANNELS 4 -- 2.34.1

2 2