diff options
| author |   Subhransu S. Prusty <subhransu.s.prusty@intel.com> | 2014-10-24 13:49:46 +0530 |
|---|---|---|
| committer |   Mark Brown <broonie@kernel.org> | 2014-10-27 18:02:38 +0000 |
| commit | 39581031a90d69e4b79cd044756169ff35ecab46 (patch) | |
| tree | 77cc2f72b98c4b40ddf864ec5e6a96bf9862e1db /sound/soc/intel/sst/sst_pvt.c | |
| parent | ASoC: intel: use __iowrite32_copy for 32 bit copy (diff) | |
| download | linux-dev-39581031a90d69e4b79cd044756169ff35ecab46.tar.xz linux-dev-39581031a90d69e4b79cd044756169ff35ecab46.zip | |
ASoC: Intel: mrfld: Replace pci_id with unique device id
In order to support both ACPI and PCI devices we need to use a genric device
id in driver, so change all pci_id instances to device_id
Signed-off-by: Subhransu S. Prusty <subhransu.s.prusty@intel.com>
Signed-off-by: Vinod Koul <vinod.koul@intel.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to '')
| -rw-r--r-- | sound/soc/intel/sst/sst_pvt.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/soc/intel/sst/sst_pvt.c b/sound/soc/intel/sst/sst_pvt.c index 9e5f69b6b395..1c2e081fd813 100644 --- a/sound/soc/intel/sst/sst_pvt.c +++ b/sound/soc/intel/sst/sst_pvt.c @@ -115,7 +115,7 @@ unsigned long long read_shim_data(struct intel_sst_drv *sst, int addr) { unsigned long long val = 0; - switch (sst->pci_id) { + switch (sst->dev_id) { case SST_MRFLD_PCI_ID: val = sst_shim_read64(sst->shim, addr); break; @@ -126,7 +126,7 @@ unsigned long long read_shim_data(struct intel_sst_drv *sst, int addr) void write_shim_data(struct intel_sst_drv *sst, int addr, unsigned long long data) { - switch (sst->pci_id) { + switch (sst->dev_id) { case SST_MRFLD_PCI_ID: sst_shim_write64(sst->shim, addr, (u64) data); break; |