summaryrefslogtreecommitdiff
path: root/include/sound
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2019-01-18 19:37:14 +0300
committerTakashi Iwai <tiwai@suse.de>2019-01-18 19:37:21 +0300
commit436ec40e0cdf74eae90af6be6c287396e388f1fb (patch)
treeec85647d69d9d2a8f47da48e1ef0175c457c4bcc /include/sound
parent053b055948e97268771de11f2ab9b2aa1640b68d (diff)
parentce7f93e2bd6f649980846914e4a04ad6ba141fa6 (diff)
downloadlinux-436ec40e0cdf74eae90af6be6c287396e388f1fb.tar.xz
Merge branch 'topic/pcm-device-suspend' into for-next
Pull the PCM suspend improvement / cleanup. This moves the most of snd_pcm_suspend*() calls into PCM's own device PM ops. There should be no change from the functionality POV. Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'include/sound')
-rw-r--r--include/sound/pcm.h6
1 files changed, 1 insertions, 5 deletions
diff --git a/include/sound/pcm.h b/include/sound/pcm.h
index d6bd3caf6878..2c30c1ad1b0d 100644
--- a/include/sound/pcm.h
+++ b/include/sound/pcm.h
@@ -538,6 +538,7 @@ struct snd_pcm {
void (*private_free) (struct snd_pcm *pcm);
bool internal; /* pcm is for internal use only */
bool nonatomic; /* whole PCM operations are in non-atomic context */
+ bool no_device_suspend; /* don't invoke device PM suspend */
#if IS_ENABLED(CONFIG_SND_PCM_OSS)
struct snd_pcm_oss oss;
#endif
@@ -581,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;