kevin/linux
1
Fork 0
Code

ASoC: soc-pcm: makes snd_soc_dpcm_can_be_xxx() local function

Browse Source 
No driver is calling snd_soc_dpcm_can_be_xxx() functions. We don't need
to have EXPORT_SYMBOL_GPL() for them. Let's makes it static function.
One note is that snd_soc_dpcm_fe_can_update() is not used in upstream.
Use #if-endif and keep it for future support.

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Link: https://patch.msgid.link/87h6b6df7e.wl-kuninori.morimoto.gx@renesas.com
Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
Kuninori Morimoto 2024-08-26 23:41:57 +00:00 committed by Mark Brown
parent 4dd4baa440
commit 290f31e943
No known key found for this signature in database
GPG Key ID: 24D68B725D5487D0
2 changed files with 10 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
include/sound/soc-dpcm.h
View File

@ -113,24 +113,6 @@ struct snd_soc_dpcm_runtime {
#define for_each_dpcm_be_rollback(fe, stream, _dpcm) \ #define for_each_dpcm_be_rollback(fe, stream, _dpcm) \
list_for_each_entry_continue_reverse(_dpcm, &(fe)->dpcm[stream].be_clients, list_be) list_for_each_entry_continue_reverse(_dpcm, &(fe)->dpcm[stream].be_clients, list_be)
/* can this BE stop and free */
int snd_soc_dpcm_can_be_free_stop(struct snd_soc_pcm_runtime *fe,
struct snd_soc_pcm_runtime *be, int stream);
/* can this BE perform a hw_params() */
int snd_soc_dpcm_can_be_params(struct snd_soc_pcm_runtime *fe,
struct snd_soc_pcm_runtime *be, int stream);
/* can this BE perform prepare */
int snd_soc_dpcm_can_be_prepared(struct snd_soc_pcm_runtime *fe,
struct snd_soc_pcm_runtime *be, int stream);
/* is the current PCM operation for this FE ? */
int snd_soc_dpcm_fe_can_update(struct snd_soc_pcm_runtime *fe, int stream);
/* is the current PCM operation for this BE ? */
int snd_soc_dpcm_be_can_update(struct snd_soc_pcm_runtime *fe,
struct snd_soc_pcm_runtime *be, int stream);
/* get the substream for this BE */ /* get the substream for this BE */
struct snd_pcm_substream * struct snd_pcm_substream *

23
sound/soc/soc-pcm.c
View File

@ -50,16 +50,17 @@ static inline int _soc_pcm_ret(struct snd_soc_pcm_runtime *rtd,
} }
/* is the current PCM operation for this FE ? */ /* is the current PCM operation for this FE ? */
int snd_soc_dpcm_fe_can_update(struct snd_soc_pcm_runtime *fe, int stream) #if 0
static int snd_soc_dpcm_fe_can_update(struct snd_soc_pcm_runtime *fe, int stream)
{ {
if (fe->dpcm[stream].runtime_update == SND_SOC_DPCM_UPDATE_FE) if (fe->dpcm[stream].runtime_update == SND_SOC_DPCM_UPDATE_FE)
return 1; return 1;
return 0; return 0;
} }
EXPORT_SYMBOL_GPL(snd_soc_dpcm_fe_can_update); #endif
/* is the current PCM operation for this BE ? */ /* is the current PCM operation for this BE ? */
int snd_soc_dpcm_be_can_update(struct snd_soc_pcm_runtime *fe, static int snd_soc_dpcm_be_can_update(struct snd_soc_pcm_runtime *fe,
struct snd_soc_pcm_runtime *be, int stream) struct snd_soc_pcm_runtime *be, int stream)
{ {
if ((fe->dpcm[stream].runtime_update == SND_SOC_DPCM_UPDATE_FE) || if ((fe->dpcm[stream].runtime_update == SND_SOC_DPCM_UPDATE_FE) ||
@ -68,7 +69,6 @@ int snd_soc_dpcm_be_can_update(struct snd_soc_pcm_runtime *fe,
return 1; return 1;
return 0; return 0;
} }
EXPORT_SYMBOL_GPL(snd_soc_dpcm_be_can_update);
static int snd_soc_dpcm_check_state(struct snd_soc_pcm_runtime *fe, static int snd_soc_dpcm_check_state(struct snd_soc_pcm_runtime *fe,
struct snd_soc_pcm_runtime *be, struct snd_soc_pcm_runtime *be,
@ -103,8 +103,8 @@ static int snd_soc_dpcm_check_state(struct snd_soc_pcm_runtime *fe,
* We can only hw_free, stop, pause or suspend a BE DAI if any of it's FE * We can only hw_free, stop, pause or suspend a BE DAI if any of it's FE
* are not running, paused or suspended for the specified stream direction. * are not running, paused or suspended for the specified stream direction.
*/ */
int snd_soc_dpcm_can_be_free_stop(struct snd_soc_pcm_runtime *fe, static int snd_soc_dpcm_can_be_free_stop(struct snd_soc_pcm_runtime *fe,
struct snd_soc_pcm_runtime *be, int stream) struct snd_soc_pcm_runtime *be, int stream)
{ {
const enum snd_soc_dpcm_state state[] = { const enum snd_soc_dpcm_state state[] = {
SND_SOC_DPCM_STATE_START, SND_SOC_DPCM_STATE_START,
@ -114,14 +114,13 @@ int snd_soc_dpcm_can_be_free_stop(struct snd_soc_pcm_runtime *fe,
return snd_soc_dpcm_check_state(fe, be, stream, state, ARRAY_SIZE(state)); return snd_soc_dpcm_check_state(fe, be, stream, state, ARRAY_SIZE(state));
} }
EXPORT_SYMBOL_GPL(snd_soc_dpcm_can_be_free_stop);
/* /*
* We can only change hw params a BE DAI if any of it's FE are not prepared, * We can only change hw params a BE DAI if any of it's FE are not prepared,
* running, paused or suspended for the specified stream direction. * running, paused or suspended for the specified stream direction.
*/ */
int snd_soc_dpcm_can_be_params(struct snd_soc_pcm_runtime *fe, static int snd_soc_dpcm_can_be_params(struct snd_soc_pcm_runtime *fe,
struct snd_soc_pcm_runtime *be, int stream) struct snd_soc_pcm_runtime *be, int stream)
{ {
const enum snd_soc_dpcm_state state[] = { const enum snd_soc_dpcm_state state[] = {
SND_SOC_DPCM_STATE_START, SND_SOC_DPCM_STATE_START,
@ -132,14 +131,13 @@ int snd_soc_dpcm_can_be_params(struct snd_soc_pcm_runtime *fe,
return snd_soc_dpcm_check_state(fe, be, stream, state, ARRAY_SIZE(state)); return snd_soc_dpcm_check_state(fe, be, stream, state, ARRAY_SIZE(state));
} }
EXPORT_SYMBOL_GPL(snd_soc_dpcm_can_be_params);
/* /*
* We can only prepare a BE DAI if any of it's FE are not prepared, * We can only prepare a BE DAI if any of it's FE are not prepared,
* running or paused for the specified stream direction. * running or paused for the specified stream direction.
*/ */
int snd_soc_dpcm_can_be_prepared(struct snd_soc_pcm_runtime *fe, static int snd_soc_dpcm_can_be_prepared(struct snd_soc_pcm_runtime *fe,
struct snd_soc_pcm_runtime *be, int stream) struct snd_soc_pcm_runtime *be, int stream)
{ {
const enum snd_soc_dpcm_state state[] = { const enum snd_soc_dpcm_state state[] = {
SND_SOC_DPCM_STATE_START, SND_SOC_DPCM_STATE_START,
@ -149,7 +147,6 @@ int snd_soc_dpcm_can_be_prepared(struct snd_soc_pcm_runtime *fe,
return snd_soc_dpcm_check_state(fe, be, stream, state, ARRAY_SIZE(state)); return snd_soc_dpcm_check_state(fe, be, stream, state, ARRAY_SIZE(state));
} }
EXPORT_SYMBOL_GPL(snd_soc_dpcm_can_be_prepared);
#define DPCM_MAX_BE_USERS 8 #define DPCM_MAX_BE_USERS 8