ALSA: bt87x: Use managed buffer allocation

[linux-2.6-block.git] / sound / pci / bt87x.c

diff --git a/sound/pci/bt87x.c b/sound/pci/bt87x.c
index 6bf5ac3600c5422cb2578b07ff447d965b5b30a5..3fe522b32426e1f0f4747960cfb9b2302f83cbba 100644 (file)
--- a/sound/pci/bt87x.c
+++ b/sound/pci/bt87x.c
@@ -452,12 +452,7 @@ static int snd_bt87x_hw_params(struct snd_pcm_substream *substream,
                               struct snd_pcm_hw_params *hw_params)
 {
        struct snd_bt87x *chip = snd_pcm_substream_chip(substream);
-       int err;
 
-       err = snd_pcm_lib_malloc_pages(substream,
-                                      params_buffer_bytes(hw_params));
-       if (err < 0)
-               return err;
        return snd_bt87x_create_risc(chip, substream,
                                     params_periods(hw_params),
                                     params_period_bytes(hw_params));
@@ -468,7 +463,6 @@ static int snd_bt87x_hw_free(struct snd_pcm_substream *substream)
        struct snd_bt87x *chip = snd_pcm_substream_chip(substream);
 
        snd_bt87x_free_risc(chip);
-       snd_pcm_lib_free_pages(substream);
        return 0;
 }
 
@@ -699,10 +693,10 @@ static int snd_bt87x_pcm(struct snd_bt87x *chip, int device, char *name)
        pcm->private_data = chip;
        strcpy(pcm->name, name);
        snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_CAPTURE, &snd_bt87x_pcm_ops);
-       snd_pcm_lib_preallocate_pages_for_all(pcm, SNDRV_DMA_TYPE_DEV_SG,
-                                             &chip->pci->dev,
-                                             128 * 1024,
-                                             ALIGN(255 * 4092, 1024));
+       snd_pcm_set_managed_buffer_all(pcm, SNDRV_DMA_TYPE_DEV_SG,
+                                      &chip->pci->dev,
+                                      128 * 1024,
+                                      ALIGN(255 * 4092, 1024));
        return 0;
 }