diff options
| author |   Cezary Rojewski <cezary.rojewski@intel.com> | 2019-08-22 13:36:14 +0200 |
|---|---|---|
| committer |   Mark Brown <broonie@kernel.org> | 2019-08-30 12:26:41 +0100 |
| commit | 1fc3e6b2ac3f8125ae54685c600d594d690a268a (patch) | |
| tree | 32615dc7b6a8e89b4a0b3dc0e2c403a2236fda77 /sound/soc/intel/boards/haswell.c | |
| parent | ASoC: Intel: Haswell: Adjust machine device private context (diff) | |
| download | linux-dev-1fc3e6b2ac3f8125ae54685c600d594d690a268a.tar.xz linux-dev-1fc3e6b2ac3f8125ae54685c600d594d690a268a.zip | |
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>
Diffstat (limited to 'sound/soc/intel/boards/haswell.c')
| -rw-r--r-- | sound/soc/intel/boards/haswell.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/sound/soc/intel/boards/haswell.c b/sound/soc/intel/boards/haswell.c index 4d3822cff98c..3dadf9bff796 100644 --- 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; |