Unverified Commit 9eebe437 authored by Pierre-Louis Bossart's avatar Pierre-Louis Bossart Committed by Mark Brown
Browse files

ASoC: Intel: soc-acpi: cht-match: remove asoc_plat_name field 



This field was never used, let's remove it

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

sound/soc/intel/common/soc-acpi-intel-cht-match.c

+0 −14
Original line number Diff line number Diff line
@@ -46,7 +46,6 @@ static struct snd_soc_acpi_mach cht_surface_mach = { 
	.board = "cht-bsw",

	.sof_fw_filename = "sof-cht.ri",

	.sof_tplg_filename = "sof-cht-rt5645.tplg",

	.asoc_plat_name = "sst-mfld-platform",

};



static struct snd_soc_acpi_mach *cht_quirk(void *arg)
@@ -70,7 +69,6 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_cherrytrail_machines[] = { 
		.board = "cht-bsw",

		.sof_fw_filename = "sof-cht.ri",

		.sof_tplg_filename = "sof-cht-rt5670.tplg",

		.asoc_plat_name = "sst-mfld-platform",

	},

	{

		.id = "10EC5672",
@@ -79,7 +77,6 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_cherrytrail_machines[] = { 
		.board = "cht-bsw",

		.sof_fw_filename = "sof-cht.ri",

		.sof_tplg_filename = "sof-cht-rt5670.tplg",

		.asoc_plat_name = "sst-mfld-platform",

	},

	{

		.id = "10EC5645",
@@ -88,7 +85,6 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_cherrytrail_machines[] = { 
		.board = "cht-bsw",

		.sof_fw_filename = "sof-cht.ri",

		.sof_tplg_filename = "sof-cht-rt5645.tplg",

		.asoc_plat_name = "sst-mfld-platform",

	},

	{

		.id = "10EC5650",
@@ -97,7 +93,6 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_cherrytrail_machines[] = { 
		.board = "cht-bsw",

		.sof_fw_filename = "sof-cht.ri",

		.sof_tplg_filename = "sof-cht-rt5645.tplg",

		.asoc_plat_name = "sst-mfld-platform",

	},

	{

		.id = "10EC3270",
@@ -106,7 +101,6 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_cherrytrail_machines[] = { 
		.board = "cht-bsw",

		.sof_fw_filename = "sof-cht.ri",

		.sof_tplg_filename = "sof-cht-rt5645.tplg",

		.asoc_plat_name = "sst-mfld-platform",

	},

	{

		.id = "193C9890",
@@ -115,7 +109,6 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_cherrytrail_machines[] = { 
		.board = "cht-bsw",

		.sof_fw_filename = "sof-cht.ri",

		.sof_tplg_filename = "sof-cht-max98090.tplg",

		.asoc_plat_name = "sst-mfld-platform",

	},

	{

		.id = "10508824",
@@ -124,7 +117,6 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_cherrytrail_machines[] = { 
		.board = "cht-bsw",

		.sof_fw_filename = "sof-cht.ri",

		.sof_tplg_filename = "sof-cht-nau8824.tplg",

		.asoc_plat_name = "sst-mfld-platform",

	},

	{

		.id = "DLGS7212",
@@ -133,7 +125,6 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_cherrytrail_machines[] = { 
		.board = "bytcht_da7213",

		.sof_fw_filename = "sof-cht.ri",

		.sof_tplg_filename = "sof-cht-da7213.tplg",

		.asoc_plat_name = "sst-mfld-platform",

	},

	{

		.id = "DLGS7213",
@@ -142,7 +133,6 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_cherrytrail_machines[] = { 
		.board = "bytcht_da7213",

		.sof_fw_filename = "sof-cht.ri",

		.sof_tplg_filename = "sof-cht-da7213.tplg",

		.asoc_plat_name = "sst-mfld-platform",

	},

	{

		.id = "ESSX8316",
@@ -151,7 +141,6 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_cherrytrail_machines[] = { 
		.board = "bytcht_es8316",

		.sof_fw_filename = "sof-cht.ri",

		.sof_tplg_filename = "sof-cht-es8316.tplg",

		.asoc_plat_name = "sst-mfld-platform",

	},

	/* some CHT-T platforms rely on RT5640, use Baytrail machine driver */

	{
@@ -162,7 +151,6 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_cherrytrail_machines[] = { 
		.machine_quirk = cht_quirk,

		.sof_fw_filename = "sof-cht.ri",

		.sof_tplg_filename = "sof-cht-rt5640.tplg",

		.asoc_plat_name = "sst-mfld-platform",

	},

	{

		.id = "10EC3276",
@@ -171,7 +159,6 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_cherrytrail_machines[] = { 
		.board = "bytcr_rt5640",

		.sof_fw_filename = "sof-cht.ri",

		.sof_tplg_filename = "sof-cht-rt5640.tplg",

		.asoc_plat_name = "sst-mfld-platform",

	},

	/* some CHT-T platforms rely on RT5651, use Baytrail machine driver */

	{
@@ -181,7 +168,6 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_cherrytrail_machines[] = { 
		.board = "bytcr_rt5651",

		.sof_fw_filename = "sof-cht.ri",

		.sof_tplg_filename = "sof-cht-rt5651.tplg",

		.asoc_plat_name = "sst-mfld-platform",

	},

#if IS_ENABLED(CONFIG_SND_SOC_INTEL_BYT_CHT_NOCODEC_MACH)

	/*

CRA Git | Maintained and supported by SUSTech CRA and CCSE