From: Arnd Bergmann <arnd@kernel.org>
To: Vinod Koul <vkoul@kernel.org>
Cc: Arnd Bergmann <arnd@arndb.de>, Andy Gross <agross@kernel.org>,
Andy Shevchenko <andriy.shevchenko@linux.intel.com>,
Baolin Wang <baolin.wang7@gmail.com>,
Bjorn Andersson <bjorn.andersson@linaro.org>,
Chunyan Zhang <zhang.lyra@gmail.com>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
Hyun Kwon <hyun.kwon@xilinx.com>,
Jaroslav Kysela <perex@perex.cz>,
Jon Hunter <jonathanh@nvidia.com>,
Lars-Peter Clausen <lars@metafoo.de>,
Laurent Pinchart <laurent.pinchart@ideasonboard.com>,
Laxman Dewangan <ldewangan@nvidia.com>,
Manivannan Sadhasivam <mani@kernel.org>,
Mark Brown <broonie@kernel.org>,
Michal Simek <michal.simek@xilinx.com>,
Nicolas Saenz Julienne <nsaenz@kernel.org>,
Orson Zhai <orsonzhai@gmail.com>,
Robert Jarzmik <robert.jarzmik@free.fr>,
Scott Branden <sbranden@broadcom.com>,
Takashi Iwai <tiwai@suse.com>,
Thierry Reding <thierry.reding@gmail.com>,
alsa-devel@alsa-project.org,
bcm-kernel-feedback-list@broadcom.com, dmaengine@vger.kernel.org,
dri-devel@lists.freedesktop.org,
linux-arm-kernel@lists.infradead.org,
linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org,
linux-mmc@vger.kernel.org, linux-mtd@lists.infradead.org,
linux-rpi-kernel@lists.infradead.org,
linux-serial@vger.kernel.org, linux-spi@vger.kernel.org,
linux-staging@lists.linux.dev, linux-tegra@vger.kernel.org
Subject: [PATCH v2 02/11] ASoC: dai_dma: remove slave_id field
Date: Mon, 22 Nov 2021 23:21:54 +0100 [thread overview]
Message-ID: <20211122222203.4103644-3-arnd@kernel.org> (raw)
In-Reply-To: <20211122222203.4103644-1-arnd@kernel.org>
From: Arnd Bergmann <arnd@arndb.de>
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>
---
include/sound/dmaengine_pcm.h | 2 --
sound/core/pcm_dmaengine.c | 5 ++---
2 files changed, 2 insertions(+), 5 deletions(-)
diff --git a/include/sound/dmaengine_pcm.h b/include/sound/dmaengine_pcm.h
index 9144bd547851..7403870c28bd 100644
--- a/include/sound/dmaengine_pcm.h
+++ b/include/sound/dmaengine_pcm.h
@@ -58,7 +58,6 @@ struct dma_chan *snd_dmaengine_pcm_get_chan(struct snd_pcm_substream *substream)
* @maxburst: Maximum number of words(note: words, as in units of the
* src_addr_width member, not bytes) that can be send to or received from the
* DAI in one burst.
- * @slave_id: Slave requester id for the DMA channel.
* @filter_data: Custom DMA channel filter data, this will usually be used when
* requesting the DMA channel.
* @chan_name: Custom channel name to use when requesting DMA channel.
@@ -72,7 +71,6 @@ struct snd_dmaengine_dai_dma_data {
dma_addr_t addr;
enum dma_slave_buswidth addr_width;
u32 maxburst;
- unsigned int slave_id;
void *filter_data;
const char *chan_name;
unsigned int fifo_size;
diff --git a/sound/core/pcm_dmaengine.c b/sound/core/pcm_dmaengine.c
index af08bb4bf578..6762fb2083e1 100644
--- a/sound/core/pcm_dmaengine.c
+++ b/sound/core/pcm_dmaengine.c
@@ -91,8 +91,8 @@ EXPORT_SYMBOL_GPL(snd_hwparams_to_dma_slave_config);
* @dma_data: DAI DMA data
* @slave_config: DMA slave configuration
*
- * Initializes the {dst,src}_addr, {dst,src}_maxburst, {dst,src}_addr_width and
- * slave_id fields of the DMA slave config from the same fields of the DAI DMA
+ * Initializes the {dst,src}_addr, {dst,src}_maxburst, {dst,src}_addr_width
+ * fields of the DMA slave config from the same fields of the DAI DMA
* data struct. The src and dst fields will be initialized depending on the
* direction of the substream. If the substream is a playback stream the dst
* fields will be initialized, if it is a capture stream the src fields will be
@@ -124,7 +124,6 @@ void snd_dmaengine_pcm_set_config_from_dai_data(
slave_config->src_addr_width = dma_data->addr_width;
}
- slave_config->slave_id = dma_data->slave_id;
slave_config->peripheral_config = dma_data->peripheral_config;
slave_config->peripheral_size = dma_data->peripheral_size;
}
--
2.29.2
next prev parent reply other threads:[~2021-11-22 22:22 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-11-22 22:21 [PATCH v2 00/11] dmaengine: kill off dma_slave_config->slave_id Arnd Bergmann
2021-11-22 22:21 ` [PATCH v2 01/11] ASoC: tegra20-spdif: stop setting slave_id Arnd Bergmann
2021-11-24 16:32 ` Dmitry Osipenko
2021-11-24 16:47 ` Arnd Bergmann
2021-11-24 17:36 ` Dmitry Osipenko
2021-11-24 17:39 ` Dmitry Osipenko
2021-11-22 22:21 ` Arnd Bergmann [this message]
2021-11-22 22:21 ` [PATCH v2 03/11] spi: pic32: stop setting dma_config->slave_id Arnd Bergmann
2021-11-22 22:21 ` [PATCH v2 04/11] mmc: bcm2835: stop setting chan_config->slave_id Arnd Bergmann
2021-11-23 11:18 ` Ulf Hansson
2021-11-22 22:21 ` [PATCH v2 05/11] dmaengine: shdma: remove legacy slave_id parsing Arnd Bergmann
2021-11-22 22:21 ` [PATCH v2 06/11] dmaengine: pxa/mmp: stop referencing config->slave_id Arnd Bergmann
2021-11-22 22:21 ` [PATCH v2 07/11] dmaengine: sprd: " Arnd Bergmann
2021-11-22 22:22 ` [PATCH v2 08/11] dmaengine: qcom-adm: stop abusing slave_id config Arnd Bergmann
2021-11-22 22:22 ` [PATCH v2 09/11] dmaengine: xilinx_dpdma: stop using slave_id field Arnd Bergmann
2021-11-22 22:22 ` [PATCH v2 10/11] dmaengine: tegra20-apb: stop checking config->slave_id Arnd Bergmann
2021-11-22 22:22 ` [PATCH v2 11/11] dmaengine: remove slave_id config field Arnd Bergmann
2021-11-22 23:01 ` [PATCH v2 00/11] dmaengine: kill off dma_slave_config->slave_id Mark Brown
2021-12-13 4:59 ` Vinod Koul
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20211122222203.4103644-3-arnd@kernel.org \
--to=arnd@kernel.org \
--cc=agross@kernel.org \
--cc=alsa-devel@alsa-project.org \
--cc=andriy.shevchenko@linux.intel.com \
--cc=arnd@arndb.de \
--cc=baolin.wang7@gmail.com \
--cc=bcm-kernel-feedback-list@broadcom.com \
--cc=bjorn.andersson@linaro.org \
--cc=broonie@kernel.org \
--cc=dmaengine@vger.kernel.org \
--cc=dri-devel@lists.freedesktop.org \
--cc=gregkh@linuxfoundation.org \
--cc=hyun.kwon@xilinx.com \
--cc=jonathanh@nvidia.com \
--cc=lars@metafoo.de \
--cc=laurent.pinchart@ideasonboard.com \
--cc=ldewangan@nvidia.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-arm-msm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mmc@vger.kernel.org \
--cc=linux-mtd@lists.infradead.org \
--cc=linux-rpi-kernel@lists.infradead.org \
--cc=linux-serial@vger.kernel.org \
--cc=linux-spi@vger.kernel.org \
--cc=linux-staging@lists.linux.dev \
--cc=linux-tegra@vger.kernel.org \
--cc=mani@kernel.org \
--cc=michal.simek@xilinx.com \
--cc=nsaenz@kernel.org \
--cc=orsonzhai@gmail.com \
--cc=perex@perex.cz \
--cc=robert.jarzmik@free.fr \
--cc=sbranden@broadcom.com \
--cc=thierry.reding@gmail.com \
--cc=tiwai@suse.com \
--cc=vkoul@kernel.org \
--cc=zhang.lyra@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).