| Message ID | 20230814234235.87268-1-pierre-louis.bossart@linux.intel.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | c5556d8651b4c58e0d9894be5a0188c9c90ce899 |
| Headers | show |
| Series | ASoC: SOF: remove duplicate code due to merge | expand |
On 15/08/2023 02:42, Pierre-Louis Bossart wrote: > Commit 81113108491e ("ASoC: Merge up fixes") added the same code > twice, remove the extra call. Acked-by: Peter Ujfalusi <peter.ujfalusi@linux.intel.com> > Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com> > --- > sound/soc/sof/ipc4-topology.c | 3 --- > 1 file changed, 3 deletions(-) > > diff --git a/sound/soc/sof/ipc4-topology.c b/sound/soc/sof/ipc4-topology.c > index b43663822613..633f6040d712 100644 > --- a/sound/soc/sof/ipc4-topology.c > +++ b/sound/soc/sof/ipc4-topology.c > @@ -1734,9 +1734,6 @@ sof_ipc4_prepare_copier_module(struct snd_sof_widget *swidget, > /* update pipeline memory usage */ > sof_ipc4_update_resource_usage(sdev, swidget, &copier_data->base_config); > > - /* update pipeline memory usage */ > - sof_ipc4_update_resource_usage(sdev, swidget, &copier_data->base_config); > - > /* copy IPC data */ > memcpy(*ipc_config_data, (void *)copier_data, sizeof(*copier_data)); > if (gtw_cfg_config_length)
On Mon, 14 Aug 2023 18:42:35 -0500, Pierre-Louis Bossart wrote: > Commit 81113108491e ("ASoC: Merge up fixes") added the same code > twice, remove the extra call. > > Applied to https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-next Thanks! [1/1] ASoC: SOF: remove duplicate code due to merge commit: c5556d8651b4c58e0d9894be5a0188c9c90ce899 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/sof/ipc4-topology.c b/sound/soc/sof/ipc4-topology.c index b43663822613..633f6040d712 100644 --- a/sound/soc/sof/ipc4-topology.c +++ b/sound/soc/sof/ipc4-topology.c @@ -1734,9 +1734,6 @@ sof_ipc4_prepare_copier_module(struct snd_sof_widget *swidget, /* update pipeline memory usage */ sof_ipc4_update_resource_usage(sdev, swidget, &copier_data->base_config); - /* update pipeline memory usage */ - sof_ipc4_update_resource_usage(sdev, swidget, &copier_data->base_config); - /* copy IPC data */ memcpy(*ipc_config_data, (void *)copier_data, sizeof(*copier_data)); if (gtw_cfg_config_length)
Commit 81113108491e ("ASoC: Merge up fixes") added the same code twice, remove the extra call. Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com> --- sound/soc/sof/ipc4-topology.c | 3 --- 1 file changed, 3 deletions(-)