openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

ASoC: Intel: bdw-rt5677: 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-4-cezary.rojewski@intel.com
Tested-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
Cezary Rojewski 2019-08-22 13:36:15 +02:00 committed by Mark Brown
parent 1fc3e6b2ac
commit c25e93bba9
No known key found for this signature in database
GPG Key ID: 24D68B725D5487D0
1 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sound/soc/intel/boards/bdw-rt5677.c
View File

@ -340,7 +340,6 @@ static int bdw_rt5677_probe(struct platform_device *pdev)
{ {
struct bdw_rt5677_priv *bdw_rt5677; struct bdw_rt5677_priv *bdw_rt5677;
struct snd_soc_acpi_mach *mach; struct snd_soc_acpi_mach *mach;
const char *platform_name = NULL;
int ret; int ret;
bdw_rt5677_card.dev = &pdev->dev; bdw_rt5677_card.dev = &pdev->dev;
@ -355,11 +354,8 @@ static int bdw_rt5677_probe(struct platform_device *pdev)
/* 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(&bdw_rt5677_card, ret = snd_soc_fixup_dai_links_platform_name(&bdw_rt5677_card,
platform_name); mach->mach_params.platform);
if (ret) if (ret)
return ret; return ret;