Unverified Commit fcce38d8 authored by Jordy Ubink's avatar Jordy Ubink Committed by Mark Brown
Browse files

ASoC: Intel: bytcr_rt5651: 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: default avatarJordy Ubink <jordyubink@hotmail.nl>
Signed-off-by: default avatarHans de Goede <hdegoede@redhat.com>
Link: https://lore.kernel.org/r/20200115164619.101705-4-hdegoede@redhat.com


Acked-by: default avatarPierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 29686831

sound/soc/intel/boards/bytcr_rt5651.c

+4 −20
Original line number Diff line number Diff line
@@ -787,8 +787,6 @@ static struct snd_soc_dai_link byt_rt5651_dais[] = { 


/* SoC card */

static char byt_rt5651_codec_name[SND_ACPI_I2C_ID_LEN];

static char byt_rt5651_codec_aif_name[12]; /*  = "rt5651-aif[1|2]" */

static char byt_rt5651_cpu_dai_name[10]; /*  = "ssp[0|2]-port" */

#if !IS_ENABLED(CONFIG_SND_SOC_INTEL_USER_FRIENDLY_LONG_NAMES)

static char byt_rt5651_long_name[50]; /* = "bytcr-rt5651-*-spk-*-mic[-swapped-hp]" */

#endif
@@ -1037,26 +1035,12 @@ static int snd_byt_rt5651_mc_probe(struct platform_device *pdev) 
	log_quirks(&pdev->dev);



	if ((byt_rt5651_quirk & BYT_RT5651_SSP2_AIF2) ||

	    (byt_rt5651_quirk & BYT_RT5651_SSP0_AIF2)) {

		/* fixup codec aif name */

		snprintf(byt_rt5651_codec_aif_name,

			sizeof(byt_rt5651_codec_aif_name),

			"%s", "rt5651-aif2");



		byt_rt5651_dais[dai_index].codecs->dai_name =

			byt_rt5651_codec_aif_name;

	}

	    (byt_rt5651_quirk & BYT_RT5651_SSP0_AIF2))

		byt_rt5651_dais[dai_index].codecs->dai_name = "rt5651-aif2";



	if ((byt_rt5651_quirk & BYT_RT5651_SSP0_AIF1) ||

	    (byt_rt5651_quirk & BYT_RT5651_SSP0_AIF2)) {

		/* fixup cpu dai name name */

		snprintf(byt_rt5651_cpu_dai_name,

			sizeof(byt_rt5651_cpu_dai_name),

			"%s", "ssp0-port");



		byt_rt5651_dais[dai_index].cpus->dai_name =

			byt_rt5651_cpu_dai_name;

	}

	    (byt_rt5651_quirk & BYT_RT5651_SSP0_AIF2))

		byt_rt5651_dais[dai_index].cpus->dai_name = "ssp0-port";



	if (byt_rt5651_quirk & BYT_RT5651_MCLK_EN) {

		priv->mclk = devm_clk_get(&pdev->dev, "pmc_plt_clk_3");

CRA Git | Maintained and supported by SUSTech CRA and CCSE