diff options
author | 2015-01-19 14:58:29 +0100 | |
---|---|---|
committer | 2015-01-20 08:15:38 +0100 | |
commit | 988d350aef30b798198e7915c574f82ba173f40f (patch) | |
tree | ffe7ffffdbd1655c8ab774167b653716de3fe431 /sound | |
parent | ALSA: line6: Drop superfluous snd_device for rawmidi (diff) | |
download | linux-988d350aef30b798198e7915c574f82ba173f40f.tar.gz linux-988d350aef30b798198e7915c574f82ba173f40f.tar.bz2 linux-988d350aef30b798198e7915c574f82ba173f40f.zip |
ALSA: line6: Drop invalid SNDRV_PCM_INFO_RESUME flag
The line6 drivers don't support the full resume although they set
SNDRV_PCM_INFO_RESUME. These flags have to be dropped to inform
properly to the user-space.
Also, drop the CONFIG_PM in trigger callbacks, too, which are rather
superfluous.
Tested-by: Chris Rorvick <chris@rorvick.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound')
-rw-r--r-- | sound/usb/line6/capture.c | 4 | ||||
-rw-r--r-- | sound/usb/line6/playback.c | 4 | ||||
-rw-r--r-- | sound/usb/line6/pod.c | 6 | ||||
-rw-r--r-- | sound/usb/line6/podhd.c | 6 | ||||
-rw-r--r-- | sound/usb/line6/toneport.c | 6 |
5 files changed, 0 insertions, 26 deletions
diff --git a/sound/usb/line6/capture.c b/sound/usb/line6/capture.c index 4cf6fa0541f1..1970ab57cb6f 100644 --- a/sound/usb/line6/capture.c +++ b/sound/usb/line6/capture.c @@ -342,9 +342,7 @@ int snd_line6_capture_trigger(struct snd_line6_pcm *line6pcm, int cmd) switch (cmd) { case SNDRV_PCM_TRIGGER_START: -#ifdef CONFIG_PM case SNDRV_PCM_TRIGGER_RESUME: -#endif err = line6_pcm_acquire(line6pcm, LINE6_BIT_PCM_ALSA_CAPTURE_STREAM); @@ -354,9 +352,7 @@ int snd_line6_capture_trigger(struct snd_line6_pcm *line6pcm, int cmd) break; case SNDRV_PCM_TRIGGER_STOP: -#ifdef CONFIG_PM case SNDRV_PCM_TRIGGER_SUSPEND: -#endif err = line6_pcm_release(line6pcm, LINE6_BIT_PCM_ALSA_CAPTURE_STREAM); diff --git a/sound/usb/line6/playback.c b/sound/usb/line6/playback.c index 258147eadf37..8fc2dedbeb52 100644 --- a/sound/usb/line6/playback.c +++ b/sound/usb/line6/playback.c @@ -490,9 +490,7 @@ int snd_line6_playback_trigger(struct snd_line6_pcm *line6pcm, int cmd) switch (cmd) { case SNDRV_PCM_TRIGGER_START: -#ifdef CONFIG_PM case SNDRV_PCM_TRIGGER_RESUME: -#endif err = line6_pcm_acquire(line6pcm, LINE6_BIT_PCM_ALSA_PLAYBACK_STREAM); @@ -502,9 +500,7 @@ int snd_line6_playback_trigger(struct snd_line6_pcm *line6pcm, int cmd) break; case SNDRV_PCM_TRIGGER_STOP: -#ifdef CONFIG_PM case SNDRV_PCM_TRIGGER_SUSPEND: -#endif err = line6_pcm_release(line6pcm, LINE6_BIT_PCM_ALSA_PLAYBACK_STREAM); diff --git a/sound/usb/line6/pod.c b/sound/usb/line6/pod.c index dde9c2b8ad0f..d6bc5a1ab7f4 100644 --- a/sound/usb/line6/pod.c +++ b/sound/usb/line6/pod.c @@ -153,9 +153,6 @@ static struct line6_pcm_properties pod_pcm_properties = { SNDRV_PCM_INFO_BLOCK_TRANSFER | SNDRV_PCM_INFO_MMAP_VALID | SNDRV_PCM_INFO_PAUSE | -#ifdef CONFIG_PM - SNDRV_PCM_INFO_RESUME | -#endif SNDRV_PCM_INFO_SYNC_START), .formats = SNDRV_PCM_FMTBIT_S24_3LE, .rates = SNDRV_PCM_RATE_KNOT, @@ -173,9 +170,6 @@ static struct line6_pcm_properties pod_pcm_properties = { SNDRV_PCM_INFO_INTERLEAVED | SNDRV_PCM_INFO_BLOCK_TRANSFER | SNDRV_PCM_INFO_MMAP_VALID | -#ifdef CONFIG_PM - SNDRV_PCM_INFO_RESUME | -#endif SNDRV_PCM_INFO_SYNC_START), .formats = SNDRV_PCM_FMTBIT_S24_3LE, .rates = SNDRV_PCM_RATE_KNOT, diff --git a/sound/usb/line6/podhd.c b/sound/usb/line6/podhd.c index 84096326694c..8f4ca1d20b62 100644 --- a/sound/usb/line6/podhd.c +++ b/sound/usb/line6/podhd.c @@ -50,9 +50,6 @@ static struct line6_pcm_properties podhd_pcm_properties = { SNDRV_PCM_INFO_BLOCK_TRANSFER | SNDRV_PCM_INFO_MMAP_VALID | SNDRV_PCM_INFO_PAUSE | -#ifdef CONFIG_PM - SNDRV_PCM_INFO_RESUME | -#endif SNDRV_PCM_INFO_SYNC_START), .formats = SNDRV_PCM_FMTBIT_S24_3LE, .rates = SNDRV_PCM_RATE_48000, @@ -70,9 +67,6 @@ static struct line6_pcm_properties podhd_pcm_properties = { SNDRV_PCM_INFO_INTERLEAVED | SNDRV_PCM_INFO_BLOCK_TRANSFER | SNDRV_PCM_INFO_MMAP_VALID | -#ifdef CONFIG_PM - SNDRV_PCM_INFO_RESUME | -#endif SNDRV_PCM_INFO_SYNC_START), .formats = SNDRV_PCM_FMTBIT_S24_3LE, .rates = SNDRV_PCM_RATE_48000, diff --git a/sound/usb/line6/toneport.c b/sound/usb/line6/toneport.c index 4f07643e47f2..6ec3268a6153 100644 --- a/sound/usb/line6/toneport.c +++ b/sound/usb/line6/toneport.c @@ -83,9 +83,6 @@ static struct line6_pcm_properties toneport_pcm_properties = { SNDRV_PCM_INFO_BLOCK_TRANSFER | SNDRV_PCM_INFO_MMAP_VALID | SNDRV_PCM_INFO_PAUSE | -#ifdef CONFIG_PM - SNDRV_PCM_INFO_RESUME | -#endif SNDRV_PCM_INFO_SYNC_START), .formats = SNDRV_PCM_FMTBIT_S16_LE, .rates = SNDRV_PCM_RATE_KNOT, @@ -103,9 +100,6 @@ static struct line6_pcm_properties toneport_pcm_properties = { SNDRV_PCM_INFO_INTERLEAVED | SNDRV_PCM_INFO_BLOCK_TRANSFER | SNDRV_PCM_INFO_MMAP_VALID | -#ifdef CONFIG_PM - SNDRV_PCM_INFO_RESUME | -#endif SNDRV_PCM_INFO_SYNC_START), .formats = SNDRV_PCM_FMTBIT_S16_LE, .rates = SNDRV_PCM_RATE_KNOT, |