Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-12-31 23:31:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

ALSA: pci: Drop superfluous PCM preallocation error checks

Browse Source 
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>
This commit is contained in:
Takashi Iwai 2019-02-04 16:32:09 +01:00
parent f32e561600
commit 5116b94af0
10 changed files with 63 additions and 101 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
sound/pci/ad1889.c
View File

@ -644,16 +644,11 @@ snd_ad1889_pcm_init(struct snd_ad1889 *chip, int device)
chip->psubs = NULL; chip->psubs = NULL;
chip->csubs = 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), snd_dma_pci_data(chip->pci),
BUFFER_BYTES_MAX / 2, BUFFER_BYTES_MAX / 2,
BUFFER_BYTES_MAX); BUFFER_BYTES_MAX);
if (err < 0) {
dev_err(chip->card->dev, "buffer allocation error: %d\n", err);
return err;
}
return 0; return 0;
} }

40
sound/pci/aw2/aw2-alsa.c
View File

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

10
sound/pci/bt87x.c
View File

@ -714,11 +714,11 @@ static int snd_bt87x_pcm(struct snd_bt87x *chip, int device, char *name)
pcm->private_data = chip; pcm->private_data = chip;
strcpy(pcm->name, name); strcpy(pcm->name, name);
snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_CAPTURE, &snd_bt87x_pcm_ops); snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_CAPTURE, &snd_bt87x_pcm_ops);
return snd_pcm_lib_preallocate_pages_for_all(pcm, snd_pcm_lib_preallocate_pages_for_all(pcm, SNDRV_DMA_TYPE_DEV_SG,
SNDRV_DMA_TYPE_DEV_SG, snd_dma_pci_data(chip->pci),
snd_dma_pci_data(chip->pci), 128 * 1024,
128 * 1024, ALIGN(255 * 4092, 1024));
ALIGN(255 * 4092, 1024)); return 0;
} }
static int snd_bt87x_create(struct snd_card *card, static int snd_bt87x_create(struct snd_card *card,

16
sound/pci/ca0106/ca0106_main.c
View File

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

16
sound/pci/echoaudio/echoaudio.c
View File

@ -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) static int snd_echo_preallocate_pages(struct snd_pcm *pcm, struct device *dev)
{ {
struct snd_pcm_substream *ss; struct snd_pcm_substream *ss;
int stream, err; int stream;
for (stream = 0; stream < 2; stream++) for (stream = 0; stream < 2; stream++)
for (ss = pcm->streams[stream].substream; ss; ss = ss->next) { for (ss = pcm->streams[stream].substream; ss; ss = ss->next)
err = snd_pcm_lib_preallocate_pages(ss, SNDRV_DMA_TYPE_DEV_SG, snd_pcm_lib_preallocate_pages(ss, SNDRV_DMA_TYPE_DEV_SG,
dev, dev,
ss->number ? 0 : 128<<10, ss->number ? 0 : 128<<10,
256<<10); 256<<10);
if (err < 0)
return err;
}
return 0; return 0;
} }

22
sound/pci/emu10k1/emupcm.c
View File

@ -1427,11 +1427,14 @@ int snd_emu10k1_pcm(struct snd_emu10k1 *emu, int device)
emu->pcm = pcm; emu->pcm = pcm;
for (substream = pcm->streams[SNDRV_PCM_STREAM_PLAYBACK].substream; substream; substream = substream->next) 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) snd_pcm_lib_preallocate_pages(substream, SNDRV_DMA_TYPE_DEV_SG,
return err; snd_dma_pci_data(emu->pci),
64*1024, 64*1024);
for (substream = pcm->streams[SNDRV_PCM_STREAM_CAPTURE].substream; substream; substream = substream->next) 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; return 0;
} }
@ -1455,8 +1458,9 @@ int snd_emu10k1_pcm_multi(struct snd_emu10k1 *emu, int device)
emu->pcm_multi = pcm; emu->pcm_multi = pcm;
for (substream = pcm->streams[SNDRV_PCM_STREAM_PLAYBACK].substream; substream; substream = substream->next) 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) snd_pcm_lib_preallocate_pages(substream, SNDRV_DMA_TYPE_DEV_SG,
return err; snd_dma_pci_data(emu->pci),
64*1024, 64*1024);
return 0; return 0;
} }
@ -1489,7 +1493,9 @@ int snd_emu10k1_pcm_mic(struct snd_emu10k1 *emu, int device)
strcpy(pcm->name, "Mic Capture"); strcpy(pcm->name, "Mic Capture");
emu->pcm_mic = pcm; 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; return 0;
} }
@ -1862,7 +1868,9 @@ int snd_emu10k1_pcm_efx(struct snd_emu10k1 *emu, int device)
if (err < 0) if (err < 0)
return err; 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; return 0;
} }

17
sound/pci/emu10k1/p16v.c
View File

@ -656,11 +656,10 @@ int snd_p16v_pcm(struct snd_emu10k1 *emu, int device)
for(substream = pcm->streams[SNDRV_PCM_STREAM_PLAYBACK].substream; for(substream = pcm->streams[SNDRV_PCM_STREAM_PLAYBACK].substream;
substream; substream;
substream = substream->next) { substream = substream->next) {
if ((err = snd_pcm_lib_preallocate_pages(substream, snd_pcm_lib_preallocate_pages(substream, SNDRV_DMA_TYPE_DEV,
SNDRV_DMA_TYPE_DEV, snd_dma_pci_data(emu->pci),
snd_dma_pci_data(emu->pci), (65536 - 64) * 8,
((65536 - 64) * 8), ((65536 - 64) * 8))) < 0) (65536 - 64) * 8);
return err;
/* /*
dev_dbg(emu->card->dev, dev_dbg(emu->card->dev,
"preallocate playback substream: err=%d\n", err); "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; for (substream = pcm->streams[SNDRV_PCM_STREAM_CAPTURE].substream;
substream; substream;
substream = substream->next) { substream = substream->next) {
if ((err = snd_pcm_lib_preallocate_pages(substream, snd_pcm_lib_preallocate_pages(substream, SNDRV_DMA_TYPE_DEV,
SNDRV_DMA_TYPE_DEV, snd_dma_pci_data(emu->pci),
snd_dma_pci_data(emu->pci), 65536 - 64, 65536 - 64);
65536 - 64, 65536 - 64)) < 0)
return err;
/* /*
dev_dbg(emu->card->dev, dev_dbg(emu->card->dev,
"preallocate capture substream: err=%d\n", err); "preallocate capture substream: err=%d\n", err);

8
sound/pci/lx6464es/lx6464es.c
View File

@ -854,11 +854,9 @@ static int lx_pcm_create(struct lx6464es *chip)
pcm->nonatomic = true; pcm->nonatomic = true;
strcpy(pcm->name, card_name); strcpy(pcm->name, card_name);
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), snd_dma_pci_data(chip->pci),
size, size); size, size);
if (err < 0)
return err;
chip->pcm = pcm; chip->pcm = pcm;
chip->capture_stream.is_capture = 1; chip->capture_stream.is_capture = 1;

20
sound/pci/rme9652/hdspm.c
View File

@ -6411,7 +6411,6 @@ static int snd_hdspm_create_hwdep(struct snd_card *card,
------------------------------------------------------------*/ ------------------------------------------------------------*/
static int snd_hdspm_preallocate_memory(struct hdspm *hdspm) static int snd_hdspm_preallocate_memory(struct hdspm *hdspm)
{ {
int err;
struct snd_pcm *pcm; struct snd_pcm *pcm;
size_t wanted; size_t wanted;
@ -6419,21 +6418,10 @@ static int snd_hdspm_preallocate_memory(struct hdspm *hdspm)
wanted = HDSPM_DMA_AREA_BYTES; wanted = HDSPM_DMA_AREA_BYTES;
err = snd_pcm_lib_preallocate_pages_for_all(pcm, SNDRV_DMA_TYPE_DEV_SG,
snd_pcm_lib_preallocate_pages_for_all(pcm, snd_dma_pci_data(hdspm->pci),
SNDRV_DMA_TYPE_DEV_SG, wanted, wanted);
snd_dma_pci_data(hdspm->pci), dev_dbg(hdspm->card->dev, " Preallocated %zd Bytes\n", wanted);
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);
return 0; return 0;
} }

8
sound/pci/via82xx_modem.c
View File

@ -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, 0, VIA_REG_MO_STATUS, 0);
init_viadev(chip, 1, VIA_REG_MI_STATUS, 1); 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_pcm_lib_preallocate_pages_for_all(pcm, SNDRV_DMA_TYPE_DEV_SG,
snd_dma_pci_data(chip->pci), snd_dma_pci_data(chip->pci),
64*1024, 128*1024)) < 0) 64*1024, 128*1024);
return err;
return 0; return 0;
} }