Unverified Commit 87427e9f authored by Mark Brown's avatar Mark Brown
Browse files

Merge series "ASoC: SOF: Remove unused members from struct sof_dev_desc" from... 

Merge series "ASoC: SOF: Remove unused members from struct sof_dev_desc" from Peter Ujfalusi <peter.ujfalusi@linux.intel.com>:

Hi,

dma_engine, dma_size and resindex_dma_base is unused from sof_dev_desc, drop
them.

resindex_dma_base is initialized to -1 for Intel platforms, but it is not used.

Regards,
Peter
---
Peter Ujfalusi (2):
  ASoC: SOF: intel: Do no initialize resindex_dma_base
  ASoC: SOF: Drop resindex_dma_base, dma_engine, dma_size from
    sof_dev_desc

 include/sound/sof.h           | 5 -----
 sound/soc/sof/intel/pci-apl.c | 2 --
 sound/soc/sof/intel/pci-cnl.c | 3 ---
 sound/soc/sof/intel/pci-icl.c | 2 --
 sound/soc/sof/intel/pci-tgl.c | 5 -----
 sound/soc/sof/intel/pci-tng.c | 1 -
 6 files changed, 18 deletions(-)

--
2.33.0
parents dde9ad0e 2395fea7

include/sound/sof.h

+0 −5
Original line number Diff line number Diff line
@@ -74,11 +74,6 @@ struct sof_dev_desc { 
	int resindex_pcicfg_base;

	int resindex_imr_base;

	int irqindex_host_ipc;

	int resindex_dma_base;



	/* DMA only valid when resindex_dma_base != -1*/

	int dma_engine;

	int dma_size;



	/* IPC timeouts in ms */

	int ipc_timeout;

sound/soc/sof/intel/pci-apl.c

+0 −2
Original line number Diff line number Diff line
@@ -26,7 +26,6 @@ static const struct sof_dev_desc bxt_desc = { 
	.resindex_pcicfg_base	= -1,

	.resindex_imr_base	= -1,

	.irqindex_host_ipc	= -1,

	.resindex_dma_base	= -1,

	.chip_info = &apl_chip_info,

	.default_fw_path = "intel/sof",

	.default_tplg_path = "intel/sof-tplg",
@@ -42,7 +41,6 @@ static const struct sof_dev_desc glk_desc = { 
	.resindex_pcicfg_base	= -1,

	.resindex_imr_base	= -1,

	.irqindex_host_ipc	= -1,

	.resindex_dma_base	= -1,

	.chip_info = &apl_chip_info,

	.default_fw_path = "intel/sof",

	.default_tplg_path = "intel/sof-tplg",

sound/soc/sof/intel/pci-cnl.c

+0 −3
Original line number Diff line number Diff line
@@ -27,7 +27,6 @@ static const struct sof_dev_desc cnl_desc = { 
	.resindex_pcicfg_base	= -1,

	.resindex_imr_base	= -1,

	.irqindex_host_ipc	= -1,

	.resindex_dma_base	= -1,

	.chip_info = &cnl_chip_info,

	.default_fw_path = "intel/sof",

	.default_tplg_path = "intel/sof-tplg",
@@ -44,7 +43,6 @@ static const struct sof_dev_desc cfl_desc = { 
	.resindex_pcicfg_base	= -1,

	.resindex_imr_base	= -1,

	.irqindex_host_ipc	= -1,

	.resindex_dma_base	= -1,

	.chip_info = &cnl_chip_info,

	.default_fw_path = "intel/sof",

	.default_tplg_path = "intel/sof-tplg",
@@ -61,7 +59,6 @@ static const struct sof_dev_desc cml_desc = { 
	.resindex_pcicfg_base	= -1,

	.resindex_imr_base	= -1,

	.irqindex_host_ipc	= -1,

	.resindex_dma_base	= -1,

	.chip_info = &cnl_chip_info,

	.default_fw_path = "intel/sof",

	.default_tplg_path = "intel/sof-tplg",

sound/soc/sof/intel/pci-icl.c

+0 −2
Original line number Diff line number Diff line
@@ -27,7 +27,6 @@ static const struct sof_dev_desc icl_desc = { 
	.resindex_pcicfg_base   = -1,

	.resindex_imr_base      = -1,

	.irqindex_host_ipc      = -1,

	.resindex_dma_base      = -1,

	.chip_info = &icl_chip_info,

	.default_fw_path = "intel/sof",

	.default_tplg_path = "intel/sof-tplg",
@@ -43,7 +42,6 @@ static const struct sof_dev_desc jsl_desc = { 
	.resindex_pcicfg_base   = -1,

	.resindex_imr_base      = -1,

	.irqindex_host_ipc      = -1,

	.resindex_dma_base      = -1,

	.chip_info = &jsl_chip_info,

	.default_fw_path = "intel/sof",

	.default_tplg_path = "intel/sof-tplg",

sound/soc/sof/intel/pci-tgl.c

+0 −5
Original line number Diff line number Diff line
@@ -27,7 +27,6 @@ static const struct sof_dev_desc tgl_desc = { 
	.resindex_pcicfg_base   = -1,

	.resindex_imr_base      = -1,

	.irqindex_host_ipc      = -1,

	.resindex_dma_base      = -1,

	.chip_info = &tgl_chip_info,

	.default_fw_path = "intel/sof",

	.default_tplg_path = "intel/sof-tplg",
@@ -44,7 +43,6 @@ static const struct sof_dev_desc tglh_desc = { 
	.resindex_pcicfg_base   = -1,

	.resindex_imr_base      = -1,

	.irqindex_host_ipc      = -1,

	.resindex_dma_base      = -1,

	.chip_info = &tglh_chip_info,

	.default_fw_path = "intel/sof",

	.default_tplg_path = "intel/sof-tplg",
@@ -60,7 +58,6 @@ static const struct sof_dev_desc ehl_desc = { 
	.resindex_pcicfg_base   = -1,

	.resindex_imr_base      = -1,

	.irqindex_host_ipc      = -1,

	.resindex_dma_base      = -1,

	.chip_info = &ehl_chip_info,

	.default_fw_path = "intel/sof",

	.default_tplg_path = "intel/sof-tplg",
@@ -77,7 +74,6 @@ static const struct sof_dev_desc adls_desc = { 
	.resindex_pcicfg_base   = -1,

	.resindex_imr_base      = -1,

	.irqindex_host_ipc      = -1,

	.resindex_dma_base      = -1,

	.chip_info = &adls_chip_info,

	.default_fw_path = "intel/sof",

	.default_tplg_path = "intel/sof-tplg",
@@ -94,7 +90,6 @@ static const struct sof_dev_desc adl_desc = { 
	.resindex_pcicfg_base   = -1,

	.resindex_imr_base      = -1,

	.irqindex_host_ipc      = -1,

	.resindex_dma_base      = -1,

	.chip_info = &tgl_chip_info,

	.default_fw_path = "intel/sof",

	.default_tplg_path = "intel/sof-tplg",