diff options
| author |   Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com> | 2017-10-12 18:49:39 -0500 |
|---|---|---|
| committer |   Mark Brown <broonie@kernel.org> | 2017-10-21 11:21:23 +0100 |
| commit | 928c8a8f1188dd59065e22bcedae57cb6156d836 (patch) | |
| tree | 8c0488d183c61763d4bb2a1e65221d7acdb5160c | |
| parent | ASoC: move ACPI common code out of Intel/sst tree (diff) | |
| download | linux-dev-928c8a8f1188dd59065e22bcedae57cb6156d836.tar.xz linux-dev-928c8a8f1188dd59065e22bcedae57cb6156d836.zip | |
ASoC: Intel: common: use c99 syntax for ACPI/machine tables
Before we add new fields for SOF support, move to C99 syntax
as done for atom/sst and legacy hsw/bdw code
No functional change
Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Acked-by: Liam Girdwood <liam.r.girdwood@linux.intel.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
| -rw-r--r-- | sound/soc/intel/common/sst-acpi.c | 30 |
1 files changed, 25 insertions, 5 deletions
diff --git a/sound/soc/intel/common/sst-acpi.c b/sound/soc/intel/common/sst-acpi.c index 9866998de8be..32d74ba70e4a 100644 --- a/sound/soc/intel/common/sst-acpi.c +++ b/sound/soc/intel/common/sst-acpi.c @@ -180,7 +180,11 @@ static int sst_acpi_remove(struct platform_device *pdev) } static struct snd_soc_acpi_mach haswell_machines[] = { - { "INT33CA", "haswell-audio", "intel/IntcSST1.bin", NULL, NULL, NULL }, + { + .id = "INT33CA", + .drv_name = "haswell-audio", + .fw_filename = "intel/IntcSST1.bin", + }, {} }; @@ -198,8 +202,16 @@ static struct sst_acpi_desc sst_acpi_haswell_desc = { }; static struct snd_soc_acpi_mach broadwell_machines[] = { - { "INT343A", "broadwell-audio", "intel/IntcSST2.bin", NULL, NULL, NULL }, - { "RT5677CE", "bdw-rt5677", "intel/IntcSST2.bin", NULL, NULL, NULL }, + { + .id = "INT343A", + .drv_name = "broadwell-audio", + .fw_filename = "intel/IntcSST2.bin", + }, + { + .id = "RT5677CE", + .drv_name = "bdw-rt5677", + .fw_filename = "intel/IntcSST2.bin", + }, {} }; @@ -218,8 +230,16 @@ static struct sst_acpi_desc sst_acpi_broadwell_desc = { #if !IS_ENABLED(CONFIG_SND_SST_IPC_ACPI) static struct snd_soc_acpi_mach baytrail_machines[] = { - { "10EC5640", "byt-rt5640", "intel/fw_sst_0f28.bin-48kHz_i2s_master", NULL, NULL, NULL }, - { "193C9890", "byt-max98090", "intel/fw_sst_0f28.bin-48kHz_i2s_master", NULL, NULL, NULL }, + { + .id = "10EC5640", + .drv_name = "byt-rt5640", + .fw_filename = "intel/fw_sst_0f28.bin-48kHz_i2s_master", + }, + { + .id = "193C9890", + .drv_name = "byt-max98090", + .fw_filename = "intel/fw_sst_0f28.bin-48kHz_i2s_master", + }, {} }; |