diff mbox series

[v3,Resend,09/13] ASoC: dmaengine: Remove unused SND_DMAENGINE_PCM_FLAG_CUSTOM_CHANNEL_NAME flag

Message ID 20190214093747.2414-10-s.nawrocki@samsung.com (mailing list archive)
State New, archived
Headers show
Series ASoC: dmaengine updates, secondary CPU DAI for Odroid | expand

Commit Message

Sylwester Nawrocki/Kernel \(PLT\) /SRPOL/Staff Engineer/Samsung Electronics Feb. 14, 2019, 9:37 a.m. UTC 
There is now no users of this flag so remove it together with related
data structure field.

Signed-off-by: Sylwester Nawrocki <s.nawrocki@samsung.com>
Acked-by: Krzysztof Kozlowski <krzk@kernel.org>
---
 include/sound/dmaengine_pcm.h         |  6 ------
 sound/soc/soc-generic-dmaengine-pcm.c | 21 ++++-----------------
 2 files changed, 4 insertions(+), 23 deletions(-)

Comments

Mark Brown Feb. 14, 2019, 1:07 p.m. UTC | #1 
On Thu, Feb 14, 2019 at 10:37:43AM +0100, Sylwester Nawrocki wrote:

>  	u32 maxburst;
>  	unsigned int slave_id;
>  	void *filter_data;
> -	const char *chan_name;
>  	unsigned int fifo_size;
>  	unsigned int flags;

This fails to build:

  CC      sound/core/pcm_dmaengine.o
sound/arm/pxa2xx-pcm-lib.c: In function ‘pxa2xx_pcm_open’:
sound/arm/pxa2xx-pcm-lib.c:128:22: error: ‘struct snd_dmaengine_dai_dma_data’ has no member named ‘chan_name’
            dma_params->chan_name));
                      ^~
sound/arm/pxa2xx-pcm-lib.c:129:1: warning: control reaches end of non-void function [-Wreturn-type]
 }
 ^
Sylwester Nawrocki/Kernel \(PLT\) /SRPOL/Staff Engineer/Samsung Electronics Feb. 14, 2019, 2:32 p.m. UTC | #2 
On 2/14/19 14:07, Mark Brown wrote:
> On Thu, Feb 14, 2019 at 10:37:43AM +0100, Sylwester Nawrocki wrote:
> 
>>  	u32 maxburst;
>>  	unsigned int slave_id;
>>  	void *filter_data;
>> -	const char *chan_name;
>>  	unsigned int fifo_size;
>>  	unsigned int flags;
> 
> This fails to build:
> 
>   CC      sound/core/pcm_dmaengine.o
> sound/arm/pxa2xx-pcm-lib.c: In function ‘pxa2xx_pcm_open’:
> sound/arm/pxa2xx-pcm-lib.c:128:22: error: ‘struct snd_dmaengine_dai_dma_data’ has no member named ‘chan_name’
>             dma_params->chan_name));
>                       ^~
> sound/arm/pxa2xx-pcm-lib.c:129:1: warning: control reaches end of non-void function [-Wreturn-type]
>  }
>  ^

Hm, looks like we need still to keep that data structure field, but 
remaining part of the patch could be applied. Do you want me to 
resend it with chan_name removal part dropped?
The $subject patch is optional so we could also skip it and apply remaining
patches so there is no another resend.
Mark Brown Feb. 14, 2019, 2:47 p.m. UTC | #3 
On Thu, Feb 14, 2019 at 03:32:38PM +0100, Sylwester Nawrocki wrote:

> Hm, looks like we need still to keep that data structure field, but 
> remaining part of the patch could be applied. Do you want me to 
> resend it with chan_name removal part dropped?

Please resend.
diff mbox series

Patch

diff --git a/include/sound/dmaengine_pcm.h b/include/sound/dmaengine_pcm.h
index 2c4cfaa135a6..764c787928a4 100644
--- a/include/sound/dmaengine_pcm.h
+++ b/include/sound/dmaengine_pcm.h
@@ -63,7 +63,6 @@  struct dma_chan *snd_dmaengine_pcm_get_chan(struct snd_pcm_substream *substream)
  * @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.
  * @fifo_size: FIFO size of the DAI controller in bytes
  * @flags: PCM_DAI flags, only SND_DMAENGINE_PCM_DAI_FLAG_PACK for now
  */
@@ -73,7 +72,6 @@  struct snd_dmaengine_dai_dma_data {
 	u32 maxburst;
 	unsigned int slave_id;
 	void *filter_data;
-	const char *chan_name;
 	unsigned int fifo_size;
 	unsigned int flags;
 };
@@ -99,10 +97,6 @@  void snd_dmaengine_pcm_set_config_from_dai_data(
  * playback.
  */
 #define SND_DMAENGINE_PCM_FLAG_HALF_DUPLEX BIT(3)
-/*
- * The PCM streams have custom channel names specified.
- */
-#define SND_DMAENGINE_PCM_FLAG_CUSTOM_CHANNEL_NAME BIT(4)
 
 /**
  * struct snd_dmaengine_pcm_config - Configuration data for dmaengine based PCM
diff --git a/sound/soc/soc-generic-dmaengine-pcm.c b/sound/soc/soc-generic-dmaengine-pcm.c
index 1b44e363c50c..f1ab6285a085 100644
--- a/sound/soc/soc-generic-dmaengine-pcm.c
+++ b/sound/soc/soc-generic-dmaengine-pcm.c
@@ -265,7 +265,6 @@  static int dmaengine_pcm_new(struct snd_soc_pcm_runtime *rtd)
 	struct dmaengine_pcm *pcm = soc_component_to_pcm(component);
 	const struct snd_dmaengine_pcm_config *config = pcm->config;
 	struct device *dev = component->dev;
-	struct snd_dmaengine_dai_dma_data *dma_data;
 	struct snd_pcm_substream *substream;
 	size_t prealloc_buffer_size;
 	size_t max_buffer_size;
@@ -285,19 +284,9 @@  static int dmaengine_pcm_new(struct snd_soc_pcm_runtime *rtd)
 		if (!substream)
 			continue;
 
-		dma_data = snd_soc_dai_get_dma_data(rtd->cpu_dai, substream);
-
-		if (!pcm->chan[i] &&
-		    ((pcm->flags & SND_DMAENGINE_PCM_FLAG_CUSTOM_CHANNEL_NAME) ||
-		     (config && config->chan_names[i]))) {
-			const char *chan_name = dma_data->chan_name;
-
-			if (config && config->chan_names[i])
-				chan_name = config->chan_names[i];
-
+		if (!pcm->chan[i] && config && config->chan_names[i])
 			pcm->chan[i] = dma_request_slave_channel(dev,
-				chan_name);
-		}
+				config->chan_names[i]);
 
 		if (!pcm->chan[i] && (pcm->flags & SND_DMAENGINE_PCM_FLAG_COMPAT)) {
 			pcm->chan[i] = dmaengine_pcm_compat_request_channel(rtd,
@@ -420,10 +409,8 @@  static int dmaengine_pcm_request_chan_of(struct dmaengine_pcm *pcm,
 	const char *name;
 	struct dma_chan *chan;
 
-	if ((pcm->flags & (SND_DMAENGINE_PCM_FLAG_NO_DT |
-			   SND_DMAENGINE_PCM_FLAG_CUSTOM_CHANNEL_NAME)) ||
-	     (!dev->of_node && !(config && config->dma_dev &&
-				config->dma_dev->of_node)))
+	if ((pcm->flags & SND_DMAENGINE_PCM_FLAG_NO_DT) || (!dev->of_node &&
+	    !(config && config->dma_dev && config->dma_dev->of_node)))
 		return 0;
 
 	if (config && config->dma_dev) {