ASoC: Intel: Haswell: Adjust machine device private context

Apart from Haswell machines, all other devices have their private data
set to snd_soc_acpi_mach instance.

Changes for HSW/ BDW boards introduced with series:
https://patchwork.kernel.org/cover/10782035/

added support for dai_link platform_name adjustments within card probe
routines. These take for granted private_data points to
snd_soc_acpi_mach whereas for Haswell, it's sst_pdata instead. Change
private context of platform_device - representing machine board - to
address this.

Fixes: e736e6d6936d ("ASoC: Intel: haswell: platform name fixup support")
Fixes: f211bee40848 ("ASoC: Intel: bdw-rt5677: platform name fixup support")
Fixes: 958631599dd0 ("ASoC: Intel: broadwell: platform name fixup support")
Signed-off-by: Cezary Rojewski <cezary.rojewski@intel.com>
Link: https://lore.kernel.org/r/20190822113616.22702-2-cezary.rojewski@intel.com
Tested-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/intel/common/sst-acpi.c b/sound/soc/intel/common/sst-acpi.c
index 0e8e0a7a11df3af6aeb10fa1d98028f41638406d..5854868650b9e8e270a1022f4dad713cae283ea1 100644 (file)
--- a/sound/soc/intel/common/sst-acpi.c
+++ b/sound/soc/intel/common/sst-acpi.c
@@ -141,11 +141,12 @@ static int sst_acpi_probe(struct platform_device *pdev)
        }
 
        platform_set_drvdata(pdev, sst_acpi);
+       mach->pdata = sst_pdata;
 
        /* register machine driver */
        sst_acpi->pdev_mach =
                platform_device_register_data(dev, mach->drv_name, -1,
-                                             sst_pdata, sizeof(*sst_pdata));
+                                             mach, sizeof(*mach));
        if (IS_ERR(sst_acpi->pdev_mach))
                return PTR_ERR(sst_acpi->pdev_mach);