mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-09-30 06:10:56 +00:00
Code Issues Releases Wiki Activity

ASoC: ti: remove compat dma probing

Browse source 
After running into a link error:

sound/soc/ti/edma-pcm.o:(.rodata+0x18): undefined reference to `edma_filter_fn'

I checked all users of this, and they have new-style 'dma_slave_map' tables,
so none of them should still need it. Removing the associated lines
simplifies the code and avoids the build-time dependency on the
respective dmaengine drivers.

Acked-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
Arnd Bergmann 2019-03-07 16:16:08 +01:00 committed by Mark Brown
parent fef050c88c
commit 642aafea88
No known key found for this signature in database
GPG key ID: 24D68B725D5487D0
2 changed files with 4 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
sound/soc/ti/edma-pcm.c
View file

@ -23,7 +23,6 @@
#include <sound/pcm_params.h> #include <sound/pcm_params.h>
#include <sound/soc.h> #include <sound/soc.h>
#include <sound/dmaengine_pcm.h> #include <sound/dmaengine_pcm.h>
#include <linux/edma.h>
#include "edma-pcm.h" #include "edma-pcm.h"
@ -43,14 +42,12 @@ static const struct snd_pcm_hardware edma_pcm_hardware = {
static const struct snd_dmaengine_pcm_config edma_dmaengine_pcm_config = { static const struct snd_dmaengine_pcm_config edma_dmaengine_pcm_config = {
.pcm_hardware = &edma_pcm_hardware, .pcm_hardware = &edma_pcm_hardware,
.prepare_slave_config = snd_dmaengine_pcm_prepare_slave_config, .prepare_slave_config = snd_dmaengine_pcm_prepare_slave_config,
.compat_filter_fn = edma_filter_fn,
.prealloc_buffer_size = 128 * 1024, .prealloc_buffer_size = 128 * 1024,
}; };
int edma_pcm_platform_register(struct device *dev) int edma_pcm_platform_register(struct device *dev)
{ {
return devm_snd_dmaengine_pcm_register(dev, &edma_dmaengine_pcm_config, return devm_snd_dmaengine_pcm_register(dev, &edma_dmaengine_pcm_config, 0);
SND_DMAENGINE_PCM_FLAG_COMPAT);
} }
EXPORT_SYMBOL_GPL(edma_pcm_platform_register); EXPORT_SYMBOL_GPL(edma_pcm_platform_register);

9
sound/soc/ti/sdma-pcm.c
View file

@ -11,7 +11,6 @@
#include <sound/pcm_params.h> #include <sound/pcm_params.h>
#include <sound/soc.h> #include <sound/soc.h>
#include <sound/dmaengine_pcm.h> #include <sound/dmaengine_pcm.h>
#include <linux/omap-dmaengine.h>
#include "sdma-pcm.h" #include "sdma-pcm.h"
@ -31,7 +30,6 @@ static const struct snd_pcm_hardware sdma_pcm_hardware = {
static const struct snd_dmaengine_pcm_config sdma_dmaengine_pcm_config = { static const struct snd_dmaengine_pcm_config sdma_dmaengine_pcm_config = {
.pcm_hardware = &sdma_pcm_hardware, .pcm_hardware = &sdma_pcm_hardware,
.prepare_slave_config = snd_dmaengine_pcm_prepare_slave_config, .prepare_slave_config = snd_dmaengine_pcm_prepare_slave_config,
.compat_filter_fn = omap_dma_filter_fn,
.prealloc_buffer_size = 128 * 1024, .prealloc_buffer_size = 128 * 1024,
}; };
@ -39,13 +37,12 @@ int sdma_pcm_platform_register(struct device *dev,
char *txdmachan, char *rxdmachan) char *txdmachan, char *rxdmachan)
{ {
struct snd_dmaengine_pcm_config *config; struct snd_dmaengine_pcm_config *config;
unsigned int flags = SND_DMAENGINE_PCM_FLAG_COMPAT; unsigned int flags = 0;
/* Standard names for the directions: 'tx' and 'rx' */ /* Standard names for the directions: 'tx' and 'rx' */
if (!txdmachan && !rxdmachan) if (!txdmachan && !rxdmachan)
return devm_snd_dmaengine_pcm_register(dev, return devm_snd_dmaengine_pcm_register(dev,
&sdma_dmaengine_pcm_config, &sdma_dmaengine_pcm_config, 0);
flags);
config = devm_kzalloc(dev, sizeof(*config), GFP_KERNEL); config = devm_kzalloc(dev, sizeof(*config), GFP_KERNEL);
if (!config) if (!config)
@ -65,7 +62,7 @@ int sdma_pcm_platform_register(struct device *dev,
config->chan_names[0] = txdmachan; config->chan_names[0] = txdmachan;
config->chan_names[1] = rxdmachan; config->chan_names[1] = rxdmachan;
return devm_snd_dmaengine_pcm_register(dev, config, flags); return devm_snd_dmaengine_pcm_register(dev, config, 0);
} }
EXPORT_SYMBOL_GPL(sdma_pcm_platform_register); EXPORT_SYMBOL_GPL(sdma_pcm_platform_register);