ALSA: ice1712: Use managed buffer allocation

Clean up the driver with the new managed buffer allocation API.
The hw_params and hw_free callbacks became superfluous and got
dropped.

Link: https://lore.kernel.org/r/20191209094943.14984-42-tiwai@suse.de
Signed-off-by: Takashi Iwai <tiwai@suse.de>

diff --git a/sound/pci/ice1712/ice1712.c b/sound/pci/ice1712/ice1712.c
index deadba40131ca53a5d3d5b47c661882d9cfaff0d..1783584e90c5df9f3f271b4163287f130423cb8c 100644 (file)
--- a/sound/pci/ice1712/ice1712.c
+++ b/sound/pci/ice1712/ice1712.c
@@ -479,21 +479,6 @@ static irqreturn_t snd_ice1712_interrupt(int irq, void *dev_id)
 }
 
 
-/*
- *  PCM part - misc
- */
-
-static int snd_ice1712_hw_params(struct snd_pcm_substream *substream,
-                                struct snd_pcm_hw_params *hw_params)
-{
-       return snd_pcm_lib_malloc_pages(substream, params_buffer_bytes(hw_params));
-}
-
-static int snd_ice1712_hw_free(struct snd_pcm_substream *substream)
-{
-       return snd_pcm_lib_free_pages(substream);
-}
-
 /*
  *  PCM part - consumer I/O
  */
@@ -837,8 +822,6 @@ static const struct snd_pcm_ops snd_ice1712_playback_ops = {
        .open =         snd_ice1712_playback_open,
        .close =        snd_ice1712_playback_close,
        .ioctl =        snd_pcm_lib_ioctl,
-       .hw_params =    snd_ice1712_hw_params,
-       .hw_free =      snd_ice1712_hw_free,
        .prepare =      snd_ice1712_playback_prepare,
        .trigger =      snd_ice1712_playback_trigger,
        .pointer =      snd_ice1712_playback_pointer,
@@ -848,8 +831,6 @@ static const struct snd_pcm_ops snd_ice1712_playback_ds_ops = {
        .open =         snd_ice1712_playback_ds_open,
        .close =        snd_ice1712_playback_ds_close,
        .ioctl =        snd_pcm_lib_ioctl,
-       .hw_params =    snd_ice1712_hw_params,
-       .hw_free =      snd_ice1712_hw_free,
        .prepare =      snd_ice1712_playback_ds_prepare,
        .trigger =      snd_ice1712_playback_ds_trigger,
        .pointer =      snd_ice1712_playback_ds_pointer,
@@ -859,8 +840,6 @@ static const struct snd_pcm_ops snd_ice1712_capture_ops = {
        .open =         snd_ice1712_capture_open,
        .close =        snd_ice1712_capture_close,
        .ioctl =        snd_pcm_lib_ioctl,
-       .hw_params =    snd_ice1712_hw_params,
-       .hw_free =      snd_ice1712_hw_free,
        .prepare =      snd_ice1712_capture_prepare,
        .trigger =      snd_ice1712_capture_trigger,
        .pointer =      snd_ice1712_capture_pointer,
@@ -883,9 +862,8 @@ static int snd_ice1712_pcm(struct snd_ice1712 *ice, int device)
        strcpy(pcm->name, "ICE1712 consumer");
        ice->pcm = pcm;
 
-       snd_pcm_lib_preallocate_pages_for_all(pcm, SNDRV_DMA_TYPE_DEV,
-                                             &ice->pci->dev,
-                                             64*1024, 64*1024);
+       snd_pcm_set_managed_buffer_all(pcm, SNDRV_DMA_TYPE_DEV,
+                                      &ice->pci->dev, 64*1024, 64*1024);
 
        dev_warn(ice->card->dev,
                 "Consumer PCM code does not work well at the moment --jk\n");
@@ -909,9 +887,8 @@ static int snd_ice1712_pcm_ds(struct snd_ice1712 *ice, int device)
        strcpy(pcm->name, "ICE1712 consumer (DS)");
        ice->pcm_ds = pcm;
 
-       snd_pcm_lib_preallocate_pages_for_all(pcm, SNDRV_DMA_TYPE_DEV,
-                                             &ice->pci->dev,
-                                             64*1024, 128*1024);
+       snd_pcm_set_managed_buffer_all(pcm, SNDRV_DMA_TYPE_DEV,
+                                      &ice->pci->dev, 64*1024, 128*1024);
 
        return 0;
 }
@@ -1063,7 +1040,7 @@ static int snd_ice1712_playback_pro_hw_params(struct snd_pcm_substream *substrea
        struct snd_ice1712 *ice = snd_pcm_substream_chip(substream);
 
        snd_ice1712_set_pro_rate(ice, params_rate(hw_params), 0);
-       return snd_pcm_lib_malloc_pages(substream, params_buffer_bytes(hw_params));
+       return 0;
 }
 
 static int snd_ice1712_capture_pro_prepare(struct snd_pcm_substream *substream)
@@ -1085,7 +1062,7 @@ static int snd_ice1712_capture_pro_hw_params(struct snd_pcm_substream *substream
        struct snd_ice1712 *ice = snd_pcm_substream_chip(substream);
 
        snd_ice1712_set_pro_rate(ice, params_rate(hw_params), 0);
-       return snd_pcm_lib_malloc_pages(substream, params_buffer_bytes(hw_params));
+       return 0;
 }
 
 static snd_pcm_uframes_t snd_ice1712_playback_pro_pointer(struct snd_pcm_substream *substream)
@@ -1221,7 +1198,6 @@ static const struct snd_pcm_ops snd_ice1712_playback_pro_ops = {
        .close =        snd_ice1712_playback_pro_close,
        .ioctl =        snd_pcm_lib_ioctl,
        .hw_params =    snd_ice1712_playback_pro_hw_params,
-       .hw_free =      snd_ice1712_hw_free,
        .prepare =      snd_ice1712_playback_pro_prepare,
        .trigger =      snd_ice1712_pro_trigger,
        .pointer =      snd_ice1712_playback_pro_pointer,
@@ -1232,7 +1208,6 @@ static const struct snd_pcm_ops snd_ice1712_capture_pro_ops = {
        .close =        snd_ice1712_capture_pro_close,
        .ioctl =        snd_pcm_lib_ioctl,
        .hw_params =    snd_ice1712_capture_pro_hw_params,
-       .hw_free =      snd_ice1712_hw_free,
        .prepare =      snd_ice1712_capture_pro_prepare,
        .trigger =      snd_ice1712_pro_trigger,
        .pointer =      snd_ice1712_capture_pro_pointer,
@@ -1254,9 +1229,8 @@ static int snd_ice1712_pcm_profi(struct snd_ice1712 *ice, int device)
        pcm->info_flags = 0;
        strcpy(pcm->name, "ICE1712 multi");
 
-       snd_pcm_lib_preallocate_pages_for_all(pcm, SNDRV_DMA_TYPE_DEV,
-                                             &ice->pci->dev,
-                                             256*1024, 256*1024);
+       snd_pcm_set_managed_buffer_all(pcm, SNDRV_DMA_TYPE_DEV,
+                                      &ice->pci->dev, 256*1024, 256*1024);
 
        ice->pcm_pro = pcm;