Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 988d350a authored by Takashi Iwai's avatar Takashi Iwai
Browse files

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: default avatarChris Rorvick <chris@rorvick.com>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent aaa68d2f

sound/usb/line6/capture.c

+0 −4
Original line number Diff line number Diff line
@@ -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);

sound/usb/line6/playback.c

+0 −4
Original line number Diff line number Diff line
@@ -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);

sound/usb/line6/pod.c

+0 −6
Original line number Diff line number Diff line
@@ -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,

sound/usb/line6/podhd.c

+0 −6
Original line number Diff line number Diff line
@@ -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,

sound/usb/line6/toneport.c

+0 −6
Original line number Diff line number Diff line
@@ -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,