Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

ASoC: dai_dma: remove slave_id field

This field is no longer set from any driver now, so remove the
last references as well.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Acked-by: Mark Brown <broonie@kernel.org>
Link: https://lore.kernel.org/r/20211122222203.4103644-3-arnd@kernel.org
Signed-off-by: Vinod Koul <vkoul@kernel.org>

authored by

Arnd Bergmann and committed by
Vinod Koul
bdecfcef d53939dc

+2 -5
-2
include/sound/dmaengine_pcm.h
··· 60 60 * @maxburst: Maximum number of words(note: words, as in units of the 61 61 * src_addr_width member, not bytes) that can be send to or received from the 62 62 * DAI in one burst. 63 - * @slave_id: Slave requester id for the DMA channel. 64 63 * @filter_data: Custom DMA channel filter data, this will usually be used when 65 64 * requesting the DMA channel. 66 65 * @chan_name: Custom channel name to use when requesting DMA channel. ··· 73 74 dma_addr_t addr; 74 75 enum dma_slave_buswidth addr_width; 75 76 u32 maxburst; 76 - unsigned int slave_id; 77 77 void *filter_data; 78 78 const char *chan_name; 79 79 unsigned int fifo_size;
+2 -3
sound/core/pcm_dmaengine.c
··· 91 91 * @dma_data: DAI DMA data 92 92 * @slave_config: DMA slave configuration 93 93 * 94 - * Initializes the {dst,src}_addr, {dst,src}_maxburst, {dst,src}_addr_width and 95 - * slave_id fields of the DMA slave config from the same fields of the DAI DMA 94 + * Initializes the {dst,src}_addr, {dst,src}_maxburst, {dst,src}_addr_width 95 + * fields of the DMA slave config from the same fields of the DAI DMA 96 96 * data struct. The src and dst fields will be initialized depending on the 97 97 * direction of the substream. If the substream is a playback stream the dst 98 98 * fields will be initialized, if it is a capture stream the src fields will be ··· 124 124 slave_config->src_addr_width = dma_data->addr_width; 125 125 } 126 126 127 - slave_config->slave_id = dma_data->slave_id; 128 127 slave_config->peripheral_config = dma_data->peripheral_config; 129 128 slave_config->peripheral_size = dma_data->peripheral_size; 130 129 }