Hi all,
On 19-05-19 19:57, nariman wrote:
From: Nariman Etemadi narimantos@gmail.com
in function snd_byt_rt5640_mc_probe and removed buffer yt_rt5640_codec_aif_name & byt_rt5640_cpu_dai_name
Signed-off-by: Nariman Etemadi narimantos@gmail.com
Series (all 4 patches) look good to me:
Reviewed-by: Hans de Goede hdegoede@redhat.com
Regards,
Hans
sound/soc/intel/boards/bytcr_rt5640.c | 26 ++++---------------------- 1 file changed, 4 insertions(+), 22 deletions(-)
diff --git a/sound/soc/intel/boards/bytcr_rt5640.c b/sound/soc/intel/boards/bytcr_rt5640.c index 940eb27158da..0d91642ca287 100644 --- a/sound/soc/intel/boards/bytcr_rt5640.c +++ b/sound/soc/intel/boards/bytcr_rt5640.c @@ -1075,8 +1075,6 @@ static struct snd_soc_dai_link byt_rt5640_dais[] = {
/* SoC card */ static char byt_rt5640_codec_name[SND_ACPI_I2C_ID_LEN]; -static char byt_rt5640_codec_aif_name[12]; /* = "rt5640-aif[1|2]" */ -static char byt_rt5640_cpu_dai_name[10]; /* = "ssp[0|2]-port" */ static char byt_rt5640_long_name[40]; /* = "bytcr-rt5640-*-spk-*-mic" */
static int byt_rt5640_suspend(struct snd_soc_card *card) @@ -1268,28 +1266,12 @@ static int snd_byt_rt5640_mc_probe(struct platform_device *pdev) log_quirks(&pdev->dev);
if ((byt_rt5640_quirk & BYT_RT5640_SSP2_AIF2) ||
(byt_rt5640_quirk & BYT_RT5640_SSP0_AIF2)) {/* fixup codec aif name */snprintf(byt_rt5640_codec_aif_name,sizeof(byt_rt5640_codec_aif_name),"%s", "rt5640-aif2");byt_rt5640_dais[dai_index].codec_dai_name =byt_rt5640_codec_aif_name;- }
(byt_rt5640_quirk & BYT_RT5640_SSP0_AIF2))byt_rt5640_dais[dai_index].codec_dai_name = "rt5640-aif2";if ((byt_rt5640_quirk & BYT_RT5640_SSP0_AIF1) ||
(byt_rt5640_quirk & BYT_RT5640_SSP0_AIF2)) {/* fixup cpu dai name name */snprintf(byt_rt5640_cpu_dai_name,sizeof(byt_rt5640_cpu_dai_name),"%s", "ssp0-port");byt_rt5640_dais[dai_index].cpu_dai_name =byt_rt5640_cpu_dai_name;- }
(byt_rt5640_quirk & BYT_RT5640_SSP0_AIF2))byt_rt5640_dais[dai_index].cpu_dai_name = "ssp0-port";if (byt_rt5640_quirk & BYT_RT5640_MCLK_EN) { priv->mclk = devm_clk_get(&pdev->dev, "pmc_plt_clk_3");