Applied "ASoC: mt6797: sub dai use list_head" to the asoc tree
Subsystems (3)
Mark Brown
maintainerThe patch
ASoC: mt6797: sub dai use list_head
has been applied to the asoc tree at
https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git
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
Quoted 1 line
From
c1d9b4196ba6b311bd48a9320cd46aa125e0b034Mon Sep 17 00:00:00 2001
From: KaiChieh Chuang <[email protected]>
Date: Fri, 29 Jun 2018 20:29:45 +0800
Subject: [PATCH] ASoC: mt6797: sub dai use list_head
--- sound/soc/mediatek/mt6797/mt6797-afe-common.h | 1 + sound/soc/mediatek/mt6797/mt6797-afe-pcm.c | 65 +++++++++++++------ sound/soc/mediatek/mt6797/mt6797-dai-adda.c | 20 ++++-- .../soc/mediatek/mt6797/mt6797-dai-hostless.c | 16 +++-- sound/soc/mediatek/mt6797/mt6797-dai-pcm.c | 19 ++++-- 5 files changed, 81 insertions(+), 40 deletions(-)
sound/soc/mediatek/mt6797/mt6797-afe-common.h +1 -0
@@ -10,6 +10,7 @@#define _MT_6797_AFE_COMMON_H_#include <sound/soc.h> +#include <linux/list.h> #include <linux/regmap.h> #include "../common/mtk-base-afe.h"
sound/soc/mediatek/mt6797/mt6797-afe-pcm.c +44 -21
79 lines not on this page · raw message
sound/soc/mediatek/mt6797/mt6797-dai-adda.c +13 -7
@@ -383,14 +383,20 @@ static struct snd_soc_dai_driver mtk_dai_adda_driver[] = {int mt6797_dai_adda_register (struct mtk_base_afe *afe) { -int id =MT6797_DAI_ADDA ; +struct mtk_base_afe_dai *dai; - afe->sub_dais[id].dai_drivers = mtk_dai_adda_driver; - afe->sub_dais[id].num_dai_drivers =ARRAY_SIZE (mtk_dai_adda_driver); + dai =devm_kzalloc (afe->dev,sizeof (*dai),GFP_KERNEL ); +if (!dai) +return -ENOMEM ; - afe->sub_dais[id].dapm_widgets = mtk_dai_adda_widgets; - afe->sub_dais[id].num_dapm_widgets =ARRAY_SIZE (mtk_dai_adda_widgets); - afe->sub_dais[id].dapm_routes = mtk_dai_adda_routes; - afe->sub_dais[id].num_dapm_routes =ARRAY_SIZE (mtk_dai_adda_routes); +list_add (&dai->list, &afe->sub_dais); + + dai->dai_drivers = mtk_dai_adda_driver; + dai->num_dai_drivers =ARRAY_SIZE (mtk_dai_adda_driver); + + dai->dapm_widgets = mtk_dai_adda_widgets; + dai->num_dapm_widgets =ARRAY_SIZE (mtk_dai_adda_widgets); + dai->dapm_routes = mtk_dai_adda_routes; + dai->num_dapm_routes =ARRAY_SIZE (mtk_dai_adda_routes);return 0 ; }
sound/soc/mediatek/mt6797/mt6797-dai-hostless.c +11 -5
@@ -100,13 +100,19 @@ static struct snd_soc_dai_driver mtk_dai_hostless_driver[] = {int mt6797_dai_hostless_register (struct mtk_base_afe *afe) { -int id =MT6797_DAI_HOSTLESS_LPBK ; +struct mtk_base_afe_dai *dai; - afe->sub_dais[id].dai_drivers = mtk_dai_hostless_driver; - afe->sub_dais[id].num_dai_drivers =ARRAY_SIZE (mtk_dai_hostless_driver); + dai =devm_kzalloc (afe->dev,sizeof (*dai),GFP_KERNEL ); +if (!dai) +return -ENOMEM ; - afe->sub_dais[id].dapm_routes = mtk_dai_hostless_routes; - afe->sub_dais[id].num_dapm_routes =ARRAY_SIZE (mtk_dai_hostless_routes); +list_add (&dai->list, &afe->sub_dais); + + dai->dai_drivers = mtk_dai_hostless_driver; + dai->num_dai_drivers =ARRAY_SIZE (mtk_dai_hostless_driver); + + dai->dapm_routes = mtk_dai_hostless_routes; + dai->num_dapm_routes =ARRAY_SIZE (mtk_dai_hostless_routes);return 0 ; }
sound/soc/mediatek/mt6797/mt6797-dai-pcm.c +12 -7
@@ -298,15 +298,20 @@ static struct snd_soc_dai_driver mtk_dai_pcm_driver[] = {int mt6797_dai_pcm_register (struct mtk_base_afe *afe) { -int id =MT6797_DAI_PCM_1 ; +struct mtk_base_afe_dai *dai; - afe->sub_dais[id].dai_drivers = mtk_dai_pcm_driver; - afe->sub_dais[id].num_dai_drivers =ARRAY_SIZE (mtk_dai_pcm_driver); + dai =devm_kzalloc (afe->dev,sizeof (*dai),GFP_KERNEL ); +if (!dai) +return -ENOMEM ; - afe->sub_dais[id].dapm_widgets = mtk_dai_pcm_widgets; - afe->sub_dais[id].num_dapm_widgets =ARRAY_SIZE (mtk_dai_pcm_widgets); - afe->sub_dais[id].dapm_routes = mtk_dai_pcm_routes; - afe->sub_dais[id].num_dapm_routes =ARRAY_SIZE (mtk_dai_pcm_routes); +list_add (&dai->list, &afe->sub_dais); + dai->dai_drivers = mtk_dai_pcm_driver; + dai->num_dai_drivers =ARRAY_SIZE (mtk_dai_pcm_driver); + + dai->dapm_widgets = mtk_dai_pcm_widgets; + dai->num_dapm_widgets =ARRAY_SIZE (mtk_dai_pcm_widgets); + dai->dapm_routes = mtk_dai_pcm_routes; + dai->num_dapm_routes =ARRAY_SIZE (mtk_dai_pcm_routes);return 0 ; }
Signature · 1 line
2.18.0.rc2