Commit 62e94da3 authored by Takashi Iwai's avatar Takashi Iwai
Browse files

media: Drop superfluous PCM preallocation error checks 



snd_pcm_lib_preallocate_pages() and co always succeed, so the error
check is simply redundant.  Drop it.

Acked-by: default avatarEzequiel Garcia <ezequiel@collabora.com>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent 6c422436

drivers/media/pci/solo6x10/solo6x10-g723.c

+1 −3
Original line number Diff line number Diff line
@@ -360,13 +360,11 @@ static int solo_snd_pcm_init(struct solo_dev *solo_dev) 
	     ss; ss = ss->next, i++)

		sprintf(ss->name, "Camera #%d Audio", i);



	ret = snd_pcm_lib_preallocate_pages_for_all(pcm,

	snd_pcm_lib_preallocate_pages_for_all(pcm,

					SNDRV_DMA_TYPE_CONTINUOUS,

					snd_dma_continuous_data(GFP_KERNEL),

					G723_PERIOD_BYTES * PERIODS,

					G723_PERIOD_BYTES * PERIODS);

	if (ret < 0)

		return ret;



	solo_dev->snd_pcm = pcm;

drivers/media/pci/tw686x/tw686x-audio.c

+2 −1
Original line number Diff line number Diff line
@@ -301,11 +301,12 @@ static int tw686x_snd_pcm_init(struct tw686x_dev *dev) 
	     ss; ss = ss->next, i++)

		snprintf(ss->name, sizeof(ss->name), "vch%u audio", i);



	return snd_pcm_lib_preallocate_pages_for_all(pcm,

	snd_pcm_lib_preallocate_pages_for_all(pcm,

				SNDRV_DMA_TYPE_DEV,

				snd_dma_pci_data(dev->pci_dev),

				TW686X_AUDIO_PAGE_MAX * AUDIO_DMA_SIZE_MAX,

				TW686X_AUDIO_PAGE_MAX * AUDIO_DMA_SIZE_MAX);

	return 0;

}



static void tw686x_audio_dma_free(struct tw686x_dev *dev,

CRA Git | Maintained and supported by SUSTech CRA and CCSE