ALSA: pci: Drop superfluous PCM preallocation error checks

snd_pcm_lib_preallocate_pages() and co always succeed, so the error
check is simply redundant.  Drop it.

Reviewed-by: Jaroslav Kysela <perex@perex.cz>
Signed-off-by: Takashi Iwai <tiwai@suse.de>

diff --git a/sound/pci/ad1889.c b/sound/pci/ad1889.c
index d9c54c08e2dbde1e46421dd42f5647f57e329590..410fefe5ebdeb66234364e288ca2b9a2b7fdc804 100644 (file)
--- a/sound/pci/ad1889.c
+++ b/sound/pci/ad1889.c
@@ -644,16 +644,11 @@ snd_ad1889_pcm_init(struct snd_ad1889 *chip, int device)
        chip->psubs = NULL;
        chip->csubs = NULL;
 
-       err = snd_pcm_lib_preallocate_pages_for_all(pcm, SNDRV_DMA_TYPE_DEV,
+       snd_pcm_lib_preallocate_pages_for_all(pcm, SNDRV_DMA_TYPE_DEV,
                                                snd_dma_pci_data(chip->pci),
                                                BUFFER_BYTES_MAX / 2,
                                                BUFFER_BYTES_MAX);
 
-       if (err < 0) {
-               dev_err(chip->card->dev, "buffer allocation error: %d\n", err);
-               return err;
-       }
-       
        return 0;
 }
 

diff --git a/sound/pci/aw2/aw2-alsa.c b/sound/pci/aw2/aw2-alsa.c
index 9a49e4243a9c0b3c3cc0f23fbbf8a202243c80ad..b07c5fc1da56bc4228b29a872cea03a332ccf3a9 100644 (file)
--- a/sound/pci/aw2/aw2-alsa.c
+++ b/sound/pci/aw2/aw2-alsa.c
@@ -624,15 +624,10 @@ static int snd_aw2_new_pcm(struct aw2 *chip)
 
        /* pre-allocation of buffers */
        /* Preallocate continuous pages. */
-       err = snd_pcm_lib_preallocate_pages_for_all(pcm_playback_ana,
-                                                   SNDRV_DMA_TYPE_DEV,
-                                                   snd_dma_pci_data
-                                                   (chip->pci),
-                                                   64 * 1024, 64 * 1024);
-       if (err)
-               dev_err(chip->card->dev,
-                       "snd_pcm_lib_preallocate_pages_for_all error (0x%X)\n",
-                       err);
+       snd_pcm_lib_preallocate_pages_for_all(pcm_playback_ana,
+                                             SNDRV_DMA_TYPE_DEV,
+                                             snd_dma_pci_data(chip->pci),
+                                             64 * 1024, 64 * 1024);
 
        err = snd_pcm_new(chip->card, "Audiowerk2 digital playback", 1, 1, 0,
                          &pcm_playback_num);
@@ -661,15 +656,10 @@ static int snd_aw2_new_pcm(struct aw2 *chip)
 
        /* pre-allocation of buffers */
        /* Preallocate continuous pages. */
-       err = snd_pcm_lib_preallocate_pages_for_all(pcm_playback_num,
-                                                   SNDRV_DMA_TYPE_DEV,
-                                                   snd_dma_pci_data
-                                                   (chip->pci),
-                                                   64 * 1024, 64 * 1024);
-       if (err)
-               dev_err(chip->card->dev,
-                       "snd_pcm_lib_preallocate_pages_for_all error (0x%X)\n",
-                       err);
+       snd_pcm_lib_preallocate_pages_for_all(pcm_playback_num,
+                                             SNDRV_DMA_TYPE_DEV,
+                                             snd_dma_pci_data(chip->pci),
+                                             64 * 1024, 64 * 1024);
 
        err = snd_pcm_new(chip->card, "Audiowerk2 capture", 2, 0, 1,
                          &pcm_capture);
@@ -699,16 +689,10 @@ static int snd_aw2_new_pcm(struct aw2 *chip)
 
        /* pre-allocation of buffers */
        /* Preallocate continuous pages. */
-       err = snd_pcm_lib_preallocate_pages_for_all(pcm_capture,
-                                                   SNDRV_DMA_TYPE_DEV,
-                                                   snd_dma_pci_data
-                                                   (chip->pci),
-                                                   64 * 1024, 64 * 1024);
-       if (err)
-               dev_err(chip->card->dev,
-                       "snd_pcm_lib_preallocate_pages_for_all error (0x%X)\n",
-                       err);
-
+       snd_pcm_lib_preallocate_pages_for_all(pcm_capture,
+                                             SNDRV_DMA_TYPE_DEV,
+                                             snd_dma_pci_data(chip->pci),
+                                             64 * 1024, 64 * 1024);
 
        /* Create control */
        err = snd_ctl_add(chip->card, snd_ctl_new1(&aw2_control, chip));

diff --git a/sound/pci/bt87x.c b/sound/pci/bt87x.c
index ba971042f87162ef945f7858ef299253f82f1e9b..0adcba10c067c1fa0c0f6363080ec43363a0d4e1 100644 (file)
--- a/sound/pci/bt87x.c
+++ b/sound/pci/bt87x.c
@@ -714,11 +714,11 @@ 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);
-       return snd_pcm_lib_preallocate_pages_for_all(pcm,
-                                                    SNDRV_DMA_TYPE_DEV_SG,
-                                                    snd_dma_pci_data(chip->pci),
-                                                       128 * 1024,
-                                                       ALIGN(255 * 4092, 1024));
+       snd_pcm_lib_preallocate_pages_for_all(pcm, SNDRV_DMA_TYPE_DEV_SG,
+                                             snd_dma_pci_data(chip->pci),
+                                             128 * 1024,
+                                             ALIGN(255 * 4092, 1024));
+       return 0;
 }
 
 static int snd_bt87x_create(struct snd_card *card,

diff --git a/sound/pci/ca0106/ca0106_main.c b/sound/pci/ca0106/ca0106_main.c
index 3d1b0bbff33b2e020793cb926903ec6ae7d37cf7..11ef0d6364054344021c984c1eb2df9aaf719d5b 100644 (file)
--- a/sound/pci/ca0106/ca0106_main.c
+++ b/sound/pci/ca0106/ca0106_main.c
@@ -1402,21 +1402,17 @@ static int snd_ca0106_pcm(struct snd_ca0106 *emu, int device)
        for(substream = pcm->streams[SNDRV_PCM_STREAM_PLAYBACK].substream; 
            substream; 
            substream = substream->next) {
-               if ((err = snd_pcm_lib_preallocate_pages(substream, 
-                                                        SNDRV_DMA_TYPE_DEV, 
-                                                        snd_dma_pci_data(emu->pci), 
-                                                        64*1024, 64*1024)) < 0) /* FIXME: 32*1024 for sound buffer, between 32and64 for Periods table. */
-                       return err;
+               snd_pcm_lib_preallocate_pages(substream, SNDRV_DMA_TYPE_DEV,
+                                             snd_dma_pci_data(emu->pci),
+                                             64*1024, 64*1024);
        }
 
        for (substream = pcm->streams[SNDRV_PCM_STREAM_CAPTURE].substream; 
              substream; 
              substream = substream->next) {
-               if ((err = snd_pcm_lib_preallocate_pages(substream, 
-                                                  SNDRV_DMA_TYPE_DEV, 
-                                                  snd_dma_pci_data(emu->pci), 
-                                                  64*1024, 64*1024)) < 0)
-                       return err;
+               snd_pcm_lib_preallocate_pages(substream, SNDRV_DMA_TYPE_DEV,
+                                             snd_dma_pci_data(emu->pci),
+                                             64*1024, 64*1024);
        }
   
        err = snd_pcm_add_chmap_ctls(pcm, SNDRV_PCM_STREAM_PLAYBACK, map, 2,

diff --git a/sound/pci/echoaudio/echoaudio.c b/sound/pci/echoaudio/echoaudio.c
index 18d30d479b6b51373da02024fec49572b43d64ea..ea876b0b02b9f0d8400a7ee08291ff283999dbc6 100644 (file)
--- a/sound/pci/echoaudio/echoaudio.c
+++ b/sound/pci/echoaudio/echoaudio.c
@@ -884,17 +884,15 @@ static const struct snd_pcm_ops digital_capture_ops = {
 static int snd_echo_preallocate_pages(struct snd_pcm *pcm, struct device *dev)
 {
        struct snd_pcm_substream *ss;
-       int stream, err;
+       int stream;
 
        for (stream = 0; stream < 2; stream++)
-               for (ss = pcm->streams[stream].substream; ss; ss = ss->next) {
-                       err = snd_pcm_lib_preallocate_pages(ss, SNDRV_DMA_TYPE_DEV_SG,
-                                                           dev,
-                                                           ss->number ? 0 : 128<<10,
-                                                           256<<10);
-                       if (err < 0)
-                               return err;
-               }
+               for (ss = pcm->streams[stream].substream; ss; ss = ss->next)
+                       snd_pcm_lib_preallocate_pages(ss, SNDRV_DMA_TYPE_DEV_SG,
+                                                     dev,
+                                                     ss->number ? 0 : 128<<10,
+                                                     256<<10);
+
        return 0;
 }
 

diff --git a/sound/pci/emu10k1/emupcm.c b/sound/pci/emu10k1/emupcm.c
index 30b3472d0b75b4f82a227535ab5ac6ff6b6747b6..f6b4cb9ac75c2cbc17215b6c498f2a0ddcca11b3 100644 (file)
--- a/sound/pci/emu10k1/emupcm.c
+++ b/sound/pci/emu10k1/emupcm.c
@@ -1427,11 +1427,14 @@ int snd_emu10k1_pcm(struct snd_emu10k1 *emu, int device)
        emu->pcm = pcm;
 
        for (substream = pcm->streams[SNDRV_PCM_STREAM_PLAYBACK].substream; substream; substream = substream->next)
-               if ((err = snd_pcm_lib_preallocate_pages(substream, SNDRV_DMA_TYPE_DEV_SG, snd_dma_pci_data(emu->pci), 64*1024, 64*1024)) < 0)
-                       return err;
+               snd_pcm_lib_preallocate_pages(substream, SNDRV_DMA_TYPE_DEV_SG,
+                                             snd_dma_pci_data(emu->pci),
+                                             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, snd_dma_pci_data(emu->pci), 64*1024, 64*1024);
+               snd_pcm_lib_preallocate_pages(substream, SNDRV_DMA_TYPE_DEV,
+                                             snd_dma_pci_data(emu->pci),
+                                             64*1024, 64*1024);
 
        return 0;
 }
@@ -1455,8 +1458,9 @@ int snd_emu10k1_pcm_multi(struct snd_emu10k1 *emu, int device)
        emu->pcm_multi = pcm;
 
        for (substream = pcm->streams[SNDRV_PCM_STREAM_PLAYBACK].substream; substream; substream = substream->next)
-               if ((err = snd_pcm_lib_preallocate_pages(substream, SNDRV_DMA_TYPE_DEV_SG, snd_dma_pci_data(emu->pci), 64*1024, 64*1024)) < 0)
-                       return err;
+               snd_pcm_lib_preallocate_pages(substream, SNDRV_DMA_TYPE_DEV_SG,
+                                             snd_dma_pci_data(emu->pci),
+                                             64*1024, 64*1024);
 
        return 0;
 }
@@ -1489,7 +1493,9 @@ 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, snd_dma_pci_data(emu->pci), 64*1024, 64*1024);
+       snd_pcm_lib_preallocate_pages_for_all(pcm, SNDRV_DMA_TYPE_DEV,
+                                             snd_dma_pci_data(emu->pci),
+                                             64*1024, 64*1024);
 
        return 0;
 }
@@ -1862,7 +1868,9 @@ 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, snd_dma_pci_data(emu->pci), 64*1024, 64*1024);
+       snd_pcm_lib_preallocate_pages_for_all(pcm, SNDRV_DMA_TYPE_DEV,
+                                             snd_dma_pci_data(emu->pci),
+                                             64*1024, 64*1024);
 
        return 0;
 }

diff --git a/sound/pci/emu10k1/p16v.c b/sound/pci/emu10k1/p16v.c
index 4948b95f66653320e86c4a9d8abe29ce48ec7085..672017cac4c7950e77896044110e6f3ca922c811 100644 (file)
--- a/sound/pci/emu10k1/p16v.c
+++ b/sound/pci/emu10k1/p16v.c
@@ -656,11 +656,10 @@ int snd_p16v_pcm(struct snd_emu10k1 *emu, int device)
        for(substream = pcm->streams[SNDRV_PCM_STREAM_PLAYBACK].substream; 
            substream; 
            substream = substream->next) {
-               if ((err = snd_pcm_lib_preallocate_pages(substream, 
-                                                        SNDRV_DMA_TYPE_DEV, 
-                                                        snd_dma_pci_data(emu->pci), 
-                                                        ((65536 - 64) * 8), ((65536 - 64) * 8))) < 0) 
-                       return err;
+               snd_pcm_lib_preallocate_pages(substream, SNDRV_DMA_TYPE_DEV,
+                                             snd_dma_pci_data(emu->pci),
+                                             (65536 - 64) * 8,
+                                             (65536 - 64) * 8);
                /*
                dev_dbg(emu->card->dev,
                           "preallocate playback substream: err=%d\n", err);
@@ -670,11 +669,9 @@ int snd_p16v_pcm(struct snd_emu10k1 *emu, int device)
        for (substream = pcm->streams[SNDRV_PCM_STREAM_CAPTURE].substream; 
              substream; 
              substream = substream->next) {
-               if ((err = snd_pcm_lib_preallocate_pages(substream, 
-                                                  SNDRV_DMA_TYPE_DEV, 
-                                                  snd_dma_pci_data(emu->pci), 
-                                                  65536 - 64, 65536 - 64)) < 0)
-                       return err;
+               snd_pcm_lib_preallocate_pages(substream, SNDRV_DMA_TYPE_DEV,
+                                             snd_dma_pci_data(emu->pci),
+                                             65536 - 64, 65536 - 64);
                /*
                dev_dbg(emu->card->dev,
                           "preallocate capture substream: err=%d\n", err);

diff --git a/sound/pci/lx6464es/lx6464es.c b/sound/pci/lx6464es/lx6464es.c
index 54f6252faca684b23ef91617318c8ae11e3de04e..52ea0da1fe73be544541bf2eae6286ae3ce44fd6 100644 (file)
--- a/sound/pci/lx6464es/lx6464es.c
+++ b/sound/pci/lx6464es/lx6464es.c
@@ -854,11 +854,9 @@ static int lx_pcm_create(struct lx6464es *chip)
        pcm->nonatomic = true;
        strcpy(pcm->name, card_name);
 
-       err = snd_pcm_lib_preallocate_pages_for_all(pcm, SNDRV_DMA_TYPE_DEV,
-                                                   snd_dma_pci_data(chip->pci),
-                                                   size, size);
-       if (err < 0)
-               return err;
+       snd_pcm_lib_preallocate_pages_for_all(pcm, SNDRV_DMA_TYPE_DEV,
+                                             snd_dma_pci_data(chip->pci),
+                                             size, size);
 
        chip->pcm = pcm;
        chip->capture_stream.is_capture = 1;

diff --git a/sound/pci/rme9652/hdspm.c b/sound/pci/rme9652/hdspm.c
index 679ad0415e3b30461b53ce08e22dfd48b0f4a27d..3e66df7b5d1f6f0428adf44b9626af41a3ffa877 100644 (file)
--- a/sound/pci/rme9652/hdspm.c
+++ b/sound/pci/rme9652/hdspm.c
@@ -6411,7 +6411,6 @@ static int snd_hdspm_create_hwdep(struct snd_card *card,
  ------------------------------------------------------------*/
 static int snd_hdspm_preallocate_memory(struct hdspm *hdspm)
 {
-       int err;
        struct snd_pcm *pcm;
        size_t wanted;
 
@@ -6419,21 +6418,10 @@ static int snd_hdspm_preallocate_memory(struct hdspm *hdspm)
 
        wanted = HDSPM_DMA_AREA_BYTES;
 
-       err =
-            snd_pcm_lib_preallocate_pages_for_all(pcm,
-                                                  SNDRV_DMA_TYPE_DEV_SG,
-                                                  snd_dma_pci_data(hdspm->pci),
-                                                  wanted,
-                                                  wanted);
-       if (err < 0) {
-               dev_dbg(hdspm->card->dev,
-                       "Could not preallocate %zd Bytes\n", wanted);
-
-               return err;
-       } else
-               dev_dbg(hdspm->card->dev,
-                       " Preallocated %zd Bytes\n", wanted);
-
+       snd_pcm_lib_preallocate_pages_for_all(pcm, SNDRV_DMA_TYPE_DEV_SG,
+                                             snd_dma_pci_data(hdspm->pci),
+                                             wanted, wanted);
+       dev_dbg(hdspm->card->dev, " Preallocated %zd Bytes\n", wanted);
        return 0;
 }
 

diff --git a/sound/pci/via82xx_modem.c b/sound/pci/via82xx_modem.c
index 3f59e02790582e00109ca87c03fb7a2590c24b87..3b3768acf7e1dc9f8c75182ebe929753a7e252f8 100644 (file)
--- a/sound/pci/via82xx_modem.c
+++ b/sound/pci/via82xx_modem.c
@@ -865,11 +865,9 @@ static int snd_via686_pcm_new(struct via82xx_modem *chip)
        init_viadev(chip, 0, VIA_REG_MO_STATUS, 0);
        init_viadev(chip, 1, VIA_REG_MI_STATUS, 1);
 
-       if ((err = snd_pcm_lib_preallocate_pages_for_all(pcm, SNDRV_DMA_TYPE_DEV_SG,
-                                                        snd_dma_pci_data(chip->pci),
-                                                        64*1024, 128*1024)) < 0)
-               return err;
-
+       snd_pcm_lib_preallocate_pages_for_all(pcm, SNDRV_DMA_TYPE_DEV_SG,
+                                             snd_dma_pci_data(chip->pci),
+                                             64*1024, 128*1024);
        return 0;
 }