aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2018-05-27 07:55:01 -0400
committerTakashi Iwai <tiwai@suse.de>2018-05-28 05:53:04 -0400
commit9f88058e7830d5943091e044e7b2d58773e31bca (patch)
tree5c04b1bfb5f1106e2a61e8b26b8599781352e436
parent014cea591afac9b3dae61793446f83d5be634203 (diff)
ALSA: aloop: Reduced duplicated PCM ops definition
The PCM ops defined for playback and capture are identical. Just use the single one for both. Signed-off-by: Takashi Iwai <tiwai@suse.de>
-rw-r--r--sound/drivers/aloop.c19
1 files changed, 3 insertions, 16 deletions
diff --git a/sound/drivers/aloop.c b/sound/drivers/aloop.c
index eab7f594ebe7..78a2fdc38531 100644
--- a/sound/drivers/aloop.c
+++ b/sound/drivers/aloop.c
@@ -768,20 +768,7 @@ static int loopback_close(struct snd_pcm_substream *substream)
768 return 0; 768 return 0;
769} 769}
770 770
771static const struct snd_pcm_ops loopback_playback_ops = { 771static const struct snd_pcm_ops loopback_pcm_ops = {
772 .open = loopback_open,
773 .close = loopback_close,
774 .ioctl = snd_pcm_lib_ioctl,
775 .hw_params = loopback_hw_params,
776 .hw_free = loopback_hw_free,
777 .prepare = loopback_prepare,
778 .trigger = loopback_trigger,
779 .pointer = loopback_pointer,
780 .page = snd_pcm_lib_get_vmalloc_page,
781 .mmap = snd_pcm_lib_mmap_vmalloc,
782};
783
784static const struct snd_pcm_ops loopback_capture_ops = {
785 .open = loopback_open, 772 .open = loopback_open,
786 .close = loopback_close, 773 .close = loopback_close,
787 .ioctl = snd_pcm_lib_ioctl, 774 .ioctl = snd_pcm_lib_ioctl,
@@ -804,8 +791,8 @@ static int loopback_pcm_new(struct loopback *loopback,
804 substreams, substreams, &pcm); 791 substreams, substreams, &pcm);
805 if (err < 0) 792 if (err < 0)
806 return err; 793 return err;
807 snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_PLAYBACK, &loopback_playback_ops); 794 snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_PLAYBACK, &loopback_pcm_ops);
808 snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_CAPTURE, &loopback_capture_ops); 795 snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_CAPTURE, &loopback_pcm_ops);
809 796
810 pcm->private_data = loopback; 797 pcm->private_data = loopback;
811 pcm->info_flags = 0; 798 pcm->info_flags = 0;