diff options
| author | Mark Brown <broonie@kernel.org> | 2019-09-15 12:31:44 +0300 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2019-09-15 12:31:44 +0300 |
| commit | a54f8485727e6e85b5dfe1d9708b80d13fe8bf5f (patch) | |
| tree | 9d38878259b080ffa01e1e398094906ee4e988fe /sound/soc/intel/boards/haswell.c | |
| parent | 7e0d8442e4fbc1e2033607d3b9e7d9c7d8a404ec (diff) | |
| parent | fca11622d600228bec405456f41590155b3a3eca (diff) | |
| download | linux-a54f8485727e6e85b5dfe1d9708b80d13fe8bf5f.tar.xz | |
Merge branch 'asoc-5.4' into asoc-next
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; |