Commit 7641d549 authored by Takashi Iwai's avatar Takashi Iwai
Browse files

ALSA: firewire: Use managed buffer allocation 



Clean up the drivers with the new managed buffer allocation API.
The superfluous snd_pcm_lib_malloc_pages() and
snd_pcm_lib_free_pages() calls are dropped.

Acked-by: default avatarTakashi Sakamoto <o-takashi@sakamocchi.jp>
Link: https://lore.kernel.org/r/20191209192422.23902-1-tiwai@suse.de


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

sound/firewire/bebob/bebob_pcm.c

+3 −8
Original line number Diff line number Diff line
@@ -212,11 +212,7 @@ static int pcm_hw_params(struct snd_pcm_substream *substream, 
			 struct snd_pcm_hw_params *hw_params)

{

	struct snd_bebob *bebob = substream->private_data;

	int err;



	err = snd_pcm_lib_malloc_pages(substream, params_buffer_bytes(hw_params));

	if (err < 0)

		return err;

	int err = 0;



	if (substream->runtime->status->state == SNDRV_PCM_STATE_OPEN) {

		unsigned int rate = params_rate(hw_params);
@@ -247,7 +243,7 @@ static int pcm_hw_free(struct snd_pcm_substream *substream) 


	mutex_unlock(&bebob->mutex);



	return snd_pcm_lib_free_pages(substream);

	return 0;

}



static int
@@ -377,8 +373,7 @@ int snd_bebob_create_pcm_devices(struct snd_bebob *bebob) 
		 "%s PCM", bebob->card->shortname);

	snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_PLAYBACK, &playback_ops);

	snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_CAPTURE, &capture_ops);

	snd_pcm_lib_preallocate_pages_for_all(pcm, SNDRV_DMA_TYPE_VMALLOC,

					      NULL, 0, 0);

	snd_pcm_set_managed_buffer_all(pcm, SNDRV_DMA_TYPE_VMALLOC, NULL, 0, 0);

end:

	return err;

}

sound/firewire/dice/dice-pcm.c

+4 −9
Original line number Diff line number Diff line
@@ -264,11 +264,7 @@ static int pcm_hw_params(struct snd_pcm_substream *substream, 
			 struct snd_pcm_hw_params *hw_params)

{

	struct snd_dice *dice = substream->private_data;

	int err;



	err = snd_pcm_lib_malloc_pages(substream, params_buffer_bytes(hw_params));

	if (err < 0)

		return err;

	int err = 0;



	if (substream->runtime->status->state == SNDRV_PCM_STATE_OPEN) {

		unsigned int rate = params_rate(hw_params);
@@ -304,7 +300,7 @@ static int pcm_hw_free(struct snd_pcm_substream *substream) 


	mutex_unlock(&dice->mutex);



	return snd_pcm_lib_free_pages(substream);

	return 0;

}



static int capture_prepare(struct snd_pcm_substream *substream)
@@ -457,8 +453,7 @@ int snd_dice_create_pcm(struct snd_dice *dice) 
			snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_PLAYBACK,

					&playback_ops);



		snd_pcm_lib_preallocate_pages_for_all(pcm,

						      SNDRV_DMA_TYPE_VMALLOC,

		snd_pcm_set_managed_buffer_all(pcm, SNDRV_DMA_TYPE_VMALLOC,

					       NULL, 0, 0);

	}

sound/firewire/digi00x/digi00x-pcm.c

+3 −8
Original line number Diff line number Diff line
@@ -188,11 +188,7 @@ static int pcm_hw_params(struct snd_pcm_substream *substream, 
			 struct snd_pcm_hw_params *hw_params)

{

	struct snd_dg00x *dg00x = substream->private_data;

	int err;



	err = snd_pcm_lib_malloc_pages(substream, params_buffer_bytes(hw_params));

	if (err < 0)

		return err;

	int err = 0;



	if (substream->runtime->status->state == SNDRV_PCM_STATE_OPEN) {

		unsigned int rate = params_rate(hw_params);
@@ -223,7 +219,7 @@ static int pcm_hw_free(struct snd_pcm_substream *substream) 


	mutex_unlock(&dg00x->mutex);



	return snd_pcm_lib_free_pages(substream);

	return 0;

}



static int pcm_capture_prepare(struct snd_pcm_substream *substream)
@@ -360,8 +356,7 @@ int snd_dg00x_create_pcm_devices(struct snd_dg00x *dg00x) 
		 "%s PCM", dg00x->card->shortname);

	snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_PLAYBACK, &playback_ops);

	snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_CAPTURE, &capture_ops);

	snd_pcm_lib_preallocate_pages_for_all(pcm, SNDRV_DMA_TYPE_VMALLOC,

					      NULL, 0, 0);

	snd_pcm_set_managed_buffer_all(pcm, SNDRV_DMA_TYPE_VMALLOC, NULL, 0, 0);



	return 0;

}

sound/firewire/fireface/ff-pcm.c

+3 −8
Original line number Diff line number Diff line
@@ -228,11 +228,7 @@ static int pcm_hw_params(struct snd_pcm_substream *substream, 
			 struct snd_pcm_hw_params *hw_params)

{

	struct snd_ff *ff = substream->private_data;

	int err;



	err = snd_pcm_lib_malloc_pages(substream, params_buffer_bytes(hw_params));

	if (err < 0)

		return err;

	int err = 0;



	if (substream->runtime->status->state == SNDRV_PCM_STATE_OPEN) {

		unsigned int rate = params_rate(hw_params);
@@ -263,7 +259,7 @@ static int pcm_hw_free(struct snd_pcm_substream *substream) 


	mutex_unlock(&ff->mutex);



	return snd_pcm_lib_free_pages(substream);

	return 0;

}



static int pcm_capture_prepare(struct snd_pcm_substream *substream)
@@ -400,8 +396,7 @@ int snd_ff_create_pcm_devices(struct snd_ff *ff) 
		 "%s PCM", ff->card->shortname);

	snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_PLAYBACK, &pcm_playback_ops);

	snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_CAPTURE, &pcm_capture_ops);

	snd_pcm_lib_preallocate_pages_for_all(pcm, SNDRV_DMA_TYPE_VMALLOC,

					      NULL, 0, 0);

	snd_pcm_set_managed_buffer_all(pcm, SNDRV_DMA_TYPE_VMALLOC, NULL, 0, 0);



	return 0;

}

sound/firewire/fireworks/fireworks_pcm.c

+3 −8
Original line number Diff line number Diff line
@@ -248,11 +248,7 @@ static int pcm_hw_params(struct snd_pcm_substream *substream, 
				 struct snd_pcm_hw_params *hw_params)

{

	struct snd_efw *efw = substream->private_data;

	int err;



	err = snd_pcm_lib_malloc_pages(substream, params_buffer_bytes(hw_params));

	if (err < 0)

		return err;

	int err = 0;



	if (substream->runtime->status->state == SNDRV_PCM_STATE_OPEN) {

		unsigned int rate = params_rate(hw_params);
@@ -283,7 +279,7 @@ static int pcm_hw_free(struct snd_pcm_substream *substream) 


	mutex_unlock(&efw->mutex);



	return snd_pcm_lib_free_pages(substream);

	return 0;

}



static int pcm_capture_prepare(struct snd_pcm_substream *substream)
@@ -406,8 +402,7 @@ int snd_efw_create_pcm_devices(struct snd_efw *efw) 
	snprintf(pcm->name, sizeof(pcm->name), "%s PCM", efw->card->shortname);

	snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_PLAYBACK, &playback_ops);

	snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_CAPTURE, &capture_ops);

	snd_pcm_lib_preallocate_pages_for_all(pcm, SNDRV_DMA_TYPE_VMALLOC,

					      NULL, 0, 0);

	snd_pcm_set_managed_buffer_all(pcm, SNDRV_DMA_TYPE_VMALLOC, NULL, 0, 0);

end:

	return err;

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE