Unverified Commit 76d9c68b authored by Sylwester Nawrocki's avatar Sylwester Nawrocki Committed by Mark Brown
Browse files

ASoC: dmaengine: Remove unused SND_DMAENGINE_PCM_FLAG_CUSTOM_CHANNEL_NAME flag 



There is now no users of this flag so remove it together with
related code.  The chan_name field of snd_dmaengine_dai_dma_data
data structure is not removed as it is still in use by the PXA
platform.

Signed-off-by: default avatarSylwester Nawrocki <s.nawrocki@samsung.com>
Acked-by: default avatarKrzysztof Kozlowski <krzk@kernel.org>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 541ccdc1

include/sound/dmaengine_pcm.h

+0 −4
Original line number Diff line number Diff line
@@ -99,10 +99,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

sound/soc/soc-generic-dmaengine-pcm.c

+4 −17
Original line number Diff line number Diff line
@@ -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) {

CRA Git | Maintained and supported by SUSTech CRA and CCSE