Merge tag 'arc-5.6-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc

[linux.git] / sound / mips / hal2.c

diff --git a/sound/mips/hal2.c b/sound/mips/hal2.c
index c9e0609397083b3681bd413b412495d3c926a6dd..ec84bc4c3a6e77a1c170c003b5f03ea79365a1c4 100644 (file)
--- a/sound/mips/hal2.c
+++ b/sound/mips/hal2.c
@@ -505,23 +505,6 @@ static const struct snd_pcm_hardware hal2_pcm_hw = {
        .periods_max =      1024,
 };
 
-static int hal2_pcm_hw_params(struct snd_pcm_substream *substream,
-                             struct snd_pcm_hw_params *params)
-{
-       int err;
-
-       err = snd_pcm_lib_malloc_pages(substream, params_buffer_bytes(params));
-       if (err < 0)
-               return err;
-
-       return 0;
-}
-
-static int hal2_pcm_hw_free(struct snd_pcm_substream *substream)
-{
-       return snd_pcm_lib_free_pages(substream);
-}
-
 static int hal2_playback_open(struct snd_pcm_substream *substream)
 {
        struct snd_pcm_runtime *runtime = substream->runtime;
@@ -701,9 +684,6 @@ static int hal2_capture_ack(struct snd_pcm_substream *substream)
 static const struct snd_pcm_ops hal2_playback_ops = {
        .open =        hal2_playback_open,
        .close =       hal2_playback_close,
-       .ioctl =       snd_pcm_lib_ioctl,
-       .hw_params =   hal2_pcm_hw_params,
-       .hw_free =     hal2_pcm_hw_free,
        .prepare =     hal2_playback_prepare,
        .trigger =     hal2_playback_trigger,
        .pointer =     hal2_playback_pointer,
@@ -713,9 +693,6 @@ static const struct snd_pcm_ops hal2_playback_ops = {
 static const struct snd_pcm_ops hal2_capture_ops = {
        .open =        hal2_capture_open,
        .close =       hal2_capture_close,
-       .ioctl =       snd_pcm_lib_ioctl,
-       .hw_params =   hal2_pcm_hw_params,
-       .hw_free =     hal2_pcm_hw_free,
        .prepare =     hal2_capture_prepare,
        .trigger =     hal2_capture_trigger,
        .pointer =     hal2_capture_pointer,
@@ -740,8 +717,8 @@ static int hal2_pcm_create(struct snd_hal2 *hal2)
                        &hal2_playback_ops);
        snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_CAPTURE,
                        &hal2_capture_ops);
-       snd_pcm_lib_preallocate_pages_for_all(pcm, SNDRV_DMA_TYPE_CONTINUOUS,
-                                          NULL, 0, 1024 * 1024);
+       snd_pcm_set_managed_buffer_all(pcm, SNDRV_DMA_TYPE_CONTINUOUS,
+                                      NULL, 0, 1024 * 1024);
 
        return 0;
 }
@@ -755,7 +732,7 @@ static int hal2_dev_free(struct snd_device *device)
        return 0;
 }
 
-static struct snd_device_ops hal2_ops = {
+static const struct snd_device_ops hal2_ops = {
        .dev_free = hal2_dev_free,
 };