Alsa-Devel Archive on lore.kernel.org
 help / color / Atom feed
From: Takashi Iwai <tiwai@suse.de>
To: alsa-devel@alsa-project.org
Subject: [alsa-devel] [PATCH 14/24] ALSA: ua101: Convert to the common vmalloc memalloc
Date: Tue,  5 Nov 2019 16:18:46 +0100
Message-ID: <20191105151856.10785-15-tiwai@suse.de> (raw)
In-Reply-To: <20191105151856.10785-1-tiwai@suse.de>

The recent change (*) in the ALSA memalloc core allows us to drop the
special vmalloc-specific allocation and page handling.  This patch
coverts to the common code.
(*) df3fd6509421: ALSA: memalloc: Add vmalloc buffer allocation
                  support
    6ef6be988f98: ALSA: pcm: Handle special page mapping in the
                  default mmap handler

Signed-off-by: Takashi Iwai <tiwai@suse.de>
---
 sound/usb/misc/ua101.c | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/sound/usb/misc/ua101.c b/sound/usb/misc/ua101.c
index 307b72d5fffa..566a4a31528a 100644
--- a/sound/usb/misc/ua101.c
+++ b/sound/usb/misc/ua101.c
@@ -733,8 +733,8 @@ static int capture_pcm_hw_params(struct snd_pcm_substream *substream,
 	if (err < 0)
 		return err;
 
-	return snd_pcm_lib_alloc_vmalloc_buffer(substream,
-						params_buffer_bytes(hw_params));
+	return snd_pcm_lib_malloc_pages(substream,
+					params_buffer_bytes(hw_params));
 }
 
 static int playback_pcm_hw_params(struct snd_pcm_substream *substream,
@@ -751,13 +751,13 @@ static int playback_pcm_hw_params(struct snd_pcm_substream *substream,
 	if (err < 0)
 		return err;
 
-	return snd_pcm_lib_alloc_vmalloc_buffer(substream,
-						params_buffer_bytes(hw_params));
+	return snd_pcm_lib_malloc_pages(substream,
+					params_buffer_bytes(hw_params));
 }
 
 static int ua101_pcm_hw_free(struct snd_pcm_substream *substream)
 {
-	return snd_pcm_lib_free_vmalloc_buffer(substream);
+	return snd_pcm_lib_free_pages(substream);
 }
 
 static int capture_pcm_prepare(struct snd_pcm_substream *substream)
@@ -889,7 +889,6 @@ static const struct snd_pcm_ops capture_pcm_ops = {
 	.prepare = capture_pcm_prepare,
 	.trigger = capture_pcm_trigger,
 	.pointer = capture_pcm_pointer,
-	.page = snd_pcm_lib_get_vmalloc_page,
 };
 
 static const struct snd_pcm_ops playback_pcm_ops = {
@@ -901,7 +900,6 @@ static const struct snd_pcm_ops playback_pcm_ops = {
 	.prepare = playback_pcm_prepare,
 	.trigger = playback_pcm_trigger,
 	.pointer = playback_pcm_pointer,
-	.page = snd_pcm_lib_get_vmalloc_page,
 };
 
 static const struct uac_format_type_i_discrete_descriptor *
@@ -1296,6 +1294,8 @@ static int ua101_probe(struct usb_interface *interface,
 	strcpy(ua->pcm->name, name);
 	snd_pcm_set_ops(ua->pcm, SNDRV_PCM_STREAM_PLAYBACK, &playback_pcm_ops);
 	snd_pcm_set_ops(ua->pcm, SNDRV_PCM_STREAM_CAPTURE, &capture_pcm_ops);
+	snd_pcm_lib_preallocate_pages_for_all(ua->pcm, SNDRV_DMA_TYPE_VMALLOC,
+					      NULL, 0, 0);
 
 	err = snd_usbmidi_create(card, ua->intf[INTF_MIDI],
 				 &ua->midi_list, &midi_quirk);
-- 
2.16.4

_______________________________________________
Alsa-devel mailing list
Alsa-devel@alsa-project.org
https://mailman.alsa-project.org/mailman/listinfo/alsa-devel

  parent reply index

Thread overview: 25+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-11-05 15:18 [alsa-devel] [PATCH 00/24] Clean up memalloc callers Takashi Iwai
2019-11-05 15:18 ` [alsa-devel] [PATCH 01/24] ALSA: drivers: Remove superfluous snd_dma_continuous_data() Takashi Iwai
2019-11-05 15:18 ` [alsa-devel] [PATCH 02/24] ALSA: mips: " Takashi Iwai
2019-11-05 15:18 ` [alsa-devel] [PATCH 03/24] ALSA: rme32: " Takashi Iwai
2019-11-05 15:18 ` [alsa-devel] [PATCH 04/24] ALSA: sh: " Takashi Iwai
2019-11-05 15:18 ` [alsa-devel] [PATCH 05/24] ALSA: sparc: " Takashi Iwai
2019-11-05 15:18 ` [alsa-devel] [PATCH 06/24] ALSA: usb: " Takashi Iwai
2019-11-05 15:18 ` [alsa-devel] [PATCH 07/24] ALSA: 6fire: Drop the dead code Takashi Iwai
2019-11-05 15:18 ` [alsa-devel] [PATCH 08/24] ALSA: usb-audio: Convert to the common vmalloc memalloc Takashi Iwai
2019-11-05 15:18 ` [alsa-devel] [PATCH 09/24] ALSA: aloop: " Takashi Iwai
2019-11-05 15:18 ` [alsa-devel] [PATCH 10/24] ALSA: firewire: " Takashi Iwai
2019-11-05 15:18 ` [alsa-devel] [PATCH 11/24] ALSA: 6fire: " Takashi Iwai
2019-11-05 15:18 ` [alsa-devel] [PATCH 12/24] ALSA: caiaq: " Takashi Iwai
2019-11-05 15:18 ` [alsa-devel] [PATCH 13/24] ALSA: hiface: " Takashi Iwai
2019-11-05 15:18 ` Takashi Iwai [this message]
2019-11-05 15:18 ` [alsa-devel] [PATCH 15/24] ALSA: vx: " Takashi Iwai
2019-11-05 15:18 ` [alsa-devel] [PATCH 16/24] ALSA: pdaudiocf: " Takashi Iwai
2019-11-05 15:18 ` [alsa-devel] [PATCH 17/24] ALSA: mips: " Takashi Iwai
2019-11-05 15:18 ` [alsa-devel] [PATCH 18/24] ALSA: pci: Drop superfluous snd_pcm_sgbuf_ops_page Takashi Iwai
2019-11-05 15:18 ` [alsa-devel] [PATCH 19/24] ALSA: aoa: Avoid non-standard macro usage Takashi Iwai
2019-11-05 15:18 ` [alsa-devel] [PATCH 20/24] ALSA: echoaudio: " Takashi Iwai
2019-11-05 15:18 ` [alsa-devel] [PATCH 21/24] ALSA: es1968: " Takashi Iwai
2019-11-05 15:18 ` [alsa-devel] [PATCH 22/24] ALSA: rme: " Takashi Iwai
2019-11-05 15:18 ` [alsa-devel] [PATCH 23/24] ALSA: pci: " Takashi Iwai
2019-11-05 15:18 ` [alsa-devel] [PATCH 24/24] ALSA: docs: Remove snd_dma_pci_data() usage in documentation Takashi Iwai

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20191105151856.10785-15-tiwai@suse.de \
    --to=tiwai@suse.de \
    --cc=alsa-devel@alsa-project.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

Alsa-Devel Archive on lore.kernel.org

Archives are clonable:
	git clone --mirror https://lore.kernel.org/alsa-devel/0 alsa-devel/git/0.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 alsa-devel alsa-devel/ https://lore.kernel.org/alsa-devel \
		alsa-devel@alsa-project.org
	public-inbox-index alsa-devel

Example config snippet for mirrors

Newsgroup available over NNTP:
	nntp://nntp.lore.kernel.org/org.alsa-project.alsa-devel


AGPL code for this site: git clone https://public-inbox.org/public-inbox.git