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

ALSA: pcm: Make snd_pcm_suspend() local static

Browse Source 
snd_pcm_suspend() is no longer called from outside, so let's make it
local static.  Also drop a superfluous NULL check there.

Reviewed-by: Jaroslav Kysela <perex@perex.cz>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
This commit is contained in:
Takashi Iwai 2019-01-15 10:54:02 +01:00
parent 910e7e1923
commit ce7f93e2bd
2 changed files with 3 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
include/sound/pcm.h
View File

@ -582,13 +582,8 @@ int snd_pcm_stop(struct snd_pcm_substream *substream, snd_pcm_state_t status);
int snd_pcm_drain_done(struct snd_pcm_substream *substream); int snd_pcm_drain_done(struct snd_pcm_substream *substream);
int snd_pcm_stop_xrun(struct snd_pcm_substream *substream); int snd_pcm_stop_xrun(struct snd_pcm_substream *substream);
#ifdef CONFIG_PM #ifdef CONFIG_PM
int snd_pcm_suspend(struct snd_pcm_substream *substream);
int snd_pcm_suspend_all(struct snd_pcm *pcm); int snd_pcm_suspend_all(struct snd_pcm *pcm);
#else #else
static inline int snd_pcm_suspend(struct snd_pcm_substream *substream)
{
return 0;
}
static inline int snd_pcm_suspend_all(struct snd_pcm *pcm) static inline int snd_pcm_suspend_all(struct snd_pcm *pcm)
{ {
return 0; return 0;

11
sound/core/pcm_native.c
View File

@ -1460,29 +1460,24 @@ static const struct action_ops snd_pcm_action_suspend = {
.post_action = snd_pcm_post_suspend .post_action = snd_pcm_post_suspend
}; };
/** /*
* snd_pcm_suspend - trigger SUSPEND to all linked streams * snd_pcm_suspend - trigger SUSPEND to all linked streams
* @substream: the PCM substream * @substream: the PCM substream
* *
* After this call, all streams are changed to SUSPENDED state. * After this call, all streams are changed to SUSPENDED state.
* *
* Return: Zero if successful (or @substream is %NULL), or a negative error * Return: Zero if successful, or a negative error code.
* code.
*/ */
int snd_pcm_suspend(struct snd_pcm_substream *substream) static int snd_pcm_suspend(struct snd_pcm_substream *substream)
{ {
int err; int err;
unsigned long flags; unsigned long flags;
if (! substream)
return 0;
snd_pcm_stream_lock_irqsave(substream, flags); snd_pcm_stream_lock_irqsave(substream, flags);
err = snd_pcm_action(&snd_pcm_action_suspend, substream, 0); err = snd_pcm_action(&snd_pcm_action_suspend, substream, 0);
snd_pcm_stream_unlock_irqrestore(substream, flags); snd_pcm_stream_unlock_irqrestore(substream, flags);
return err; return err;
} }
EXPORT_SYMBOL(snd_pcm_suspend);
/** /**
* snd_pcm_suspend_all - trigger SUSPEND to all substreams in the given pcm * snd_pcm_suspend_all - trigger SUSPEND to all substreams in the given pcm