diff options
| author | Subhransu S. Prusty <subhransu.s.prusty@intel.com> | 2014-10-24 10:19:46 +0200 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2014-10-27 19:02:38 +0100 |
| commit | 39581031a90d69e4b79cd044756169ff35ecab46 (patch) | |
| tree | 77cc2f72b98c4b40ddf864ec5e6a96bf9862e1db /sound/soc/intel/sst/sst.h | |
| parent | ASoC: intel: use __iowrite32_copy for 32 bit copy (diff) | |
| download | linux-39581031a90d69e4b79cd044756169ff35ecab46.tar.xz linux-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 'sound/soc/intel/sst/sst.h')
| -rw-r--r-- | sound/soc/intel/sst/sst.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sound/soc/intel/sst/sst.h b/sound/soc/intel/sst/sst.h index bfcf51ad3f5a..b65b9c0d8750 100644 --- a/sound/soc/intel/sst/sst.h +++ b/sound/soc/intel/sst/sst.h @@ -337,7 +337,8 @@ struct sst_shim_regs64 { * struct intel_sst_drv - driver ops * * @sst_state : current sst device state - * @pci_id : PCI device id loaded + * @dev_id : device identifier, pci_id for pci devices and acpi_id for acpi + * devices * @shim : SST shim pointer * @mailbox : SST mailbox pointer * @iram : SST IRAM pointer @@ -371,7 +372,7 @@ struct sst_shim_regs64 { struct intel_sst_drv { int sst_state; int irq_num; - unsigned int pci_id; + unsigned int dev_id; void __iomem *ddr; void __iomem *shim; void __iomem *mailbox; |