Skip to content

Commit

Permalink
ALSA: emu10k1x: Use managed buffer allocation
Browse files Browse the repository at this point in the history
Clean up the driver with the new managed buffer allocation API.
The superfluous snd_pcm_lib_malloc_pages() and
snd_pcm_lib_free_pages() calls are dropped.

Link: https://lore.kernel.org/r/[email protected]
Signed-off-by: Takashi Iwai <[email protected]>
  • Loading branch information
tiwai committed Dec 11, 2019
1 parent 11f63ca commit 63832bd
Showing 1 changed file with 6 additions and 9 deletions.
15 changes: 6 additions & 9 deletions sound/pci/emu10k1/emu10k1x.c
Original file line number Diff line number Diff line change
Expand Up @@ -411,8 +411,7 @@ static int snd_emu10k1x_pcm_hw_params(struct snd_pcm_substream *substream,
epcm->voice->epcm = epcm;
}

return snd_pcm_lib_malloc_pages(substream,
params_buffer_bytes(hw_params));
return 0;
}

/* hw_free callback */
Expand All @@ -432,7 +431,7 @@ static int snd_emu10k1x_pcm_hw_free(struct snd_pcm_substream *substream)
epcm->voice = NULL;
}

return snd_pcm_lib_free_pages(substream);
return 0;
}

/* prepare callback */
Expand Down Expand Up @@ -594,8 +593,7 @@ static int snd_emu10k1x_pcm_hw_params_capture(struct snd_pcm_substream *substrea
epcm->voice->use = 1;
}

return snd_pcm_lib_malloc_pages(substream,
params_buffer_bytes(hw_params));
return 0;
}

/* hw_free callback */
Expand All @@ -615,7 +613,7 @@ static int snd_emu10k1x_pcm_hw_free_capture(struct snd_pcm_substream *substream)
epcm->voice = NULL;
}

return snd_pcm_lib_free_pages(substream);
return 0;
}

/* prepare capture callback */
Expand Down Expand Up @@ -876,9 +874,8 @@ static int snd_emu10k1x_pcm(struct emu10k1x *emu, int device)
}
emu->pcm = pcm;

snd_pcm_lib_preallocate_pages_for_all(pcm, SNDRV_DMA_TYPE_DEV,
&emu->pci->dev,
32*1024, 32*1024);
snd_pcm_set_managed_buffer_all(pcm, SNDRV_DMA_TYPE_DEV,
&emu->pci->dev, 32*1024, 32*1024);

return snd_pcm_add_chmap_ctls(pcm, SNDRV_PCM_STREAM_PLAYBACK, map, 2,
1 << 2, NULL);
Expand Down

0 comments on commit 63832bd

Please sign in to comment.