ALSA: Drop superfluous PCM preallocation error checks
Subsystems (20)
cover ALSA: Drop superfluous PCM preallocation error checks
Hi,
this is yet another patchset for trivial cleanups.
At this time, it's about the superfluous error check from snd_pcm_lib_preallocate_pages() and co. They always succeed and never return a failure although many codes do the error check. The patches simply remove the error checks and finally change the function to be void function.
The patches are applied on top of my previous NULL device fix patches, so not applicable to ASoC tree, I guess. As all these are trivial, applying through my tree altogether would be simpler.
So, Mark, please give your ACK if the changes to ASoC drivers are OK.
thanks,
Takashi
===
Takashi Iwai (20):
ALSA: atmel: Drop superfluous PCM preallocation error checks
ALSA: parisc: Drop superfluous PCM preallocation error checks
ALSA: pci: Drop superfluous PCM preallocation error checks
ALSA: ppc: Drop superfluous PCM preallocation error checks
ALSA: sh: Drop superfluous PCM preallocation error checks
ALSA: sparc: Drop superfluous PCM preallocation error checks
ALSA: spi: Drop superfluous PCM preallocation error checks
ALSA: usb: Drop superfluous PCM preallocation error checks
ASoC: amd: Drop superfluous PCM preallocation error checks
ASoC: dwc: Drop superfluous PCM preallocation error checks
ASoC: intel: Drop superfluous PCM preallocation error checks
ASoC: mediatek: Drop superfluous PCM preallocation error checks
ASoC: meson: Drop superfluous PCM preallocation error checks
ASoC: sh: Drop superfluous PCM preallocation error checks
ASoC: stm: Drop superfluous PCM preallocation error checks
ASoC: txx9: Drop superfluous PCM preallocation error checks
ASoC: uniphier: Drop superfluous PCM preallocation error checks
ASoC: xtensa: Drop superfluous PCM preallocation error checks
ASoC: dmaengine: Drop superfluous PCM preallocation error checks
ALSA: pcm: Define snd_pcm_lib_preallocate_*() as returning void
include/sound/pcm.h | 8 ++--- sound/atmel/ac97c.c | 4 +-- sound/core/pcm_memory.c | 29 +++++----------- sound/parisc/harmony.c | 10 ++---- sound/pci/ad1889.c | 7 +--- sound/pci/aw2/aw2-alsa.c | 40 +++++++--------------- sound/pci/bt87x.c | 10 +++--- sound/pci/ca0106/ca0106_main.c | 16 ++++----- sound/pci/echoaudio/echoaudio.c | 16 ++++----- sound/pci/emu10k1/emupcm.c | 22 ++++++++---- sound/pci/emu10k1/p16v.c | 17 ++++----- sound/pci/lx6464es/lx6464es.c | 8 ++--- sound/pci/rme9652/hdspm.c | 20 +++-------- sound/pci/via82xx_modem.c | 8 ++--- sound/ppc/snd_ps3.c | 6 +--- sound/sh/aica.c | 14 ++++---- sound/soc/amd/acp-pcm-dma.c | 26 ++++++-------- sound/soc/amd/raven/acp3x-pcm-dma.c | 9 +++-- sound/soc/dwc/dwc-pcm.c | 3 +- sound/soc/intel/atom/sst-mfld-platform-pcm.c | 9 ++--- sound/soc/intel/baytrail/sst-baytrail-pcm.c | 15 +++----- sound/soc/intel/haswell/sst-haswell-pcm.c | 10 ++---- sound/soc/intel/skylake/skl-pcm.c | 9 ++--- .../soc/mediatek/common/mtk-afe-platform-driver.c | 6 ++-- sound/soc/meson/axg-fifo.c | 7 ++-- sound/soc/sh/fsi.c | 3 +- sound/soc/sh/rcar/core.c | 5 +-- sound/soc/sh/siu_pcm.c | 13 +------ sound/soc/soc-generic-dmaengine-pcm.c | 5 +-- sound/soc/stm/stm32_adfsdm.c | 5 +-- sound/soc/txx9/txx9aclc.c | 4 ++- sound/soc/uniphier/aio-dma.c | 3 +- sound/soc/xtensa/xtfpga-i2s.c | 6 ++-- sound/sparc/dbri.c | 9 ++--- sound/spi/at73c213.c | 2 +- sound/usb/usx2y/usbusx2yaudio.c | 21 ++++++------ sound/usb/usx2y/usx2yhwdeppcm.c | 19 +++++----- 37 files changed, 157 insertions(+), 267 deletions(-)
Signature · 1 line
2.16.4
PATCH 1/20 ALSA: atmel: Drop superfluous PCM preallocation error checks
snd_pcm_lib_preallocate_pages() and co always succeed, so the error check is simply redundant. Drop it.
--- sound/atmel/ac97c.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)
sound/atmel/ac97c.c +1 -3
@@ -603,11 +603,9 @@ static int atmel_ac97c_pcm_new(struct atmel_ac97c *chip)snd_pcm_set_ops (pcm,SNDRV_PCM_STREAM_CAPTURE , &atmel_ac97_capture_ops);snd_pcm_set_ops (pcm,SNDRV_PCM_STREAM_PLAYBACK , &atmel_ac97_playback_ops); - retval =snd_pcm_lib_preallocate_pages_for_all (pcm,SNDRV_DMA_TYPE_DEV , +snd_pcm_lib_preallocate_pages_for_all (pcm,SNDRV_DMA_TYPE_DEV , &chip->pdev->dev, hw.periods_min * hw.period_bytes_min, hw.buffer_bytes_max); -if (retval) -return retval; pcm->private_data = chip; pcm->info_flags =0 ;
Signature · 1 line
2.16.4
PATCH 2/20 ALSA: parisc: Drop superfluous PCM preallocation error checks
In reply to Takashi Iwaisnd_pcm_lib_preallocate_pages() and co always succeed, so the error check is simply redundant. Drop it.
--- sound/parisc/harmony.c | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-)
sound/parisc/harmony.c +2 -8
@@ -669,14 +669,8 @@ snd_harmony_pcm_init(struct snd_harmony *h) }/* pre-allocate space for DMA */ - err =snd_pcm_lib_preallocate_pages_for_all (pcm, h->dma.type, - h->dma.dev, -MAX_BUF_SIZE , -MAX_BUF_SIZE ); -if (err <0 ) { - printk(KERN_ERR PFX "buffer allocation error: %d\n", err); -return err; - } +snd_pcm_lib_preallocate_pages_for_all (pcm, h->dma.type, h->dma.dev, +MAX_BUF_SIZE ,MAX_BUF_SIZE ); h->st.format =snd_harmony_set_data_format (h,SNDRV_PCM_FORMAT_S16_BE ,1 );
Signature · 1 line
2.16.4
PATCH 3/20 ALSA: pci: Drop superfluous PCM preallocation error checks
In reply to Takashi Iwaisnd_pcm_lib_preallocate_pages() and co always succeed, so the error check is simply redundant. Drop it.
--- sound/pci/ad1889.c | 7 +------ sound/pci/aw2/aw2-alsa.c | 40 ++++++++++++---------------------------- sound/pci/bt87x.c | 10 +++++----- sound/pci/ca0106/ca0106_main.c | 16 ++++++---------- sound/pci/echoaudio/echoaudio.c | 16 +++++++--------- sound/pci/emu10k1/emupcm.c | 22 +++++++++++++++------- sound/pci/emu10k1/p16v.c | 17 +++++++---------- sound/pci/lx6464es/lx6464es.c | 8 +++----- sound/pci/rme9652/hdspm.c | 20 ++++---------------- sound/pci/via82xx_modem.c | 8 +++----- 10 files changed, 63 insertions(+), 101 deletions(-)
sound/pci/ad1889.c +1 -6
@@ -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 ; }
sound/pci/aw2/aw2-alsa.c +12 -28
@@ -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));
sound/pci/bt87x.c +5 -5
@@ -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,
sound/pci/ca0106/ca0106_main.c +6 -10
@@ -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,
sound/pci/echoaudio/echoaudio.c +7 -9
@@ -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 ; }
sound/pci/emu10k1/emupcm.c +15 -7
@@ -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 ; }
sound/pci/emu10k1/p16v.c +7 -10
@@ -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);
sound/pci/lx6464es/lx6464es.c +3 -5
@@ -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 ;
sound/pci/rme9652/hdspm.c +4 -16
@@ -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 ; }
sound/pci/via82xx_modem.c +3 -5
@@ -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 ; }
Signature · 1 line
2.16.4
PATCH 4/20 ALSA: ppc: Drop superfluous PCM preallocation error checks
In reply to Takashi Iwaisnd_pcm_lib_preallocate_pages() and co always succeed, so the error check is simply redundant. Drop it.
--- sound/ppc/snd_ps3.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-)
sound/ppc/snd_ps3.c +1 -5
@@ -1024,15 +1024,11 @@ static int snd_ps3_driver_probe(struct ps3_system_bus_device *dev) the_card.pcm->info_flags =SNDRV_PCM_INFO_NONINTERLEAVED ;/* pre-alloc PCM DMA buffer*/ - ret =snd_pcm_lib_preallocate_pages_for_all (the_card.pcm, +snd_pcm_lib_preallocate_pages_for_all (the_card.pcm,SNDRV_DMA_TYPE_DEV , &dev->core,SND_PS3_PCM_PREALLOC_SIZE ,SND_PS3_PCM_PREALLOC_SIZE ); -if (ret <0 ) { -pr_info ("%s: prealloc failed\n" , __func__); - goto clean_card; - }/* * allocate null buffer
Signature · 1 line
2.16.4
PATCH 5/20 ALSA: sh: Drop superfluous PCM preallocation error checks
In reply to Takashi Iwaisnd_pcm_lib_preallocate_pages() and co always succeed, so the error check is simply redundant. Drop it.
--- sound/sh/aica.c | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-)
sound/sh/aica.c +6 -8
@@ -464,14 +464,12 @@ static int __init snd_aicapcmchip(struct snd_card_aicasnd_pcm_set_ops (pcm,SNDRV_PCM_STREAM_PLAYBACK , &snd_aicapcm_playback_ops);/* Allocate the DMA buffers */ - err = -snd_pcm_lib_preallocate_pages_for_all (pcm, -SNDRV_DMA_TYPE_CONTINUOUS , -snd_dma_continuous_data - (GFP_KERNEL ), -AICA_BUFFER_SIZE , -AICA_BUFFER_SIZE ); -return err; +snd_pcm_lib_preallocate_pages_for_all (pcm, +SNDRV_DMA_TYPE_CONTINUOUS , +snd_dma_continuous_data (GFP_KERNEL ), +AICA_BUFFER_SIZE , +AICA_BUFFER_SIZE ); +return 0 ; }/* Mixer controls */
Signature · 1 line
2.16.4
PATCH 6/20 ALSA: sparc: Drop superfluous PCM preallocation error checks
In reply to Takashi Iwaisnd_pcm_lib_preallocate_pages() and co always succeed, so the error check is simply redundant. Drop it.
--- sound/sparc/dbri.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-)
sound/sparc/dbri.c +3 -6
@@ -2243,12 +2243,9 @@ static int snd_dbri_pcm(struct snd_card *card) pcm->info_flags =0 ;strcpy (pcm->name, card->shortname); -if ((err =snd_pcm_lib_preallocate_pages_for_all (pcm, -SNDRV_DMA_TYPE_CONTINUOUS , -snd_dma_continuous_data (GFP_KERNEL ), -64 *1024 ,64 *1024 )) <0 ) -return err; - +snd_pcm_lib_preallocate_pages_for_all (pcm,SNDRV_DMA_TYPE_CONTINUOUS , +snd_dma_continuous_data (GFP_KERNEL ), +64 *1024 ,64 *1024 );return 0 ; }
Signature · 1 line
2.16.4
PATCH 7/20 ALSA: spi: Drop superfluous PCM preallocation error checks
In reply to Takashi Iwaisnd_pcm_lib_preallocate_pages() and co always succeed, so the error check is simply redundant. Drop it.
--- sound/spi/at73c213.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
sound/spi/at73c213.c +1 -1
@@ -350,7 +350,7 @@ static int snd_at73c213_pcm_new(struct snd_at73c213 *chip, int device)snd_pcm_set_ops (pcm,SNDRV_PCM_STREAM_PLAYBACK , &at73c213_playback_ops); - retval =snd_pcm_lib_preallocate_pages_for_all (chip->pcm, +snd_pcm_lib_preallocate_pages_for_all (chip->pcm,SNDRV_DMA_TYPE_DEV , &chip->ssc->pdev->dev,64 *1024 ,64 *1024 ); out:
Signature · 1 line
2.16.4
PATCH 8/20 ALSA: usb: Drop superfluous PCM preallocation error checks
In reply to Takashi Iwaisnd_pcm_lib_preallocate_pages() and co always succeed, so the error check is simply redundant. Drop it.
--- sound/usb/usx2y/usbusx2yaudio.c | 21 ++++++++++----------- sound/usb/usx2y/usx2yhwdeppcm.c | 19 ++++++++----------- 2 files changed, 18 insertions(+), 22 deletions(-)
sound/usb/usx2y/usbusx2yaudio.c +10 -11
@@ -981,18 +981,17 @@ static int usX2Y_audio_stream_new(struct snd_card *card, int playback_endpoint,sprintf (pcm->name,NAME_ALLCAPS " Audio #%d" ,usX2Y (card)->pcm_devs); -if ((playback_endpoint && -0 > (err =snd_pcm_lib_preallocate_pages (pcm->streams[SNDRV_PCM_STREAM_PLAYBACK ].substream, -SNDRV_DMA_TYPE_CONTINUOUS , -snd_dma_continuous_data (GFP_KERNEL ), -64 *1024 ,128 *1024 ))) || -0 > (err =snd_pcm_lib_preallocate_pages (pcm->streams[SNDRV_PCM_STREAM_CAPTURE ].substream, -SNDRV_DMA_TYPE_CONTINUOUS , -snd_dma_continuous_data (GFP_KERNEL ), -64 *1024 ,128 *1024 ))) { -snd_usX2Y_pcm_private_free (pcm); -return err; +if (playback_endpoint) { +snd_pcm_lib_preallocate_pages (pcm->streams[SNDRV_PCM_STREAM_PLAYBACK ].substream, +SNDRV_DMA_TYPE_CONTINUOUS , +snd_dma_continuous_data (GFP_KERNEL ), +64 *1024 ,128 *1024 ); } + +snd_pcm_lib_preallocate_pages (pcm->streams[SNDRV_PCM_STREAM_CAPTURE ].substream, +SNDRV_DMA_TYPE_CONTINUOUS , +snd_dma_continuous_data (GFP_KERNEL ), +64 *1024 ,128 *1024 );usX2Y (card)->pcm_devs++;return 0 ;
sound/usb/usx2y/usx2yhwdeppcm.c +8 -11
@@ -736,17 +736,14 @@ int usX2Y_hwdep_pcm_new(struct snd_card *card) pcm->info_flags =0 ;sprintf (pcm->name,NAME_ALLCAPS " hwdep Audio" ); -if (0 > (err =snd_pcm_lib_preallocate_pages (pcm->streams[SNDRV_PCM_STREAM_PLAYBACK ].substream, -SNDRV_DMA_TYPE_CONTINUOUS , -snd_dma_continuous_data (GFP_KERNEL ), -64 *1024 ,128 *1024 )) || -0 > (err =snd_pcm_lib_preallocate_pages (pcm->streams[SNDRV_PCM_STREAM_CAPTURE ].substream, -SNDRV_DMA_TYPE_CONTINUOUS , -snd_dma_continuous_data (GFP_KERNEL ), -64 *1024 ,128 *1024 ))) { -return err; - } - +snd_pcm_lib_preallocate_pages (pcm->streams[SNDRV_PCM_STREAM_PLAYBACK ].substream, +SNDRV_DMA_TYPE_CONTINUOUS , +snd_dma_continuous_data (GFP_KERNEL ), +64 *1024 ,128 *1024 ); +snd_pcm_lib_preallocate_pages (pcm->streams[SNDRV_PCM_STREAM_CAPTURE ].substream, +SNDRV_DMA_TYPE_CONTINUOUS , +snd_dma_continuous_data (GFP_KERNEL ), +64 *1024 ,128 *1024 );return 0 ; }
Signature · 1 line
2.16.4
PATCH 9/20 ASoC: amd: Drop superfluous PCM preallocation error checks
In reply to Takashi Iwaisnd_pcm_lib_preallocate_pages() and co always succeed, so the error check is simply redundant. Drop it.
--- sound/soc/amd/acp-pcm-dma.c | 26 +++++++++++--------------- sound/soc/amd/raven/acp3x-pcm-dma.c | 9 ++++----- 2 files changed, 15 insertions(+), 20 deletions(-)
sound/soc/amd/acp-pcm-dma.c +11 -15
@@ -1142,7 +1142,6 @@ static int acp_dma_trigger(struct snd_pcm_substream *substream, int cmd)static int acp_dma_new (struct snd_soc_pcm_runtime *rtd) { -int ret;struct snd_soc_component *component =snd_soc_rtdcom_lookup (rtd,DRV_NAME );struct audio_drv_data *adata =dev_get_drvdata (component->dev);
@@ -1150,24 +1149,21 @@ static int acp_dma_new(struct snd_soc_pcm_runtime *rtd)switch (adata->asic_type) {case CHIP_STONEY : - ret =snd_pcm_lib_preallocate_pages_for_all (rtd->pcm, -SNDRV_DMA_TYPE_DEV , - parent, -ST_MIN_BUFFER , -ST_MAX_BUFFER ); +snd_pcm_lib_preallocate_pages_for_all (rtd->pcm, +SNDRV_DMA_TYPE_DEV , + parent, +ST_MIN_BUFFER , +ST_MAX_BUFFER );break ;default : - ret =snd_pcm_lib_preallocate_pages_for_all (rtd->pcm, -SNDRV_DMA_TYPE_DEV , - parent, -MIN_BUFFER , -MAX_BUFFER ); +snd_pcm_lib_preallocate_pages_for_all (rtd->pcm, +SNDRV_DMA_TYPE_DEV , + parent, +MIN_BUFFER , +MAX_BUFFER );break ; } -if (ret <0 ) -dev_err (component->dev, -"buffer preallocation failure error:%d\n" , ret); -return ret; +return 0 ; }static int acp_dma_close (struct snd_pcm_substream *substream)
sound/soc/amd/raven/acp3x-pcm-dma.c +4 -5
@@ -367,11 +367,10 @@ static snd_pcm_uframes_t acp3x_dma_pointer(struct snd_pcm_substream *substream)static int acp3x_dma_new (struct snd_soc_pcm_runtime *rtd) { -return snd_pcm_lib_preallocate_pages_for_all (rtd->pcm, -SNDRV_DMA_TYPE_DEV , - rtd->pcm->card->dev, -MIN_BUFFER , -MAX_BUFFER ); +snd_pcm_lib_preallocate_pages_for_all (rtd->pcm,SNDRV_DMA_TYPE_DEV , + rtd->pcm->card->dev, +MIN_BUFFER ,MAX_BUFFER ); +return 0 ; }static int acp3x_dma_hw_free (struct snd_pcm_substream *substream)
Signature · 1 line
2.16.4
PATCH 10/20 ASoC: dwc: Drop superfluous PCM preallocation error checks
In reply to Takashi Iwaisnd_pcm_lib_preallocate_pages() and co always succeed, so the error check is simply redundant. Drop it.
--- sound/soc/dwc/dwc-pcm.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
sound/soc/dwc/dwc-pcm.c +2 -1
@@ -249,9 +249,10 @@ static int dw_pcm_new(struct snd_soc_pcm_runtime *rtd) {size_t size = dw_pcm_hardware.buffer_bytes_max; -return snd_pcm_lib_preallocate_pages_for_all (rtd->pcm, +snd_pcm_lib_preallocate_pages_for_all (rtd->pcm,SNDRV_DMA_TYPE_CONTINUOUS ,snd_dma_continuous_data (GFP_KERNEL ), size, size); +return 0 ; }static void dw_pcm_free (struct snd_pcm *pcm)
Signature · 1 line
2.16.4
PATCH 11/20 ASoC: intel: Drop superfluous PCM preallocation error checks
In reply to Takashi Iwaisnd_pcm_lib_preallocate_pages() and co always succeed, so the error check is simply redundant. Drop it.
--- sound/soc/intel/atom/sst-mfld-platform-pcm.c | 9 ++------- sound/soc/intel/baytrail/sst-baytrail-pcm.c | 15 ++++----------- sound/soc/intel/haswell/sst-haswell-pcm.c | 10 ++-------- sound/soc/intel/skylake/skl-pcm.c | 9 ++------- 4 files changed, 10 insertions(+), 33 deletions(-)
sound/soc/intel/atom/sst-mfld-platform-pcm.c +2 -7
@@ -687,20 +687,15 @@ static int sst_pcm_new(struct snd_soc_pcm_runtime *rtd) {struct snd_soc_dai *dai = rtd->cpu_dai;struct snd_pcm *pcm = rtd->pcm; -int retval =0 ;if (dai->driver->playback.channels_min || dai->driver->capture.channels_min) { - retval =snd_pcm_lib_preallocate_pages_for_all (pcm, +snd_pcm_lib_preallocate_pages_for_all (pcm,SNDRV_DMA_TYPE_CONTINUOUS ,snd_dma_continuous_data (GFP_DMA ),SST_MIN_BUFFER ,SST_MAX_BUFFER ); -if (retval) { -dev_err (rtd->dev,"dma buffer allocation failure\n" ); -return retval; - } } -return retval; +return 0 ; }static int sst_soc_probe (struct snd_soc_component *component)
sound/soc/intel/baytrail/sst-baytrail-pcm.c +4 -11
@@ -327,23 +327,16 @@ static int sst_byt_pcm_new(struct snd_soc_pcm_runtime *rtd)size_t size;struct snd_soc_component *component =snd_soc_rtdcom_lookup (rtd,DRV_NAME );struct sst_pdata *pdata =dev_get_platdata (component->dev); -int ret =0 ;if (pcm->streams[SNDRV_PCM_STREAM_PLAYBACK ].substream || pcm->streams[SNDRV_PCM_STREAM_CAPTURE ].substream) { size = sst_byt_pcm_hardware.buffer_bytes_max; - ret =snd_pcm_lib_preallocate_pages_for_all (pcm, -SNDRV_DMA_TYPE_DEV , - pdata->dma_dev, - size, size); -if (ret) { -dev_err (rtd->dev,"dma buffer allocation failed %d\n" , - ret); -return ret; - } +snd_pcm_lib_preallocate_pages_for_all (pcm,SNDRV_DMA_TYPE_DEV , + pdata->dma_dev, + size, size); } -return ret; +return 0 ; }static struct snd_soc_dai_driver byt_dais[] = {
sound/soc/intel/haswell/sst-haswell-pcm.c +2 -8
@@ -946,27 +946,21 @@ static int hsw_pcm_new(struct snd_soc_pcm_runtime *rtd)struct sst_pdata *pdata =dev_get_platdata (component->dev);struct hsw_priv_data *priv_data =dev_get_drvdata (component->dev);struct device *dev = pdata->dma_dev; -int ret =0 ;if (pcm->streams[SNDRV_PCM_STREAM_PLAYBACK ].substream || pcm->streams[SNDRV_PCM_STREAM_CAPTURE ].substream) { - ret =snd_pcm_lib_preallocate_pages_for_all (pcm, +snd_pcm_lib_preallocate_pages_for_all (pcm,SNDRV_DMA_TYPE_DEV_SG , dev, hsw_pcm_hardware.buffer_bytes_max, hsw_pcm_hardware.buffer_bytes_max); -if (ret) { -dev_err (rtd->dev,"dma buffer allocation failed %d\n" , - ret); -return ret; - } }if (pcm->streams[SNDRV_PCM_STREAM_PLAYBACK ].substream) priv_data->pcm[rtd->cpu_dai->id][SNDRV_PCM_STREAM_PLAYBACK ].hsw_pcm = pcm;if (pcm->streams[SNDRV_PCM_STREAM_CAPTURE ].substream) priv_data->pcm[rtd->cpu_dai->id][SNDRV_PCM_STREAM_CAPTURE ].hsw_pcm = pcm; -return ret; +return 0 ; }#define HSW_FORMATS \
sound/soc/intel/skylake/skl-pcm.c +2 -7
@@ -1289,7 +1289,6 @@ static int skl_pcm_new(struct snd_soc_pcm_runtime *rtd)struct hdac_bus *bus =dev_get_drvdata (dai->dev);struct snd_pcm *pcm = rtd->pcm;unsigned int size; -int retval =0 ;struct skl *skl =bus_to_skl (bus); if (dai->driver->playback.channels_min ||
@@ -1298,17 +1297,13 @@ static int skl_pcm_new(struct snd_soc_pcm_runtime *rtd) size =CONFIG_SND_HDA_PREALLOC_SIZE *1024 ;if (size >MAX_PREALLOC_SIZE ) size =MAX_PREALLOC_SIZE ; - retval =snd_pcm_lib_preallocate_pages_for_all (pcm, +snd_pcm_lib_preallocate_pages_for_all (pcm,SNDRV_DMA_TYPE_DEV_SG ,snd_dma_pci_data (skl->pci), size,MAX_PREALLOC_SIZE ); -if (retval) { -dev_err (dai->dev,"dma buffer allocation fail\n" ); -return retval; - } } -return retval; +return 0 ; }static int skl_get_module_info (struct skl *skl,struct skl_module_cfg *mconfig)
Signature · 1 line
2.16.4
PATCH 12/20 ASoC: mediatek: Drop superfluous PCM preallocation error checks
In reply to Takashi Iwaisnd_pcm_lib_preallocate_pages() and co always succeed, so the error check is simply redundant. Drop it.
--- sound/soc/mediatek/common/mtk-afe-platform-driver.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
sound/soc/mediatek/common/mtk-afe-platform-driver.c +3 -3
@@ -126,9 +126,9 @@ int mtk_afe_pcm_new(struct snd_soc_pcm_runtime *rtd)struct mtk_base_afe *afe =snd_soc_component_get_drvdata (component); size = afe->mtk_afe_hardware->buffer_bytes_max; -return snd_pcm_lib_preallocate_pages_for_all (pcm,SNDRV_DMA_TYPE_DEV , - afe->dev, - size, size); +snd_pcm_lib_preallocate_pages_for_all (pcm,SNDRV_DMA_TYPE_DEV , + afe->dev, size, size); +return 0 ; }EXPORT_SYMBOL_GPL (mtk_afe_pcm_new);
Signature · 1 line
2.16.4
PATCH 13/20 ASoC: meson: Drop superfluous PCM preallocation error checks
In reply to Takashi Iwaisnd_pcm_lib_preallocate_pages() and co always succeed, so the error check is simply redundant. Drop it.
--- sound/soc/meson/axg-fifo.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)
sound/soc/meson/axg-fifo.c +4 -3
@@ -267,9 +267,10 @@ int axg_fifo_pcm_new(struct snd_soc_pcm_runtime *rtd, unsigned int type)struct snd_card *card = rtd->card->snd_card;size_t size = axg_fifo_hw.buffer_bytes_max; -return snd_pcm_lib_preallocate_pages (rtd->pcm->streams[type].substream, -SNDRV_DMA_TYPE_DEV , card->dev, - size, size); +snd_pcm_lib_preallocate_pages (rtd->pcm->streams[type].substream, +SNDRV_DMA_TYPE_DEV , card->dev, + size, size); +return 0 ; }EXPORT_SYMBOL_GPL (axg_fifo_pcm_new);
Signature · 1 line
2.16.4
PATCH 14/20 ASoC: sh: Drop superfluous PCM preallocation error checks
In reply to Takashi Iwaisnd_pcm_lib_preallocate_pages() and co always succeed, so the error check is simply redundant. Drop it.
--- sound/soc/sh/fsi.c | 3 ++- sound/soc/sh/rcar/core.c | 5 +---- sound/soc/sh/siu_pcm.c | 13 +------------ 3 files changed, 4 insertions(+), 17 deletions(-)
sound/soc/sh/fsi.c +2 -1
@@ -1768,11 +1768,12 @@ static const struct snd_pcm_ops fsi_pcm_ops = {static int fsi_pcm_new (struct snd_soc_pcm_runtime *rtd) { -return snd_pcm_lib_preallocate_pages_for_all ( +snd_pcm_lib_preallocate_pages_for_all ( rtd->pcm,SNDRV_DMA_TYPE_DEV , rtd->card->snd_card->dev,PREALLOC_BUFFER ,PREALLOC_BUFFER_MAX ); +return 0 ; }/*
sound/soc/sh/rcar/core.c +1 -4
@@ -1575,7 +1575,6 @@ static int rsnd_preallocate_pages(struct snd_soc_pcm_runtime *rtd,struct rsnd_priv *priv =rsnd_io_to_priv (io);struct device *dev =rsnd_priv_to_dev (priv);struct snd_pcm_substream *substream; -int err;/* * use Audio-DMAC dev if we can use IPMMU
@@ -1588,12 +1587,10 @@ static int rsnd_preallocate_pages(struct snd_soc_pcm_runtime *rtd,for (substream = rtd->pcm->streams[stream].substream; substream; substream = substream->next) { - err =snd_pcm_lib_preallocate_pages (substream, +snd_pcm_lib_preallocate_pages (substream,SNDRV_DMA_TYPE_DEV , dev,PREALLOC_BUFFER ,PREALLOC_BUFFER_MAX ); -if (err <0 ) -return err; }return 0 ;
sound/soc/sh/siu_pcm.c +1 -12
@@ -541,15 +541,9 @@ static int siu_pcm_new(struct snd_soc_pcm_runtime *rtd)if (ret <0 )return ret; - ret =snd_pcm_lib_preallocate_pages_for_all (pcm, +snd_pcm_lib_preallocate_pages_for_all (pcm,SNDRV_DMA_TYPE_DEV , card->dev,SIU_BUFFER_BYTES_MAX ,SIU_BUFFER_BYTES_MAX ); -if (ret <0 ) { -dev_err (card->dev, -"snd_pcm_lib_preallocate_pages_for_all() err=%d" , - ret); - goto fail; - } (*port_info)->pcm = pcm;
@@ -562,11 +556,6 @@ static int siu_pcm_new(struct snd_soc_pcm_runtime *rtd)dev_info (card->dev,"SuperH SIU driver initialized.\n" );return 0 ; - -fail: -siu_free_port (siu_ports[pdev->id]); -dev_err (card->dev,"SIU: failed to initialize.\n" ); -return ret; }static void siu_pcm_free (struct snd_pcm *pcm)
Signature · 1 line
2.16.4
Re: [PATCH 14/20] ASoC: sh: Drop superfluous PCM preallocation error checks
Hi
Quoted 9 lines
snd_pcm_lib_preallocate_pages()and co always succeed, so the error check is simply redundant. Drop it.Signed-off-by Takashi Iwai <[email protected]>--- sound/soc/sh/fsi.c | 3 ++- sound/soc/sh/rcar/core.c | 5 +---- sound/soc/sh/siu_pcm.c | 13 +------------ 3 files changed, 4 insertions(+), 17 deletions(-)
Best regards
---
Kuninori Morimoto
PATCH 15/20 ASoC: stm: Drop superfluous PCM preallocation error checks
In reply to Takashi Iwaisnd_pcm_lib_preallocate_pages() and co always succeed, so the error check is simply redundant. Drop it.
--- sound/soc/stm/stm32_adfsdm.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
sound/soc/stm/stm32_adfsdm.c +3 -2
@@ -262,8 +262,9 @@ static int stm32_adfsdm_pcm_new(struct snd_soc_pcm_runtime *rtd)snd_soc_dai_get_drvdata (rtd->cpu_dai);unsigned int size =DFSDM_MAX_PERIODS *DFSDM_MAX_PERIOD_SIZE ; -return snd_pcm_lib_preallocate_pages_for_all (pcm,SNDRV_DMA_TYPE_DEV , - priv->dev, size, size); +snd_pcm_lib_preallocate_pages_for_all (pcm,SNDRV_DMA_TYPE_DEV , + priv->dev, size, size); +return 0 ; }static void stm32_adfsdm_pcm_free (struct snd_pcm *pcm)
Signature · 1 line
2.16.4
PATCH 16/20 ASoC: txx9: Drop superfluous PCM preallocation error checks
In reply to Takashi Iwaisnd_pcm_lib_preallocate_pages() and co always succeed, so the error check is simply redundant. Drop it.
--- sound/soc/txx9/txx9aclc.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
sound/soc/txx9/txx9aclc.c +3 -1
@@ -313,8 +313,10 @@ static int txx9aclc_pcm_new(struct snd_soc_pcm_runtime *rtd)if (ret) goto exit; } -return snd_pcm_lib_preallocate_pages_for_all (pcm,SNDRV_DMA_TYPE_DEV , + +snd_pcm_lib_preallocate_pages_for_all (pcm,SNDRV_DMA_TYPE_DEV , card->dev,64 *1024 ,4 *1024 *1024 ); +return 0 ; exit:for (i =0 ; i <2 ; i++) {
Signature · 1 line
2.16.4
PATCH 17/20 ASoC: uniphier: Drop superfluous PCM preallocation error checks
In reply to Takashi Iwaisnd_pcm_lib_preallocate_pages() and co always succeed, so the error check is simply redundant. Drop it.
--- sound/soc/uniphier/aio-dma.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
sound/soc/uniphier/aio-dma.c +2 -1
@@ -235,10 +235,11 @@ static int uniphier_aiodma_new(struct snd_soc_pcm_runtime *rtd)if (ret)return ret; -return snd_pcm_lib_preallocate_pages_for_all (pcm, +snd_pcm_lib_preallocate_pages_for_all (pcm,SNDRV_DMA_TYPE_DEV , dev, uniphier_aiodma_hw.buffer_bytes_max, uniphier_aiodma_hw.buffer_bytes_max); +return 0 ; }static void uniphier_aiodma_free (struct snd_pcm *pcm)
Signature · 1 line
2.16.4
PATCH 18/20 ASoC: xtensa: Drop superfluous PCM preallocation error checks
In reply to Takashi Iwaisnd_pcm_lib_preallocate_pages() and co always succeed, so the error check is simply redundant. Drop it.
--- sound/soc/xtensa/xtfpga-i2s.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
sound/soc/xtensa/xtfpga-i2s.c +3 -3
@@ -469,9 +469,9 @@ static int xtfpga_pcm_new(struct snd_soc_pcm_runtime *rtd)struct snd_card *card = rtd->card->snd_card;size_t size = xtfpga_pcm_hardware.buffer_bytes_max; -return snd_pcm_lib_preallocate_pages_for_all (rtd->pcm, -SNDRV_DMA_TYPE_DEV , - card->dev, size, size); +snd_pcm_lib_preallocate_pages_for_all (rtd->pcm,SNDRV_DMA_TYPE_DEV , + card->dev, size, size); +return 0 ; }static const struct snd_pcm_ops xtfpga_pcm_ops = {
Signature · 1 line
2.16.4
PATCH 19/20 ASoC: dmaengine: Drop superfluous PCM preallocation error checks
In reply to Takashi Iwaisnd_pcm_lib_preallocate_pages() and co always succeed, so the error check is simply redundant. Drop it.
--- sound/soc/soc-generic-dmaengine-pcm.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-)
sound/soc/soc-generic-dmaengine-pcm.c +1 -4
@@ -270,7 +270,6 @@ static int dmaengine_pcm_new(struct snd_soc_pcm_runtime *rtd)size_t prealloc_buffer_size;size_t max_buffer_size;unsigned int i; -int ret;if (config && config->prealloc_buffer_size) { prealloc_buffer_size = config->prealloc_buffer_size;
@@ -303,13 +302,11 @@ static int dmaengine_pcm_new(struct snd_soc_pcm_runtime *rtd)return -EINVAL ; } - ret =snd_pcm_lib_preallocate_pages (substream, +snd_pcm_lib_preallocate_pages (substream,SNDRV_DMA_TYPE_DEV_IRAM ,dmaengine_dma_dev (pcm, substream), prealloc_buffer_size, max_buffer_size); -if (ret) -return ret;if (!dmaengine_pcm_can_report_residue (dev, pcm->chan[i])) pcm->flags |=SND_DMAENGINE_PCM_FLAG_NO_RESIDUE ;
Signature · 1 line
2.16.4
PATCH 20/20 ALSA: pcm: Define snd_pcm_lib_preallocate_*() as returning void
In reply to Takashi IwaiNow all callers no longer check the return value from snd_pcm_lib_preallocate_pages() and co, let's make them to return void, so that any new code won't fall into the same pitfall.
--- include/sound/pcm.h | 8 ++++---- sound/core/pcm_memory.c | 29 ++++++++--------------------- 2 files changed, 12 insertions(+), 25 deletions(-)
include/sound/pcm.h +4 -4
@@ -1185,12 +1185,12 @@ static inline void snd_pcm_gettime(struct snd_pcm_runtime *runtime,* Memory */ -int snd_pcm_lib_preallocate_free (struct snd_pcm_substream *substream); -int snd_pcm_lib_preallocate_free_for_all (struct snd_pcm *pcm); -int snd_pcm_lib_preallocate_pages (struct snd_pcm_substream *substream, +void snd_pcm_lib_preallocate_free (struct snd_pcm_substream *substream); +void snd_pcm_lib_preallocate_free_for_all (struct snd_pcm *pcm); +void snd_pcm_lib_preallocate_pages (struct snd_pcm_substream *substream,int type,struct device *data,size_t size,size_t max); -int snd_pcm_lib_preallocate_pages_for_all (struct snd_pcm *pcm, +void snd_pcm_lib_preallocate_pages_for_all (struct snd_pcm *pcm,int type,void *data,size_t size,size_t max);int snd_pcm_lib_malloc_pages (struct snd_pcm_substream *substream,size_t size);
sound/core/pcm_memory.c +8 -21
@@ -87,13 +87,10 @@ static void snd_pcm_lib_preallocate_dma_free(struct snd_pcm_substream *substream* @substream: the pcm substream instance * * Releases the pre-allocated buffer of the given substream. -* -* Return: Zero if successful, or a negative error code on failure. */ -int snd_pcm_lib_preallocate_free (struct snd_pcm_substream *substream) +void snd_pcm_lib_preallocate_free (struct snd_pcm_substream *substream) {snd_pcm_lib_preallocate_dma_free (substream); -return 0 ; }/**
@@ -101,10 +98,8 @@ int snd_pcm_lib_preallocate_free(struct snd_pcm_substream *substream)* @pcm: the pcm instance * * Releases all the pre-allocated buffers on the given pcm. -* -* Return: Zero if successful, or a negative error code on failure. */ -int snd_pcm_lib_preallocate_free_for_all (struct snd_pcm *pcm) +void snd_pcm_lib_preallocate_free_for_all (struct snd_pcm *pcm) {struct snd_pcm_substream *substream;int stream;
@@ -112,7 +107,6 @@ int snd_pcm_lib_preallocate_free_for_all(struct snd_pcm *pcm)for (stream =0 ; stream <2 ; stream++)for (substream = pcm->streams[stream].substream; substream; substream = substream->next)snd_pcm_lib_preallocate_free (substream); -return 0 ; }EXPORT_SYMBOL (snd_pcm_lib_preallocate_free_for_all);
@@ -215,7 +209,7 @@ static inline void preallocate_info_init(struct snd_pcm_substream *substream)/* * pre-allocate the buffer and create a proc file for the substream */ -static int snd_pcm_lib_preallocate_pages1 (struct snd_pcm_substream *substream, +static void snd_pcm_lib_preallocate_pages1 (struct snd_pcm_substream *substream,size_t size,size_t max) {
@@ -226,7 +220,6 @@ static int snd_pcm_lib_preallocate_pages1(struct snd_pcm_substream *substream, substream->buffer_bytes_max = substream->dma_buffer.bytes; substream->dma_max = max;preallocate_info_init (substream); -return 0 ; }
@@ -239,16 +232,14 @@ static int snd_pcm_lib_preallocate_pages1(struct snd_pcm_substream *substream,* @max: the max. allowed pre-allocation size * * Do pre-allocation for the given DMA buffer type. -* -* Return: Zero if successful, or a negative error code on failure. */ -int snd_pcm_lib_preallocate_pages (struct snd_pcm_substream *substream, +void snd_pcm_lib_preallocate_pages (struct snd_pcm_substream *substream,int type,struct device *data,size_t size,size_t max) { substream->dma_buffer.dev.type = type; substream->dma_buffer.dev.dev = data; -return snd_pcm_lib_preallocate_pages1 (substream, size, max); +snd_pcm_lib_preallocate_pages1 (substream, size, max); }EXPORT_SYMBOL (snd_pcm_lib_preallocate_pages);
@@ -262,21 +253,17 @@ EXPORT_SYMBOL(snd_pcm_lib_preallocate_pages);* * Do pre-allocation to all substreams of the given pcm for the * specified DMA type. -* -* Return: Zero if successful, or a negative error code on failure. */ -int snd_pcm_lib_preallocate_pages_for_all (struct snd_pcm *pcm, +void snd_pcm_lib_preallocate_pages_for_all (struct snd_pcm *pcm,int type,void *data,size_t size,size_t max) {struct snd_pcm_substream *substream; -int stream, err; +int stream;for (stream =0 ; stream <2 ; stream++)for (substream = pcm->streams[stream].substream; substream; substream = substream->next) -if ((err =snd_pcm_lib_preallocate_pages (substream, type, data, size, max)) <0 ) -return err; -return 0 ; +snd_pcm_lib_preallocate_pages (substream, type, data, size, max); }EXPORT_SYMBOL (snd_pcm_lib_preallocate_pages_for_all);
Signature · 1 line
2.16.4
Dne 5.2.2019 v 20:42 Takashi Iwai napsal(a):
Quoted 9 lines
Hi,
this is yet another patchset for trivial cleanups.
At this time, it's about the superfluous error check fromsnd_pcm_lib_preallocate_pages()and co. They always succeed and never return a failure although many codes do the error check. The patches simply remove the error checks and finally change the function to be void function.
Quoted 5 lines
The patches are applied on top of my previous NULL device fix patches, so not applicable to ASoC tree, I guess. As all these are trivial, applying through my tree altogether would be simpler.
So, Mark, please give your ACK if the changes to ASoC drivers are OK.
With all respects, do we really need to split those elementary changes to single patches inside the sound tree? I would really prefer to have this inside one patch or maybe few patches (core/pci/asoc/others). Just my two cents.
Jaroslav
Signature · 2 lines
Jaroslav Kysela <[email protected]> Linux Sound Maintainer; ALSA Project; Red Hat, Inc.
Quoted 15 lines · Jaroslav Kysela
Dne 5.2.2019 v 20:42 Takashi Iwai napsal(a):
Quoted 13 lines
Hi,
this is yet another patchset for trivial cleanups.
At this time, it's about the superfluous error check fromsnd_pcm_lib_preallocate_pages()and co. They always succeed and never return a failure although many codes do the error check. The patches simply remove the error checks and finally change the function to be void function.The patches are applied on top of my previous NULL device fix patches, so not applicable to ASoC tree, I guess. As all these are trivial, applying through my tree altogether would be simpler.
Quoted 8 lines
Quoted 1 line
So, Mark, please give your ACK if the changes to ASoC drivers are OK.
With all respects, do we really need to split those elementary changes to single patches inside the sound tree? I would really prefer to have this inside one patch or maybe few patches (core/pci/asoc/others). Just my two cents.
Reviewed-by Jaroslav Kysela <[email protected]>
There are both good and bad sides by this kind of fine splits. A good side is that each reviewer can give ack for particular changes, and it's easier to backport to older kernels. A bad side is that it results in more commits, and the relation between all relevant changes isn't clear from each single commit.
I split at this time, especially about ASoC, since ASoC codes are managed by more people than other parts in the sound tree. But, yeah, this could be a single patch, too.
thanks,
Takashi
Quoted 3 lines · Jaroslav Kysela
Dne 5.2.2019 v 20:42 Takashi Iwai napsal(a):
Quoted 1 line
So, Mark, please give your ACK if the changes to ASoC drivers are OK.
Quoted 4 lines
With all respects, do we really need to split those elementary changes to single patches inside the sound tree? I would really prefer to have this inside one patch or maybe few patches (core/pci/asoc/others). Just my two cents.
FWIW it does mean that life is easier for people doing backports when things are split up as there's less chance that some file that wasn't added in the kernel version you were interested in was touched by the patch.
Jaroslav Kysela
maintainerDne 6.2.2019 v 15:50 Mark Brown napsal(a):
Quoted 9 lines
Quoted 4 lines
With all respects, do we really need to split those elementary changes to single patches inside the sound tree? I would really prefer to have this inside one patch or maybe few patches (core/pci/asoc/others). Just my two cents.
FWIW it does mean that life is easier for people doing backports when things are split up as there's less chance that some file that wasn't added in the kernel version you were interested in was touched by the patch.
It's only minor thing for the backports. The proper import procedure covers this. I don't like to have separate patches for single-line/single-file changes and this change set belongs to this.
Jaroslav
Signature · 2 lines
Jaroslav Kysela <[email protected]> Linux Sound Maintainer; ALSA Project; Red Hat, Inc.