ALSA: emu10k1: Use managed buffer allocation

Clean up the driver with the new managed buffer allocation API.
The normal playback streams need a workaround for the aligned buffer,
and cannot apply the straight snd_pcm_lib_malloc() stuff, so they
remain untouched, while other streams are converted to the new managed
mode.

Most of hw_params and hw_free callbacks became superfluous and got
dropped.

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

diff --git a/sound/pci/emu10k1/emupcm.c b/sound/pci/emu10k1/emupcm.c
index 9a8cf3c7dd67af3889e720fe18c6e7c30fc5779c..3a68148f6ecf9ace1593e28957c94a156a2a1087 100644 (file)
--- a/sound/pci/emu10k1/emupcm.c
+++ b/sound/pci/emu10k1/emupcm.c
@@ -569,17 +569,6 @@ static const struct snd_pcm_hardware snd_emu10k1_efx_playback =
        .fifo_size =            0,
 };
 
-static int snd_emu10k1_capture_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_emu10k1_capture_hw_free(struct snd_pcm_substream *substream)
-{
-       return snd_pcm_lib_free_pages(substream);
-}
-
 static int snd_emu10k1_capture_prepare(struct snd_pcm_substream *substream)
 {
        struct snd_emu10k1 *emu = snd_pcm_substream_chip(substream);
@@ -1372,8 +1361,6 @@ static const struct snd_pcm_ops snd_emu10k1_capture_ops = {
        .open =                 snd_emu10k1_capture_open,
        .close =                snd_emu10k1_capture_close,
        .ioctl =                snd_pcm_lib_ioctl,
-       .hw_params =            snd_emu10k1_capture_hw_params,
-       .hw_free =              snd_emu10k1_capture_hw_free,
        .prepare =              snd_emu10k1_capture_prepare,
        .trigger =              snd_emu10k1_capture_trigger,
        .pointer =              snd_emu10k1_capture_pointer,
@@ -1410,15 +1397,15 @@ int snd_emu10k1_pcm(struct snd_emu10k1 *emu, int device)
        strcpy(pcm->name, "ADC Capture/Standard PCM Playback");
        emu->pcm = pcm;
 
+       /* playback substream can't use managed buffers due to alignment */
        for (substream = pcm->streams[SNDRV_PCM_STREAM_PLAYBACK].substream; substream; substream = substream->next)
                snd_pcm_lib_preallocate_pages(substream, SNDRV_DMA_TYPE_DEV_SG,
                                              &emu->pci->dev,
                                              64*1024, 64*1024);
 
        for (substream = pcm->streams[SNDRV_PCM_STREAM_CAPTURE].substream; substream; substream = substream->next)
-               snd_pcm_lib_preallocate_pages(substream, SNDRV_DMA_TYPE_DEV,
-                                             &emu->pci->dev,
-                                             64*1024, 64*1024);
+               snd_pcm_set_managed_buffer(substream, SNDRV_DMA_TYPE_DEV,
+                                          &emu->pci->dev, 64*1024, 64*1024);
 
        return 0;
 }
@@ -1454,8 +1441,6 @@ static const struct snd_pcm_ops snd_emu10k1_capture_mic_ops = {
        .open =                 snd_emu10k1_capture_mic_open,
        .close =                snd_emu10k1_capture_mic_close,
        .ioctl =                snd_pcm_lib_ioctl,
-       .hw_params =            snd_emu10k1_capture_hw_params,
-       .hw_free =              snd_emu10k1_capture_hw_free,
        .prepare =              snd_emu10k1_capture_prepare,
        .trigger =              snd_emu10k1_capture_trigger,
        .pointer =              snd_emu10k1_capture_pointer,
@@ -1477,9 +1462,8 @@ int snd_emu10k1_pcm_mic(struct snd_emu10k1 *emu, int device)
        strcpy(pcm->name, "Mic Capture");
        emu->pcm_mic = pcm;
 
-       snd_pcm_lib_preallocate_pages_for_all(pcm, SNDRV_DMA_TYPE_DEV,
-                                             &emu->pci->dev,
-                                             64*1024, 64*1024);
+       snd_pcm_set_managed_buffer_all(pcm, SNDRV_DMA_TYPE_DEV, &emu->pci->dev,
+                                      64*1024, 64*1024);
 
        return 0;
 }
@@ -1551,8 +1535,6 @@ static const struct snd_pcm_ops snd_emu10k1_capture_efx_ops = {
        .open =                 snd_emu10k1_capture_efx_open,
        .close =                snd_emu10k1_capture_efx_close,
        .ioctl =                snd_pcm_lib_ioctl,
-       .hw_params =            snd_emu10k1_capture_hw_params,
-       .hw_free =              snd_emu10k1_capture_hw_free,
        .prepare =              snd_emu10k1_capture_prepare,
        .trigger =              snd_emu10k1_capture_trigger,
        .pointer =              snd_emu10k1_capture_pointer,
@@ -1633,12 +1615,6 @@ static int snd_emu10k1_fx8010_playback_transfer(struct snd_pcm_substream *substr
                                                  fx8010_pb_trans_copy);
 }
 
-static int snd_emu10k1_fx8010_playback_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_emu10k1_fx8010_playback_hw_free(struct snd_pcm_substream *substream)
 {
        struct snd_emu10k1 *emu = snd_pcm_substream_chip(substream);
@@ -1647,7 +1623,6 @@ static int snd_emu10k1_fx8010_playback_hw_free(struct snd_pcm_substream *substre
 
        for (i = 0; i < pcm->channels; i++)
                snd_emu10k1_ptr_write(emu, TANKMEMADDRREGBASE + 0x80 + pcm->etram[i], 0, 0);
-       snd_pcm_lib_free_pages(substream);
        return 0;
 }
 
@@ -1793,7 +1768,6 @@ static const struct snd_pcm_ops snd_emu10k1_fx8010_playback_ops = {
        .open =                 snd_emu10k1_fx8010_playback_open,
        .close =                snd_emu10k1_fx8010_playback_close,
        .ioctl =                snd_pcm_lib_ioctl,
-       .hw_params =            snd_emu10k1_fx8010_playback_hw_params,
        .hw_free =              snd_emu10k1_fx8010_playback_hw_free,
        .prepare =              snd_emu10k1_fx8010_playback_prepare,
        .trigger =              snd_emu10k1_fx8010_playback_trigger,
@@ -1852,9 +1826,8 @@ int snd_emu10k1_pcm_efx(struct snd_emu10k1 *emu, int device)
        if (err < 0)
                return err;
 
-       snd_pcm_lib_preallocate_pages_for_all(pcm, SNDRV_DMA_TYPE_DEV,
-                                             &emu->pci->dev,
-                                             64*1024, 64*1024);
+       snd_pcm_set_managed_buffer_all(pcm, SNDRV_DMA_TYPE_DEV, &emu->pci->dev,
+                                      64*1024, 64*1024);
 
        return 0;
 }

diff --git a/sound/pci/emu10k1/p16v.c b/sound/pci/emu10k1/p16v.c
index ab887685598916c6f2e23452f83a82d7a15dfd13..2263db4c954b6e3ce604405f06a29f20fb30c445 100644 (file)
--- a/sound/pci/emu10k1/p16v.c
+++ b/sound/pci/emu10k1/p16v.c
@@ -282,36 +282,6 @@ static int snd_p16v_pcm_open_capture(struct snd_pcm_substream *substream)
        return snd_p16v_pcm_open_capture_channel(substream, 0);
 }
 
-/* hw_params callback */
-static int snd_p16v_pcm_hw_params_playback(struct snd_pcm_substream *substream,
-                                     struct snd_pcm_hw_params *hw_params)
-{
-       return snd_pcm_lib_malloc_pages(substream,
-                                       params_buffer_bytes(hw_params));
-}
-
-/* hw_params callback */
-static int snd_p16v_pcm_hw_params_capture(struct snd_pcm_substream *substream,
-                                     struct snd_pcm_hw_params *hw_params)
-{
-       return snd_pcm_lib_malloc_pages(substream,
-                                       params_buffer_bytes(hw_params));
-}
-
-
-/* hw_free callback */
-static int snd_p16v_pcm_hw_free_playback(struct snd_pcm_substream *substream)
-{
-       return snd_pcm_lib_free_pages(substream);
-}
-
-/* hw_free callback */
-static int snd_p16v_pcm_hw_free_capture(struct snd_pcm_substream *substream)
-{
-       return snd_pcm_lib_free_pages(substream);
-}
-
-
 /* prepare playback callback */
 static int snd_p16v_pcm_prepare_playback(struct snd_pcm_substream *substream)
 {
@@ -583,8 +553,6 @@ static const struct snd_pcm_ops snd_p16v_playback_front_ops = {
        .open =        snd_p16v_pcm_open_playback_front,
        .close =       snd_p16v_pcm_close_playback,
        .ioctl =       snd_pcm_lib_ioctl,
-       .hw_params =   snd_p16v_pcm_hw_params_playback,
-       .hw_free =     snd_p16v_pcm_hw_free_playback,
        .prepare =     snd_p16v_pcm_prepare_playback,
        .trigger =     snd_p16v_pcm_trigger_playback,
        .pointer =     snd_p16v_pcm_pointer_playback,
@@ -594,8 +562,6 @@ static const struct snd_pcm_ops snd_p16v_capture_ops = {
        .open =        snd_p16v_pcm_open_capture,
        .close =       snd_p16v_pcm_close_capture,
        .ioctl =       snd_pcm_lib_ioctl,
-       .hw_params =   snd_p16v_pcm_hw_params_capture,
-       .hw_free =     snd_p16v_pcm_hw_free_capture,
        .prepare =     snd_p16v_pcm_prepare_capture,
        .trigger =     snd_p16v_pcm_trigger_capture,
        .pointer =     snd_p16v_pcm_pointer_capture,
@@ -642,10 +608,10 @@ int snd_p16v_pcm(struct snd_emu10k1 *emu, int device)
        for(substream = pcm->streams[SNDRV_PCM_STREAM_PLAYBACK].substream; 
            substream; 
            substream = substream->next) {
-               snd_pcm_lib_preallocate_pages(substream, SNDRV_DMA_TYPE_DEV,
-                                             &emu->pci->dev,
-                                             (65536 - 64) * 8,
-                                             (65536 - 64) * 8);
+               snd_pcm_set_managed_buffer(substream, SNDRV_DMA_TYPE_DEV,
+                                          &emu->pci->dev,
+                                          (65536 - 64) * 8,
+                                          (65536 - 64) * 8);
                /*
                dev_dbg(emu->card->dev,
                           "preallocate playback substream: err=%d\n", err);
@@ -655,9 +621,9 @@ int snd_p16v_pcm(struct snd_emu10k1 *emu, int device)
        for (substream = pcm->streams[SNDRV_PCM_STREAM_CAPTURE].substream; 
              substream; 
              substream = substream->next) {
-               snd_pcm_lib_preallocate_pages(substream, SNDRV_DMA_TYPE_DEV,
-                                             &emu->pci->dev,
-                                             65536 - 64, 65536 - 64);
+               snd_pcm_set_managed_buffer(substream, SNDRV_DMA_TYPE_DEV,
+                                          &emu->pci->dev,
+                                          65536 - 64, 65536 - 64);
                /*
                dev_dbg(emu->card->dev,
                           "preallocate capture substream: err=%d\n", err);