ASoC: Intel: Remove sst_pdata structure

struct sst_pdata is unused among remaining /sound/soc/intel solution so
remove it.

Signed-off-by: Cezary Rojewski <cezary.rojewski@intel.com>
Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Acked-by: Liam Girdwood <liam.r.girdwood@intel.com>
Link: https://lore.kernel.org/r/20201006064907.16277-13-cezary.rojewski@intel.com
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/intel/common/sst-dsp-priv.h b/sound/soc/intel/common/sst-dsp-priv.h
index 7d98345..5a5ce50 100644 (file)
--- a/sound/soc/intel/common/sst-dsp-priv.h
+++ b/sound/soc/intel/common/sst-dsp-priv.h
@@ -27,7 +27,7 @@ struct sst_ops {
        irqreturn_t (*irq_handler)(int irq, void *context);
 
        /* SST init and free */
-       int (*init)(struct sst_dsp *sst, struct sst_pdata *pdata);
+       int (*init)(struct sst_dsp *sst);
        void (*free)(struct sst_dsp *sst);
 };
 

diff --git a/sound/soc/intel/common/sst-dsp.h b/sound/soc/intel/common/sst-dsp.h
index 021a36b..f111fd3 100644 (file)
--- a/sound/soc/intel/common/sst-dsp.h
+++ b/sound/soc/intel/common/sst-dsp.h
@@ -26,34 +26,6 @@ struct sst_dsp_device {
        void *thread_context;
 };
 
-/*
- * SST Platform Data.
- */
-struct sst_pdata {
-       /* ACPI data */
-       u32 lpe_base;
-       u32 lpe_size;
-       u32 pcicfg_base;
-       u32 pcicfg_size;
-       u32 fw_base;
-       u32 fw_size;
-       int irq;
-
-       /* Firmware */
-       const struct firmware *fw;
-
-       /* DMA */
-       int resindex_dma_base; /* other fields invalid if equals to -1 */
-       u32 dma_base;
-       u32 dma_size;
-       int dma_engine;
-       struct device *dma_dev;
-
-       /* DSP */
-       u32 id;
-       void *dsp;
-};
-
 /* SHIM Read / Write */
 void sst_dsp_shim_write(struct sst_dsp *sst, u32 offset, u32 value);
 u32 sst_dsp_shim_read(struct sst_dsp *sst, u32 offset);

diff --git a/sound/soc/intel/skylake/skl-sst-dsp.c b/sound/soc/intel/skylake/skl-sst-dsp.c
index 225706d..4ae3eae 100644 (file)
--- a/sound/soc/intel/skylake/skl-sst-dsp.c
+++ b/sound/soc/intel/skylake/skl-sst-dsp.c
@@ -422,7 +422,7 @@ struct sst_dsp *skl_dsp_ctx_init(struct device *dev,
 
        /* Initialise SST Audio DSP */
        if (sst->ops->init) {
-               ret = sst->ops->init(sst, NULL);
+               ret = sst->ops->init(sst);
                if (ret < 0)
                        return NULL;
        }