Commit 0af0a4fe authored by Takashi Iwai's avatar Takashi Iwai
Browse files

ALSA: usb: Remove superfluous snd_dma_continuous_data() 

The recent change (commit 08422d2c: "ALSA: memalloc: Allow NULL
device for SNDRV_DMA_TYPE_CONTINUOUS type") made the PCM preallocation
helper accepting NULL as the device pointer for the default usage.
Drop the snd_dma_continuous_data() usage that became superfluous from
the callers.

Link: https://lore.kernel.org/r/20191105151856.10785-7-tiwai@suse.de


Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent 0382e4e1

sound/usb/line6/pcm.c

+1 −3
Original line number Diff line number Diff line
@@ -502,9 +502,7 @@ static int snd_line6_new_pcm(struct usb_line6 *line6, struct snd_pcm **pcm_ret) 


	/* pre-allocation of buffers */

	snd_pcm_lib_preallocate_pages_for_all(pcm, SNDRV_DMA_TYPE_CONTINUOUS,

					      snd_dma_continuous_data

					      (GFP_KERNEL), 64 * 1024,

					      128 * 1024);

					      NULL, 64 * 1024, 128 * 1024);

	return 0;

}

sound/usb/usx2y/usbusx2yaudio.c

+2 −2
Original line number Diff line number Diff line
@@ -970,13 +970,13 @@ static int usX2Y_audio_stream_new(struct snd_card *card, int playback_endpoint, 
	if (playback_endpoint) {

		snd_pcm_lib_preallocate_pages(pcm->streams[SNDRV_PCM_STREAM_PLAYBACK].substream,

					      SNDRV_DMA_TYPE_CONTINUOUS,

					      snd_dma_continuous_data(GFP_KERNEL),

					      NULL,

					      64*1024, 128*1024);

	}



	snd_pcm_lib_preallocate_pages(pcm->streams[SNDRV_PCM_STREAM_CAPTURE].substream,

				      SNDRV_DMA_TYPE_CONTINUOUS,

				      snd_dma_continuous_data(GFP_KERNEL),

				      NULL,

				      64*1024, 128*1024);

	usX2Y(card)->pcm_devs++;

sound/usb/usx2y/usx2yhwdeppcm.c

+2 −2
Original line number Diff line number Diff line
@@ -728,11 +728,11 @@ int usX2Y_hwdep_pcm_new(struct snd_card *card) 
	sprintf(pcm->name, NAME_ALLCAPS" hwdep Audio");

	snd_pcm_lib_preallocate_pages(pcm->streams[SNDRV_PCM_STREAM_PLAYBACK].substream,

				      SNDRV_DMA_TYPE_CONTINUOUS,

				      snd_dma_continuous_data(GFP_KERNEL),

				      NULL,

				      64*1024, 128*1024);

	snd_pcm_lib_preallocate_pages(pcm->streams[SNDRV_PCM_STREAM_CAPTURE].substream,

				      SNDRV_DMA_TYPE_CONTINUOUS,

				      snd_dma_continuous_data(GFP_KERNEL),

				      NULL,

				      64*1024, 128*1024);



	return 0;

CRA Git | Maintained and supported by SUSTech CRA and CCSE