diff options
| author | Naveen M <naveen.m@intel.com> | 2017-05-15 13:42:14 +0530 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2017-05-24 18:27:43 +0100 |
| commit | 7827d66946ad3af734ed46d1d68c23fa6974595c (patch) | |
| tree | a820e4791cfa3ccd3fd1c3493c7287ecf0c557dc | |
| parent | 915ae2b9f0fe0357a8f9cc53a7eb18ded03d11a4 (diff) | |
| download | linux-7827d66946ad3af734ed46d1d68c23fa6974595c.tar.gz linux-7827d66946ad3af734ed46d1d68c23fa6974595c.tar.bz2 linux-7827d66946ad3af734ed46d1d68c23fa6974595c.zip | |
ASoC: Move quirk to identify correct machine driver
sst_acpi_mach has a quirk field to handle board specific quirks.
Patch moves quirk call to sst_acpi_find_machine() instead of calling
it in respective driver
Signed-off-by: Naveen M <naveen.m@intel.com>
Signed-off-by: Subhransu S. Prusty <subhransu.s.prusty@intel.com>
Acked-by: Vinod Koul <vinod.koul@intel.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
| -rw-r--r-- | sound/soc/intel/atom/sst/sst_acpi.c | 2 | ||||
| -rw-r--r-- | sound/soc/intel/common/sst-match-acpi.c | 12 |
2 files changed, 9 insertions, 5 deletions
diff --git a/sound/soc/intel/atom/sst/sst_acpi.c b/sound/soc/intel/atom/sst/sst_acpi.c index 193c4d7b35f5..592f6afaf2a5 100644 --- a/sound/soc/intel/atom/sst/sst_acpi.c +++ b/sound/soc/intel/atom/sst/sst_acpi.c @@ -303,8 +303,6 @@ static int sst_acpi_probe(struct platform_device *pdev) dev_err(dev, "No matching machine driver found\n"); return -ENODEV; } - if (mach->machine_quirk) - mach = mach->machine_quirk(mach); pdata = mach->pdata; diff --git a/sound/soc/intel/common/sst-match-acpi.c b/sound/soc/intel/common/sst-match-acpi.c index f4af3d144b82..88e4977578b5 100644 --- a/sound/soc/intel/common/sst-match-acpi.c +++ b/sound/soc/intel/common/sst-match-acpi.c @@ -81,9 +81,15 @@ struct sst_acpi_mach *sst_acpi_find_machine(struct sst_acpi_mach *machines) { struct sst_acpi_mach *mach; - for (mach = machines; mach->id[0]; mach++) - if (sst_acpi_check_hid(mach->id) == true) - return mach; + for (mach = machines; mach->id[0]; mach++) { + if (sst_acpi_check_hid(mach->id) == true) { + if (mach->machine_quirk == NULL) + return mach; + + if (mach->machine_quirk(mach) != NULL) + return mach; + } + } return NULL; } EXPORT_SYMBOL_GPL(sst_acpi_find_machine); |