Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9bf70cd4 authored by Naveen M's avatar Naveen M Committed by Mark Brown
Browse files

ASoC: Intel: Convert skl machine data to C99 style 



C99 style struct initialization helps in readability as well as
initialization of variables not specified as NULL.
Patch modifies all skl machine data.

Suggested-by: default avatarTakashi Iwai <tiwai@suse.de>
Signed-off-by: default avatarNaveen M <naveen.m@intel.com>
Signed-off-by: default avatarVinod Koul <vinod.koul@intel.com>
Acked-by: default avatarVinod Koul <vinod.koul@intel.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent edc692e5

sound/soc/intel/skylake/skl.c

+49 −11
Original line number Diff line number Diff line
@@ -877,28 +877,66 @@ static void skl_remove(struct pci_dev *pci) 
}



static struct sst_acpi_mach sst_skl_devdata[] = {

	{ "INT343A", "skl_alc286s_i2s", "intel/dsp_fw_release.bin", NULL, NULL, NULL },

	{ "INT343B", "skl_n88l25_s4567", "intel/dsp_fw_release.bin",

				NULL, NULL, &skl_dmic_data },

	{ "MX98357A", "skl_n88l25_m98357a", "intel/dsp_fw_release.bin",

				NULL, NULL, &skl_dmic_data },

	{

		.id = "INT343A",

		.drv_name = "skl_alc286s_i2s",

		.fw_filename = "intel/dsp_fw_release.bin",

	},

	{

		.id = "INT343B",

		.drv_name = "skl_n88l25_s4567",

		.fw_filename = "intel/dsp_fw_release.bin",

		.pdata = &skl_dmic_data

	},

	{

		.id = "MX98357A",

		.drv_name = "skl_n88l25_m98357a",

		.fw_filename = "intel/dsp_fw_release.bin",

		.pdata = &skl_dmic_data

	},

	{}

};



static struct sst_acpi_mach sst_bxtp_devdata[] = {

	{ "INT343A", "bxt_alc298s_i2s", "intel/dsp_fw_bxtn.bin", NULL, NULL, NULL },

	{ "DLGS7219", "bxt_da7219_max98357a_i2s", "intel/dsp_fw_bxtn.bin", NULL, NULL, NULL },

	{

		.id = "INT343A",

		.drv_name = "bxt_alc298s_i2s",

		.fw_filename = "intel/dsp_fw_bxtn.bin",

	},

	{

		.id = "DLGS7219",

		.drv_name = "bxt_da7219_max98357a_i2s",

		.fw_filename = "intel/dsp_fw_bxtn.bin",

	},

};



static struct sst_acpi_mach sst_kbl_devdata[] = {

	{ "INT343A", "kbl_alc286s_i2s", "intel/dsp_fw_kbl.bin", NULL, NULL, NULL },

	{ "INT343B", "kbl_n88l25_s4567", "intel/dsp_fw_kbl.bin", NULL, NULL, &skl_dmic_data },

	{ "MX98357A", "kbl_n88l25_m98357a", "intel/dsp_fw_kbl.bin", NULL, NULL, &skl_dmic_data },

	{

		.id = "INT343A",

		.drv_name = "kbl_alc286s_i2s",

		.fw_filename = "intel/dsp_fw_kbl.bin",

	},

	{

		.id = "INT343B",

		.drv_name = "kbl_n88l25_s4567",

		.fw_filename = "intel/dsp_fw_kbl.bin",

		.pdata = &skl_dmic_data

	},

	{

		.id = "MX98357A",

		.drv_name = "kbl_n88l25_m98357a",

		.fw_filename = "intel/dsp_fw_kbl.bin",

		.pdata = &skl_dmic_data

	},

	{}

};



static struct sst_acpi_mach sst_glk_devdata[] = {

	{ "INT343A", "glk_alc298s_i2s", "intel/dsp_fw_glk.bin", NULL, NULL, NULL },

	{

		.id = "INT343A",

		.drv_name = "glk_alc298s_i2s",

		.fw_filename = "intel/dsp_fw_glk.bin",

	},

};



/* PCI IDs */