leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ASoC: pxa: clean up function names in pxa2xx-lib

Browse Source 
Clean up the namespace a bit and drop the __ prefix of all functions
exported by pxa2xx-lib. This improves the readability of the code.

Signed-off-by: Daniel Mack <daniel@zonque.org>
Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
Daniel Mack 2018-06-27 21:33:54 +02:00 committed by Mark Brown
parent 95acb005fe
commit a7160670b5
No known key found for this signature in database
GPG Key ID: 24D68B725D5487D0
4 changed files with 28 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
include/sound/pxa2xx-lib.h
View File

@ -10,14 +10,14 @@ struct snd_pcm_substream;
struct snd_pcm_hw_params; struct snd_pcm_hw_params;
struct snd_pcm; struct snd_pcm;
extern int __pxa2xx_pcm_hw_params(struct snd_pcm_substream *substream, extern int pxa2xx_pcm_hw_params(struct snd_pcm_substream *substream,
struct snd_pcm_hw_params *params); struct snd_pcm_hw_params *params);
extern int __pxa2xx_pcm_hw_free(struct snd_pcm_substream *substream); extern int pxa2xx_pcm_hw_free(struct snd_pcm_substream *substream);
extern int pxa2xx_pcm_trigger(struct snd_pcm_substream *substream, int cmd); extern int pxa2xx_pcm_trigger(struct snd_pcm_substream *substream, int cmd);
extern snd_pcm_uframes_t pxa2xx_pcm_pointer(struct snd_pcm_substream *substream); extern snd_pcm_uframes_t pxa2xx_pcm_pointer(struct snd_pcm_substream *substream);
extern int __pxa2xx_pcm_prepare(struct snd_pcm_substream *substream); extern int pxa2xx_pcm_prepare(struct snd_pcm_substream *substream);
extern int __pxa2xx_pcm_open(struct snd_pcm_substream *substream); extern int pxa2xx_pcm_open(struct snd_pcm_substream *substream);
extern int __pxa2xx_pcm_close(struct snd_pcm_substream *substream); extern int pxa2xx_pcm_close(struct snd_pcm_substream *substream);
extern int pxa2xx_pcm_mmap(struct snd_pcm_substream *substream, extern int pxa2xx_pcm_mmap(struct snd_pcm_substream *substream,
struct vm_area_struct *vma); struct vm_area_struct *vma);
extern int pxa2xx_pcm_preallocate_dma_buffer(struct snd_pcm *pcm, int stream); extern int pxa2xx_pcm_preallocate_dma_buffer(struct snd_pcm *pcm, int stream);

10
sound/arm/pxa2xx-ac97.c
View File

@ -70,7 +70,7 @@ static int pxa2xx_ac97_pcm_open(struct snd_pcm_substream *substream)
pxa2xx_audio_ops_t *platform_ops; pxa2xx_audio_ops_t *platform_ops;
int ret, i; int ret, i;
ret = __pxa2xx_pcm_open(substream); ret = pxa2xx_pcm_open(substream);
if (ret) if (ret)
return ret; return ret;
@ -86,7 +86,7 @@ static int pxa2xx_ac97_pcm_open(struct snd_pcm_substream *substream)
if (platform_ops && platform_ops->startup) { if (platform_ops && platform_ops->startup) {
ret = platform_ops->startup(substream, platform_ops->priv); ret = platform_ops->startup(substream, platform_ops->priv);
if (ret < 0) if (ret < 0)
__pxa2xx_pcm_close(substream); pxa2xx_pcm_close(substream);
} }
return ret; return ret;
@ -110,7 +110,7 @@ static int pxa2xx_ac97_pcm_prepare(struct snd_pcm_substream *substream)
AC97_PCM_FRONT_DAC_RATE : AC97_PCM_LR_ADC_RATE; AC97_PCM_FRONT_DAC_RATE : AC97_PCM_LR_ADC_RATE;
int ret; int ret;
ret = __pxa2xx_pcm_prepare(substream); ret = pxa2xx_pcm_prepare(substream);
if (ret < 0) if (ret < 0)
return ret; return ret;
@ -178,8 +178,8 @@ static const struct snd_pcm_ops pxa2xx_pcm_ops = {
.open = pxa2xx_ac97_pcm_open, .open = pxa2xx_ac97_pcm_open,
.close = pxa2xx_ac97_pcm_close, .close = pxa2xx_ac97_pcm_close,
.ioctl = snd_pcm_lib_ioctl, .ioctl = snd_pcm_lib_ioctl,
.hw_params = __pxa2xx_pcm_hw_params, .hw_params = pxa2xx_pcm_hw_params,
.hw_free = __pxa2xx_pcm_hw_free, .hw_free = pxa2xx_pcm_hw_free,
.prepare = pxa2xx_ac97_pcm_prepare, .prepare = pxa2xx_ac97_pcm_prepare,
.trigger = pxa2xx_pcm_trigger, .trigger = pxa2xx_pcm_trigger,
.pointer = pxa2xx_pcm_pointer, .pointer = pxa2xx_pcm_pointer,

22
sound/arm/pxa2xx-pcm-lib.c
View File

@ -33,8 +33,8 @@ static const struct snd_pcm_hardware pxa2xx_pcm_hardware = {
.fifo_size = 32, .fifo_size = 32,
}; };
int __pxa2xx_pcm_hw_params(struct snd_pcm_substream *substream, int pxa2xx_pcm_hw_params(struct snd_pcm_substream *substream,
struct snd_pcm_hw_params *params) struct snd_pcm_hw_params *params)
{ {
struct dma_chan *chan = snd_dmaengine_pcm_get_chan(substream); struct dma_chan *chan = snd_dmaengine_pcm_get_chan(substream);
struct snd_soc_pcm_runtime *rtd = substream->private_data; struct snd_soc_pcm_runtime *rtd = substream->private_data;
@ -62,14 +62,14 @@ int __pxa2xx_pcm_hw_params(struct snd_pcm_substream *substream,
return 0; return 0;
} }
EXPORT_SYMBOL(__pxa2xx_pcm_hw_params); EXPORT_SYMBOL(pxa2xx_pcm_hw_params);
int __pxa2xx_pcm_hw_free(struct snd_pcm_substream *substream) int pxa2xx_pcm_hw_free(struct snd_pcm_substream *substream)
{ {
snd_pcm_set_runtime_buffer(substream, NULL); snd_pcm_set_runtime_buffer(substream, NULL);
return 0; return 0;
} }
EXPORT_SYMBOL(__pxa2xx_pcm_hw_free); EXPORT_SYMBOL(pxa2xx_pcm_hw_free);
int pxa2xx_pcm_trigger(struct snd_pcm_substream *substream, int cmd) int pxa2xx_pcm_trigger(struct snd_pcm_substream *substream, int cmd)
{ {
@ -84,13 +84,13 @@ pxa2xx_pcm_pointer(struct snd_pcm_substream *substream)
} }
EXPORT_SYMBOL(pxa2xx_pcm_pointer); EXPORT_SYMBOL(pxa2xx_pcm_pointer);
int __pxa2xx_pcm_prepare(struct snd_pcm_substream *substream) int pxa2xx_pcm_prepare(struct snd_pcm_substream *substream)
{ {
return 0; return 0;
} }
EXPORT_SYMBOL(__pxa2xx_pcm_prepare); EXPORT_SYMBOL(pxa2xx_pcm_prepare);
int __pxa2xx_pcm_open(struct snd_pcm_substream *substream) int pxa2xx_pcm_open(struct snd_pcm_substream *substream)
{ {
struct snd_soc_pcm_runtime *rtd = substream->private_data; struct snd_soc_pcm_runtime *rtd = substream->private_data;
struct snd_pcm_runtime *runtime = substream->runtime; struct snd_pcm_runtime *runtime = substream->runtime;
@ -127,13 +127,13 @@ int __pxa2xx_pcm_open(struct snd_pcm_substream *substream)
substream, dma_request_slave_channel(rtd->cpu_dai->dev, substream, dma_request_slave_channel(rtd->cpu_dai->dev,
dma_params->chan_name)); dma_params->chan_name));
} }
EXPORT_SYMBOL(__pxa2xx_pcm_open); EXPORT_SYMBOL(pxa2xx_pcm_open);
int __pxa2xx_pcm_close(struct snd_pcm_substream *substream) int pxa2xx_pcm_close(struct snd_pcm_substream *substream)
{ {
return snd_dmaengine_pcm_close_release_chan(substream); return snd_dmaengine_pcm_close_release_chan(substream);
} }
EXPORT_SYMBOL(__pxa2xx_pcm_close); EXPORT_SYMBOL(pxa2xx_pcm_close);
int pxa2xx_pcm_mmap(struct snd_pcm_substream *substream, int pxa2xx_pcm_mmap(struct snd_pcm_substream *substream,
struct vm_area_struct *vma) struct vm_area_struct *vma)

21
sound/soc/pxa/pxa2xx-pcm.c
View File

@ -20,8 +20,8 @@
#include <sound/pxa2xx-lib.h> #include <sound/pxa2xx-lib.h>
#include <sound/dmaengine_pcm.h> #include <sound/dmaengine_pcm.h>
static int pxa2xx_pcm_hw_params(struct snd_pcm_substream *substream, static int __pxa2xx_pcm_hw_params(struct snd_pcm_substream *substream,
struct snd_pcm_hw_params *params) struct snd_pcm_hw_params *params)
{ {
struct snd_soc_pcm_runtime *rtd = substream->private_data; struct snd_soc_pcm_runtime *rtd = substream->private_data;
struct snd_dmaengine_dai_dma_data *dma; struct snd_dmaengine_dai_dma_data *dma;
@ -33,23 +33,16 @@ static int pxa2xx_pcm_hw_params(struct snd_pcm_substream *substream,
if (!dma) if (!dma)
return 0; return 0;
return __pxa2xx_pcm_hw_params(substream, params); return pxa2xx_pcm_hw_params(substream, params);
}
static int pxa2xx_pcm_hw_free(struct snd_pcm_substream *substream)
{
__pxa2xx_pcm_hw_free(substream);
return 0;
} }
static const struct snd_pcm_ops pxa2xx_pcm_ops = { static const struct snd_pcm_ops pxa2xx_pcm_ops = {
.open = __pxa2xx_pcm_open, .open = pxa2xx_pcm_open,
.close = __pxa2xx_pcm_close, .close = pxa2xx_pcm_close,
.ioctl = snd_pcm_lib_ioctl, .ioctl = snd_pcm_lib_ioctl,
.hw_params = pxa2xx_pcm_hw_params, .hw_params = __pxa2xx_pcm_hw_params,
.hw_free = pxa2xx_pcm_hw_free, .hw_free = pxa2xx_pcm_hw_free,
.prepare = __pxa2xx_pcm_prepare, .prepare = pxa2xx_pcm_prepare,
.trigger = pxa2xx_pcm_trigger, .trigger = pxa2xx_pcm_trigger,
.pointer = pxa2xx_pcm_pointer, .pointer = pxa2xx_pcm_pointer,
.mmap = pxa2xx_pcm_mmap, .mmap = pxa2xx_pcm_mmap,