Commit 3ad10e57 authored by Takashi Iwai's avatar Takashi Iwai Committed by Greg Kroah-Hartman
Browse files

staging: bcm2835-audio: Use managed buffer allocation 



Clean up the driver with the new managed buffer allocation API.
The hw_params and hw_free callbacks became superfluous and dropped.

Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
Link: https://lore.kernel.org/r/20191210141356.18074-3-tiwai@suse.de


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 7e6d24d9

drivers/staging/vc04_services/bcm2835-audio/bcm2835-pcm.c

+1 −16
Original line number Diff line number Diff line
@@ -193,17 +193,6 @@ static int snd_bcm2835_playback_close(struct snd_pcm_substream *substream) 
	return 0;

}



static int snd_bcm2835_pcm_hw_params(struct snd_pcm_substream *substream,

	struct snd_pcm_hw_params *params)

{

	return snd_pcm_lib_malloc_pages(substream, params_buffer_bytes(params));

}



static int snd_bcm2835_pcm_hw_free(struct snd_pcm_substream *substream)

{

	return snd_pcm_lib_free_pages(substream);

}



static int snd_bcm2835_pcm_prepare(struct snd_pcm_substream *substream)

{

	struct bcm2835_chip *chip = snd_pcm_substream_chip(substream);
@@ -317,8 +306,6 @@ static const struct snd_pcm_ops snd_bcm2835_playback_ops = { 
	.open = snd_bcm2835_playback_open,

	.close = snd_bcm2835_playback_close,

	.ioctl = snd_pcm_lib_ioctl,

	.hw_params = snd_bcm2835_pcm_hw_params,

	.hw_free = snd_bcm2835_pcm_hw_free,

	.prepare = snd_bcm2835_pcm_prepare,

	.trigger = snd_bcm2835_pcm_trigger,

	.pointer = snd_bcm2835_pcm_pointer,
@@ -329,8 +316,6 @@ static const struct snd_pcm_ops snd_bcm2835_playback_spdif_ops = { 
	.open = snd_bcm2835_playback_spdif_open,

	.close = snd_bcm2835_playback_close,

	.ioctl = snd_pcm_lib_ioctl,

	.hw_params = snd_bcm2835_pcm_hw_params,

	.hw_free = snd_bcm2835_pcm_hw_free,

	.prepare = snd_bcm2835_pcm_prepare,

	.trigger = snd_bcm2835_pcm_trigger,

	.pointer = snd_bcm2835_pcm_pointer,
@@ -362,7 +347,7 @@ int snd_bcm2835_new_pcm(struct bcm2835_chip *chip, const char *name, 
			spdif ? &snd_bcm2835_playback_spdif_ops :

			&snd_bcm2835_playback_ops);



	snd_pcm_lib_preallocate_pages_for_all(pcm, SNDRV_DMA_TYPE_DEV,

	snd_pcm_set_managed_buffer_all(pcm, SNDRV_DMA_TYPE_DEV,

		chip->card->dev, 128 * 1024, 128 * 1024);



	if (spdif)