diff options
| author |   Sylwester Nawrocki <s.nawrocki@samsung.com> | 2016-10-25 17:08:38 +0200 |
|---|---|---|
| committer |   Mark Brown <broonie@kernel.org> | 2016-10-25 20:22:48 +0100 |
| commit | cdaf9af1eaeb539e32bfd6da6310b41ad6c3ba23 (patch) | |
| tree | 6a092f2420a2e71716bc129a5e54784116ddd472 /sound/soc/samsung/dmaengine.c | |
| parent | Linux 4.9-rc1 (diff) | |
| download | wireguard-linux-cdaf9af1eaeb539e32bfd6da6310b41ad6c3ba23.tar.xz wireguard-linux-cdaf9af1eaeb539e32bfd6da6310b41ad6c3ba23.zip | |
ASoC: samsung: Remove unneeded initialization of chan_name
This patch updates the I2S drivers to always use chan_names[] field
of struct snd_dmaengine_pcm_config for specifying DMA channel names,
rather than using struct snd_dmaengine_dai_dma_data.
This allows us to subsequently drop the
SND_DMAENGINE_PCM_FLAG_CUSTOM_CHANNEL_NAME flag, now when the last
use of that flag is removed.
Signed-off-by: Sylwester Nawrocki <s.nawrocki@samsung.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'sound/soc/samsung/dmaengine.c')
| -rw-r--r-- | sound/soc/samsung/dmaengine.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/sound/soc/samsung/dmaengine.c b/sound/soc/samsung/dmaengine.c index 9104c98deeb7..cda656e4afc6 100644 --- a/sound/soc/samsung/dmaengine.c +++ b/sound/soc/samsung/dmaengine.c @@ -37,12 +37,8 @@ int samsung_asoc_dma_platform_register(struct device *dev, dma_filter_fn filter, pcm_conf->prepare_slave_config = snd_dmaengine_pcm_prepare_slave_config; pcm_conf->compat_filter_fn = filter; - if (dev->of_node) { - pcm_conf->chan_names[SNDRV_PCM_STREAM_PLAYBACK] = tx; - pcm_conf->chan_names[SNDRV_PCM_STREAM_CAPTURE] = rx; - } else { - flags |= SND_DMAENGINE_PCM_FLAG_CUSTOM_CHANNEL_NAME; - } + pcm_conf->chan_names[SNDRV_PCM_STREAM_PLAYBACK] = tx; + pcm_conf->chan_names[SNDRV_PCM_STREAM_CAPTURE] = rx; return devm_snd_dmaengine_pcm_register(dev, pcm_conf, flags); } |