ASoC: Intel: haswell: Simplify device probe

With legacy ADSP private context adjusted, there is no need for double
safety.

Signed-off-by: Cezary Rojewski <cezary.rojewski@intel.com>
Link: https://lore.kernel.org/r/20190822113616.22702-3-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/boards/haswell.c b/sound/soc/intel/boards/haswell.c
index 4d3822cff98c2d3609a0fea2d603036dd2f6b7e8..3dadf9bff796a3d73802d4abacdfa85909fb6f12 100644 (file)
--- a/sound/soc/intel/boards/haswell.c
+++ b/sound/soc/intel/boards/haswell.c
@@ -188,18 +188,14 @@ static struct snd_soc_card haswell_rt5640 = {
 static int haswell_audio_probe(struct platform_device *pdev)
 {
        struct snd_soc_acpi_mach *mach;
-       const char *platform_name = NULL;
        int ret;
 
        haswell_rt5640.dev = &pdev->dev;
 
        /* override plaform name, if required */
        mach = (&pdev->dev)->platform_data;
-       if (mach) /* extra check since legacy does not pass parameters */
-               platform_name = mach->mach_params.platform;
-
        ret = snd_soc_fixup_dai_links_platform_name(&haswell_rt5640,
-                                                   platform_name);
+                                                   mach->mach_params.platform);
        if (ret)
                return ret;