Commit 1fc3e6b2 authored by Cezary Rojewski's avatar Cezary Rojewski Committed by Mark Brown

ASoC: Intel: haswell: Simplify device probe

With legacy ADSP private context adjusted, there is no need for double
safety.
Signed-off-by: default avatarCezary Rojewski <cezary.rojewski@intel.com>
Link: https://lore.kernel.org/r/20190822113616.22702-3-cezary.rojewski@intel.comTested-by: default avatarPierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent ca964edf
...@@ -188,18 +188,14 @@ static struct snd_soc_card haswell_rt5640 = { ...@@ -188,18 +188,14 @@ static struct snd_soc_card haswell_rt5640 = {
static int haswell_audio_probe(struct platform_device *pdev) static int haswell_audio_probe(struct platform_device *pdev)
{ {
struct snd_soc_acpi_mach *mach; struct snd_soc_acpi_mach *mach;
const char *platform_name = NULL;
int ret; int ret;
haswell_rt5640.dev = &pdev->dev; haswell_rt5640.dev = &pdev->dev;
/* override plaform name, if required */ /* override plaform name, if required */
mach = (&pdev->dev)->platform_data; 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, ret = snd_soc_fixup_dai_links_platform_name(&haswell_rt5640,
platform_name); mach->mach_params.platform);
if (ret) if (ret)
return ret; return ret;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment