ALSA: sparc: Use managed buffer allocation

[sfrench/cifs-2.6.git] / sound / sparc / cs4231.c

diff --git a/sound/sparc/cs4231.c b/sound/sparc/cs4231.c
index 138841e0f2ae0c5a78dfad1e7bb0302783bfe104..874da942b662f5f9798fd54a04ed1ff148eada88 100644 (file)
--- a/sound/sparc/cs4231.c
+++ b/sound/sparc/cs4231.c
@@ -889,12 +889,7 @@ static int snd_cs4231_playback_hw_params(struct snd_pcm_substream *substream,
 {
        struct snd_cs4231 *chip = snd_pcm_substream_chip(substream);
        unsigned char new_pdfr;
-       int err;
 
-       err = snd_pcm_lib_malloc_pages(substream,
-                                       params_buffer_bytes(hw_params));
-       if (err < 0)
-               return err;
        new_pdfr = snd_cs4231_get_format(chip, params_format(hw_params),
                                         params_channels(hw_params)) |
                snd_cs4231_get_rate(params_rate(hw_params));
@@ -933,12 +928,7 @@ static int snd_cs4231_capture_hw_params(struct snd_pcm_substream *substream,
 {
        struct snd_cs4231 *chip = snd_pcm_substream_chip(substream);
        unsigned char new_cdfr;
-       int err;
 
-       err = snd_pcm_lib_malloc_pages(substream,
-                                       params_buffer_bytes(hw_params));
-       if (err < 0)
-               return err;
        new_cdfr = snd_cs4231_get_format(chip, params_format(hw_params),
                                         params_channels(hw_params)) |
                snd_cs4231_get_rate(params_rate(hw_params));
@@ -1205,7 +1195,6 @@ static const struct snd_pcm_ops snd_cs4231_playback_ops = {
        .close          =       snd_cs4231_playback_close,
        .ioctl          =       snd_pcm_lib_ioctl,
        .hw_params      =       snd_cs4231_playback_hw_params,
-       .hw_free        =       snd_pcm_lib_free_pages,
        .prepare        =       snd_cs4231_playback_prepare,
        .trigger        =       snd_cs4231_trigger,
        .pointer        =       snd_cs4231_playback_pointer,
@@ -1216,7 +1205,6 @@ static const struct snd_pcm_ops snd_cs4231_capture_ops = {
        .close          =       snd_cs4231_capture_close,
        .ioctl          =       snd_pcm_lib_ioctl,
        .hw_params      =       snd_cs4231_capture_hw_params,
-       .hw_free        =       snd_pcm_lib_free_pages,
        .prepare        =       snd_cs4231_capture_prepare,
        .trigger        =       snd_cs4231_trigger,
        .pointer        =       snd_cs4231_capture_pointer,
@@ -1242,9 +1230,8 @@ static int snd_cs4231_pcm(struct snd_card *card)
        pcm->info_flags = SNDRV_PCM_INFO_JOINT_DUPLEX;
        strcpy(pcm->name, "CS4231");
 
-       snd_pcm_lib_preallocate_pages_for_all(pcm, SNDRV_DMA_TYPE_DEV,
-                                             &chip->op->dev,
-                                             64 * 1024, 128 * 1024);
+       snd_pcm_set_managed_buffer_all(pcm, SNDRV_DMA_TYPE_DEV,
+                                      &chip->op->dev, 64 * 1024, 128 * 1024);
 
        chip->pcm = pcm;