-----Original Message----- From: Takashi Iwai [mailto:tiwai@suse.de] Sent: Wednesday, January 16, 2019 12:22 AM To: alsa-devel@alsa-project.org Cc: Yang, Libin libin.yang@intel.com; Keyon Jie yang.jie@linux.intel.com; liam.r.girdwood@linux.intel.com; Pierre-Louis Bossart <pierre- louis.bossart@linux.intel.com>; broonie@kernel.org; Lin, Mengdong mengdong.lin@intel.com Subject: [PATCH 14/14] ALSA: pcm: Make snd_pcm_suspend() local static
snd_pcm_suspend() is no longer called from outside, so let's make it local static. Also drop a superfluous NULL check there.
Signed-off-by: Takashi Iwai tiwai@suse.de
include/sound/pcm.h | 5 ----- sound/core/pcm_native.c | 11 +++-------- 2 files changed, 3 insertions(+), 13 deletions(-)
diff --git a/include/sound/pcm.h b/include/sound/pcm.h index 04e97564949c..2c30c1ad1b0d 100644 --- a/include/sound/pcm.h +++ b/include/sound/pcm.h @@ -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_stop_xrun(struct snd_pcm_substream *substream); #ifdef CONFIG_PM -int snd_pcm_suspend(struct snd_pcm_substream *substream); int snd_pcm_suspend_all(struct snd_pcm *pcm); #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) { return 0; diff --git a/sound/core/pcm_native.c b/sound/core/pcm_native.c index 818dff1de545..26afb6b0889a 100644 --- a/sound/core/pcm_native.c +++ b/sound/core/pcm_native.c @@ -1460,29 +1460,24 @@ static const struct action_ops snd_pcm_action_suspend = { .post_action = snd_pcm_post_suspend };
-/** +/*
- snd_pcm_suspend - trigger SUSPEND to all linked streams
- @substream: the PCM substream
- After this call, all streams are changed to SUSPENDED state.
- Return: Zero if successful (or @substream is %NULL), or a negative error
- code.
- Return: Zero if successful, or a negative error code.
*/ -int snd_pcm_suspend(struct snd_pcm_substream *substream) +static int snd_pcm_suspend(struct snd_pcm_substream *substream)
If some drivers may use snd_pcm_suspend() later for corner cases, is it OK to make it be external again?
Regards, Libin
{ int err; unsigned long flags;
- if (! substream)
return 0;- snd_pcm_stream_lock_irqsave(substream, flags); err = snd_pcm_action(&snd_pcm_action_suspend, substream, 0); snd_pcm_stream_unlock_irqrestore(substream, flags); return err;
} -EXPORT_SYMBOL(snd_pcm_suspend);
/**
- snd_pcm_suspend_all - trigger SUSPEND to all substreams in the given pcm
-- 2.20.1