| Message ID | 20230123122144.1356890-1-cezary.rojewski@intel.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | f337703b229f6031a40199dfe050e04065cea0e8 |
| Headers | show |
| Series | ASoC: Intel: avs: Simplify probe-component implementation | expand |
On Mon, 23 Jan 2023 13:21:44 +0100, Cezary Rojewski wrote: > There is no need for the probe-component to be part of the PCM component > list as it does not make use of ASoC-topology and does not participate > in creating any PCM streams. > > To achieve that, remove probe() and remove() functions. > > > [...] Applied to broonie/sound.git for-next Thanks! [1/1] ASoC: Intel: avs: Simplify probe-component implementation commit: f337703b229f6031a40199dfe050e04065cea0e8 All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted. You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed. If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced. Please add any relevant lists and maintainers to the CCs when replying to this mail. Thanks, Mark
diff --git a/sound/soc/intel/avs/probes.c b/sound/soc/intel/avs/probes.c index 29d63f2a9616..b04f2d1a4c07 100644 --- a/sound/soc/intel/avs/probes.c +++ b/sound/soc/intel/avs/probes.c @@ -277,31 +277,8 @@ static struct snd_soc_dai_driver probe_cpu_dais[] = { }, }; -static int avs_probe_component_probe(struct snd_soc_component *component) -{ - struct avs_soc_component *acomp = to_avs_soc_component(component); - struct avs_dev *adev = to_avs_dev(component->dev); - - mutex_lock(&adev->comp_list_mutex); - list_add_tail(&acomp->node, &adev->comp_list); - mutex_unlock(&adev->comp_list_mutex); - return 0; -} - -static void avs_probe_component_remove(struct snd_soc_component *component) -{ - struct avs_soc_component *acomp = to_avs_soc_component(component); - struct avs_dev *adev = to_avs_dev(component->dev); - - mutex_lock(&adev->comp_list_mutex); - list_del(&acomp->node); - mutex_unlock(&adev->comp_list_mutex); -} - static const struct snd_soc_component_driver avs_probe_component_driver = { .name = "avs-probe-compr", - .probe = avs_probe_component_probe, - .remove = avs_probe_component_remove, .compress_ops = &avs_probe_compress_ops, .module_get_upon_open = 1, /* increment refcount when a stream is opened */ };
There is no need for the probe-component to be part of the PCM component list as it does not make use of ASoC-topology and does not participate in creating any PCM streams. To achieve that, remove probe() and remove() functions. Fixes: ed914a2a45a4 ("ASoC: Intel: avs: Data probing soc-component") Signed-off-by: Cezary Rojewski <cezary.rojewski@intel.com> --- This change should be part of the initial series [1] from the get-go, differences between the internal tree and the external one caused me to miss the change when upstreaming. And thus the "fixes" tag. [1]: https://lore.kernel.org/all/20221202152841.672536-1-cezary.rojewski@intel.com/ sound/soc/intel/avs/probes.c | 23 ----------------------- 1 file changed, 23 deletions(-)