ASoC: Intel: bytcr_rt5640: Remove unnecessary string buffers and snprintf calls
The snprintf calls filling byt_rt56*_codec_aif_name/byt_rt56*_cpu_dai_name always fill them with the same string ("rt56*-aif2" resp. ssp0-port"). So instead of keeping these buffers around and making codecs->dai_name / cpus->dai_name point to them, simply update the *->dai_name pointers to directly point to a string constant containing the desired string. Signed-off-by: Nariman Etemadi <narimantos@gmail.com> Signed-off-by: Hans de Goede <hdegoede@redhat.com> Link: https://lore.kernel.org/r/20200115164619.101705-3-hdegoede@redhat.com Acked-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com> Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
Родитель
332719b184
Коммит
296868315c
|
@ -1054,8 +1054,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" */
|
||||
#if !IS_ENABLED(CONFIG_SND_SOC_INTEL_USER_FRIENDLY_LONG_NAMES)
|
||||
static char byt_rt5640_long_name[40]; /* = "bytcr-rt5640-*-spk-*-mic" */
|
||||
#endif
|
||||
|
@ -1239,28 +1237,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].codecs->dai_name =
|
||||
byt_rt5640_codec_aif_name;
|
||||
}
|
||||
(byt_rt5640_quirk & BYT_RT5640_SSP0_AIF2))
|
||||
byt_rt5640_dais[dai_index].codecs->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].cpus->dai_name =
|
||||
byt_rt5640_cpu_dai_name;
|
||||
}
|
||||
(byt_rt5640_quirk & BYT_RT5640_SSP0_AIF2))
|
||||
byt_rt5640_dais[dai_index].cpus->dai_name = "ssp0-port";
|
||||
|
||||
if (byt_rt5640_quirk & BYT_RT5640_MCLK_EN) {
|
||||
priv->mclk = devm_clk_get(&pdev->dev, "pmc_plt_clk_3");
|
||||
|
|
Загрузка…
Ссылка в новой задаче