Skip to content

Commit 720811f

Browse files
crojewsk-intelbroonie
authored andcommitted
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 <[email protected]> Reviewed-by: Andy Shevchenko <[email protected]> Acked-by: Liam Girdwood <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Mark Brown <[email protected]>
1 parent b972153 commit 720811f

File tree

3 files changed

+2
-30
lines changed

3 files changed

+2
-30
lines changed

sound/soc/intel/common/sst-dsp-priv.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ struct sst_ops {
2727
irqreturn_t (*irq_handler)(int irq, void *context);
2828

2929
/* SST init and free */
30-
int (*init)(struct sst_dsp *sst, struct sst_pdata *pdata);
30+
int (*init)(struct sst_dsp *sst);
3131
void (*free)(struct sst_dsp *sst);
3232
};
3333

sound/soc/intel/common/sst-dsp.h

Lines changed: 0 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -26,34 +26,6 @@ struct sst_dsp_device {
2626
void *thread_context;
2727
};
2828

29-
/*
30-
* SST Platform Data.
31-
*/
32-
struct sst_pdata {
33-
/* ACPI data */
34-
u32 lpe_base;
35-
u32 lpe_size;
36-
u32 pcicfg_base;
37-
u32 pcicfg_size;
38-
u32 fw_base;
39-
u32 fw_size;
40-
int irq;
41-
42-
/* Firmware */
43-
const struct firmware *fw;
44-
45-
/* DMA */
46-
int resindex_dma_base; /* other fields invalid if equals to -1 */
47-
u32 dma_base;
48-
u32 dma_size;
49-
int dma_engine;
50-
struct device *dma_dev;
51-
52-
/* DSP */
53-
u32 id;
54-
void *dsp;
55-
};
56-
5729
/* SHIM Read / Write */
5830
void sst_dsp_shim_write(struct sst_dsp *sst, u32 offset, u32 value);
5931
u32 sst_dsp_shim_read(struct sst_dsp *sst, u32 offset);

sound/soc/intel/skylake/skl-sst-dsp.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -422,7 +422,7 @@ struct sst_dsp *skl_dsp_ctx_init(struct device *dev,
422422

423423
/* Initialise SST Audio DSP */
424424
if (sst->ops->init) {
425-
ret = sst->ops->init(sst, NULL);
425+
ret = sst->ops->init(sst);
426426
if (ret < 0)
427427
return NULL;
428428
}

0 commit comments

Comments
 (0)