Unverified Commit 791a0059 authored by Damian van Soelen's avatar Damian van Soelen Committed by Mark Brown
Browse files

ASoC: Intel: cht_bsw_rt5645: Remove unnecessary string buffers and snprintf calls 



The snprintf calls filling cht_rt5645_cpu_dai_name /
cht_rt5645_codec_aif_name always fill them with the same string
("ssp0-port" resp "rt5645-aif2") so instead of keeping these buffers
around and making cpus->dai_name / codecs->dai_name point to this,
simply update the *->dai_name pointers to directly point to a string
constant containing the desired string.

Signed-off-by: default avatarDamian van Soelen <dj.vsoelen@gmail.com>
Signed-off-by: default avatarHans de Goede <hdegoede@redhat.com>
Link: https://lore.kernel.org/r/20200115164619.101705-5-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 fcce38d8

sound/soc/intel/boards/cht_bsw_rt5645.c

+4 −22
Original line number Diff line number Diff line
@@ -515,8 +515,6 @@ static struct cht_acpi_card snd_soc_cards[] = { 
};



static char cht_rt5645_codec_name[SND_ACPI_I2C_ID_LEN];

static char cht_rt5645_codec_aif_name[12]; /*  = "rt5645-aif[1|2]" */

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



struct acpi_chan_package {   /* ACPICA seems to require 64 bit integers */

	u64 aif_value;       /* 1: AIF1, 2: AIF2 */
@@ -641,28 +639,12 @@ static int snd_cht_mc_probe(struct platform_device *pdev) 
	log_quirks(&pdev->dev);



	if ((cht_rt5645_quirk & CHT_RT5645_SSP2_AIF2) ||

		(cht_rt5645_quirk & CHT_RT5645_SSP0_AIF2)) {



		/* fixup codec aif name */

		snprintf(cht_rt5645_codec_aif_name,

			sizeof(cht_rt5645_codec_aif_name),

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



		cht_dailink[dai_index].codecs->dai_name =

			cht_rt5645_codec_aif_name;

	}

	    (cht_rt5645_quirk & CHT_RT5645_SSP0_AIF2))

		cht_dailink[dai_index].codecs->dai_name = "rt5645-aif2";



	if ((cht_rt5645_quirk & CHT_RT5645_SSP0_AIF1) ||

		(cht_rt5645_quirk & CHT_RT5645_SSP0_AIF2)) {



		/* fixup cpu dai name name */

		snprintf(cht_rt5645_cpu_dai_name,

			sizeof(cht_rt5645_cpu_dai_name),

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



		cht_dailink[dai_index].cpus->dai_name =

			cht_rt5645_cpu_dai_name;

	}

	    (cht_rt5645_quirk & CHT_RT5645_SSP0_AIF2))

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



	/* override plaform name, if required */

	platform_name = mach->mach_params.platform;

CRA Git | Maintained and supported by SUSTech CRA and CCSE