Skip to content

Commit

Permalink
ALSA: firewire: Use managed buffer allocation
Browse files Browse the repository at this point in the history 
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: Takashi Sakamoto <[email protected]>
Link: https://lore.kernel.org/r/[email protected]
Signed-off-by: Takashi Iwai <[email protected]>
  • Loading branch information
@tiwai
tiwai committed Dec 11, 2019
1 parent 8f32630 commit 7641d54
Show file tree
Hide file tree
Showing 9 changed files with 29 additions and 79 deletions.
11 changes: 3 additions & 8 deletions sound/firewire/bebob/bebob_pcm.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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;
}
13 changes: 4 additions & 9 deletions sound/firewire/dice/dice-pcm.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -457,9 +453,8 @@ 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,
NULL, 0, 0);
snd_pcm_set_managed_buffer_all(pcm, SNDRV_DMA_TYPE_VMALLOC,
NULL, 0, 0);
}

return 0;
Expand Down
11 changes: 3 additions & 8 deletions sound/firewire/digi00x/digi00x-pcm.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -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;
}
11 changes: 3 additions & 8 deletions sound/firewire/fireface/ff-pcm.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -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;
}
11 changes: 3 additions & 8 deletions sound/firewire/fireworks/fireworks_pcm.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -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;
}
Expand Down
10 changes: 2 additions & 8 deletions sound/firewire/isight.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -286,11 +286,6 @@ static int isight_hw_params(struct snd_pcm_substream *substream,
struct snd_pcm_hw_params *hw_params)
{
struct isight *isight = substream->private_data;
int err;

err = snd_pcm_lib_malloc_pages(substream, params_buffer_bytes(hw_params));
if (err < 0)
return err;

WRITE_ONCE(isight->pcm_active, true);

Expand Down Expand Up @@ -336,7 +331,7 @@ static int isight_hw_free(struct snd_pcm_substream *substream)
isight_stop_streaming(isight);
mutex_unlock(&isight->mutex);

return snd_pcm_lib_free_pages(substream);
return 0;
}

static int isight_start_streaming(struct isight *isight)
Expand Down Expand Up @@ -463,8 +458,7 @@ static int isight_create_pcm(struct isight *isight)
strcpy(pcm->name, "iSight");
isight->pcm = pcm->streams[SNDRV_PCM_STREAM_CAPTURE].substream;
isight->pcm->ops = &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;
}
Expand Down
11 changes: 3 additions & 8 deletions sound/firewire/motu/motu-pcm.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -212,11 +212,7 @@ static int pcm_hw_params(struct snd_pcm_substream *substream,
struct snd_pcm_hw_params *hw_params)
{
struct snd_motu *motu = 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);
Expand Down Expand Up @@ -247,7 +243,7 @@ static int pcm_hw_free(struct snd_pcm_substream *substream)

mutex_unlock(&motu->mutex);

return snd_pcm_lib_free_pages(substream);
return 0;
}

static int capture_prepare(struct snd_pcm_substream *substream)
Expand Down Expand Up @@ -374,8 +370,7 @@ int snd_motu_create_pcm_devices(struct snd_motu *motu)

snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_CAPTURE, &capture_ops);
snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_PLAYBACK, &playback_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;
}
19 changes: 5 additions & 14 deletions sound/firewire/oxfw/oxfw-pcm.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -237,11 +237,7 @@ static int pcm_capture_hw_params(struct snd_pcm_substream *substream,
struct snd_pcm_hw_params *hw_params)
{
struct snd_oxfw *oxfw = 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);
Expand All @@ -264,11 +260,7 @@ static int pcm_playback_hw_params(struct snd_pcm_substream *substream,
struct snd_pcm_hw_params *hw_params)
{
struct snd_oxfw *oxfw = 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);
Expand Down Expand Up @@ -301,7 +293,7 @@ static int pcm_capture_hw_free(struct snd_pcm_substream *substream)

mutex_unlock(&oxfw->mutex);

return snd_pcm_lib_free_pages(substream);
return 0;
}
static int pcm_playback_hw_free(struct snd_pcm_substream *substream)
{
Expand All @@ -316,7 +308,7 @@ static int pcm_playback_hw_free(struct snd_pcm_substream *substream)

mutex_unlock(&oxfw->mutex);

return snd_pcm_lib_free_pages(substream);
return 0;
}

static int pcm_capture_prepare(struct snd_pcm_substream *substream)
Expand Down Expand Up @@ -454,8 +446,7 @@ int snd_oxfw_create_pcm(struct snd_oxfw *oxfw)
snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_PLAYBACK, &playback_ops);
if (cap > 0)
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;
}
11 changes: 3 additions & 8 deletions sound/firewire/tascam/tascam-pcm.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -117,11 +117,7 @@ static int pcm_hw_params(struct snd_pcm_substream *substream,
struct snd_pcm_hw_params *hw_params)
{
struct snd_tscm *tscm = 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);
Expand Down Expand Up @@ -152,7 +148,7 @@ static int pcm_hw_free(struct snd_pcm_substream *substream)

mutex_unlock(&tscm->mutex);

return snd_pcm_lib_free_pages(substream);
return 0;
}

static int pcm_capture_prepare(struct snd_pcm_substream *substream)
Expand Down Expand Up @@ -289,8 +285,7 @@ int snd_tscm_create_pcm_devices(struct snd_tscm *tscm)
"%s PCM", tscm->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;
}

0 comments on commit 7641d54

Please sign in to comment.