August 2017 - Alsa-devel - mailman.alsa-project.org

[alsa-devel] [PATCH] ALSA: usx2y: Delete an error message for a failed memory allocation in two functions
by SF Markus Elfring 12 Aug '17

12 Aug '17

From: Markus Elfring <elfring(a)users.sourceforge.net> Date: Fri, 11 Aug 2017 17:40:57 +0200 Omit an extra message for a memory allocation failure in these functions. This issue was detected by using the Coccinelle software. Link: http://events.linuxfoundation.org/sites/events/files/slides/LCJ16-Refactor_… Signed-off-by: Markus Elfring <elfring(a)users.sourceforge.net> --- sound/usb/usx2y/usbusx2yaudio.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/sound/usb/usx2y/usbusx2yaudio.c b/sound/usb/usx2y/usbusx2yaudio.c index dd40ca9d858a..612aa7ff7e18 100644 --- a/sound/usb/usx2y/usbusx2yaudio.c +++ b/sound/usb/usx2y/usbusx2yaudio.c @@ -422,7 +422,5 @@ static int usX2Y_urbs_allocate(struct snd_usX2Y_substream *subs) - if (NULL == subs->tmpbuf) { - snd_printk(KERN_ERR "cannot malloc tmpbuf\n"); + if (!subs->tmpbuf) return -ENOMEM; - } } /* allocate and initialize data urbs */ for (i = 0; i < NRURBS; i++) { @@ -952,7 +950,6 @@ static int usX2Y_audio_stream_new(struct snd_card *card, int playback_endpoint, - if (NULL == usX2Y_substream[i]) { - snd_printk(KERN_ERR "cannot malloc\n"); + if (!usX2Y_substream[i]) return -ENOMEM; - } + usX2Y_substream[i]->usX2Y = usX2Y(card); } -- 2.14.0

2 1

[alsa-devel] [PATCH v3] ASoC: samsung: i2s: Null pointer dereference on samsung_i2s_remove
by Anton Vasilyev 12 Aug '17

12 Aug '17

If (quirks & QUIRK_SEC_DAI == 0) then samsung_i2s_probe() doesn't allocate sec_dai and pri_dai->sec_dai remains Null, but samsung_i2s_remove() performs pri_dai->sec_dai dereference in any case. The patch adds sec_dai check on Null before derefence at samsung_i2s_remove(). Found by Linux Driver Verification project (linuxtesting.org). Signed-off-by: Anton Vasilyev <vasilyev(a)ispras.ru> --- v2: Drop initialization of sec_dai by NULL at samsung_i2s_remove as Sylwester Nawrocki suggest. --- v3: Fix typo in the comment --- sound/soc/samsung/i2s.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/sound/soc/samsung/i2s.c b/sound/soc/samsung/i2s.c index af3ba4d..6f896e3 100644 --- a/sound/soc/samsung/i2s.c +++ b/sound/soc/samsung/i2s.c @@ -1376,13 +1376,9 @@ static int samsung_i2s_probe(struct platform_device *pdev) static int samsung_i2s_remove(struct platform_device *pdev) { - struct i2s_dai *pri_dai, *sec_dai; + struct i2s_dai *pri_dai; pri_dai = dev_get_drvdata(&pdev->dev); - sec_dai = pri_dai->sec_dai; - - pri_dai->sec_dai = NULL; - sec_dai->pri_dai = NULL; pm_runtime_get_sync(&pdev->dev); pm_runtime_disable(&pdev->dev); -- 2.7.4

2 1

[alsa-devel] [PATCH] ASoC: Intel: constify snd_compr_codec_caps structures
by Julia Lawall 12 Aug '17

12 Aug '17

These snd_compr_codec_caps structures are only copied into other structures, so they can be const. Done with the help of Coccinelle. Signed-off-by: Julia Lawall <Julia.Lawall(a)lip6.fr> --- sound/soc/intel/atom/sst/sst_drv_interface.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sound/soc/intel/atom/sst/sst_drv_interface.c b/sound/soc/intel/atom/sst/sst_drv_interface.c index ce689c5..71af544 100644 --- a/sound/soc/intel/atom/sst/sst_drv_interface.c +++ b/sound/soc/intel/atom/sst/sst_drv_interface.c @@ -407,7 +407,7 @@ static int sst_cdev_caps(struct snd_compr_caps *caps) return 0; } -static struct snd_compr_codec_caps caps_mp3 = { +static const struct snd_compr_codec_caps caps_mp3 = { .num_descriptors = 1, .descriptor[0].max_ch = 2, .descriptor[0].sample_rates[0] = 48000, @@ -424,7 +424,7 @@ static int sst_cdev_caps(struct snd_compr_caps *caps) .descriptor[0].formats = 0, }; -static struct snd_compr_codec_caps caps_aac = { +static const struct snd_compr_codec_caps caps_aac = { .num_descriptors = 2, .descriptor[1].max_ch = 2, .descriptor[0].sample_rates[0] = 48000,

1 0

Re: [alsa-devel] [PATCH] ASoC: hdmi-codec: Use different name for playback streams
by Brian Norris 12 Aug '17

12 Aug '17

Hi Jeffy, You need to be more careful about the addressee's of your patches. No one on To/CC is a maintainer or a sufficiently-targeted mailing list. I doubt any of the maintainers will read your patch. (I've added alsa-devel for you, but given my understanding of at least Mark's patchwork workflow -- and of general patch etiquette -- it's important the patch is actually sent there in the first place.) Probably worth resending. Brian On Fri, Aug 11, 2017 at 04:29:33PM +0800, Jeffy Chen wrote: > Currently the hdmi i2s playback stream and hdmi spdif playback stream > are using the same name. So when they are enabled at the same time, > kernel will print this warning: > > [ 2.201835] hdmi-audio-codec hdmi-audio-codec.1.auto: ASoC: Failed to > create Playback debugfs file > > Assign different names to them to avoid that. > > Signed-off-by: Jeffy Chen <jeffy.chen(a)rock-chips.com> > --- > > sound/soc/codecs/hdmi-codec.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/sound/soc/codecs/hdmi-codec.c b/sound/soc/codecs/hdmi-codec.c > index 509ab51..a2af440 100644 > --- a/sound/soc/codecs/hdmi-codec.c > +++ b/sound/soc/codecs/hdmi-codec.c > @@ -696,7 +696,7 @@ static struct snd_soc_dai_driver hdmi_i2s_dai = { > .name = "i2s-hifi", > .id = DAI_ID_I2S, > .playback = { > - .stream_name = "Playback", > + .stream_name = "I2S Playback", > .channels_min = 2, > .channels_max = 8, > .rates = HDMI_RATES, > @@ -711,7 +711,7 @@ static const struct snd_soc_dai_driver hdmi_spdif_dai = { > .name = "spdif-hifi", > .id = DAI_ID_SPDIF, > .playback = { > - .stream_name = "Playback", > + .stream_name = "SPDIF Playback", > .channels_min = 2, > .channels_max = 2, > .rates = HDMI_RATES, > -- > 2.1.4 > >

2 1

[alsa-devel] [PATCH 0/3] ASoC-Blackfin: Adjustments for some function implementations
by SF Markus Elfring 11 Aug '17

11 Aug '17

From: Markus Elfring <elfring(a)users.sourceforge.net> Date: Fri, 11 Aug 2017 22:34:56 +0200 A few update suggestions were taken into account from static source code analysis. Markus Elfring (3): Delete an error message for a failed memory allocation in sport_create() Use common error handling code in sport_create() Add some spaces for better code readability sound/soc/blackfin/bf6xx-sport.c | 38 +++++++++++++++++--------------------- 1 file changed, 17 insertions(+), 21 deletions(-) -- 2.14.0

1 3

[alsa-devel] [PATCH 10/11] ASoC: pxa: Handle return value of clk_prepare_enable.
by Arvind Yadav 11 Aug '17

11 Aug '17

clk_prepare_enable() can fail here and we must check its return value. Signed-off-by: Arvind Yadav <arvind.yadav.cs(a)gmail.com> --- sound/soc/pxa/pxa2xx-i2s.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/sound/soc/pxa/pxa2xx-i2s.c b/sound/soc/pxa/pxa2xx-i2s.c index 3fb60ba..2312c22 100644 --- a/sound/soc/pxa/pxa2xx-i2s.c +++ b/sound/soc/pxa/pxa2xx-i2s.c @@ -164,10 +164,14 @@ static int pxa2xx_i2s_hw_params(struct snd_pcm_substream *substream, struct snd_soc_dai *dai) { struct snd_dmaengine_dai_dma_data *dma_data; + int ret; if (WARN_ON(IS_ERR(clk_i2s))) return -EINVAL; - clk_prepare_enable(clk_i2s); + ret = clk_prepare_enable(clk_i2s); + if (ret) + return ret; + clk_ena = 1; pxa_i2s_wait(); -- 1.9.1

2 3

[alsa-devel] [PATCH] ASoC: Intel: Skylake: make skl_dsp_fw_ops const
by Bhumika Goyal 11 Aug '17

11 Aug '17

Make these const as they are only used during a copy operation. Done using Coccinelle. Signed-off-by: Bhumika Goyal <bhumirks(a)gmail.com> --- sound/soc/intel/skylake/bxt-sst.c | 2 +- sound/soc/intel/skylake/cnl-sst.c | 2 +- sound/soc/intel/skylake/skl-sst.c | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/sound/soc/intel/skylake/bxt-sst.c b/sound/soc/intel/skylake/bxt-sst.c index 71042ac..5e1ac99 100644 --- a/sound/soc/intel/skylake/bxt-sst.c +++ b/sound/soc/intel/skylake/bxt-sst.c @@ -530,7 +530,7 @@ static int bxt_set_dsp_D3(struct sst_dsp *ctx, unsigned int core_id) return 0; } -static struct skl_dsp_fw_ops bxt_fw_ops = { +static const struct skl_dsp_fw_ops bxt_fw_ops = { .set_state_D0 = bxt_set_dsp_D0, .set_state_D3 = bxt_set_dsp_D3, .set_state_D0i3 = bxt_schedule_dsp_D0i3, diff --git a/sound/soc/intel/skylake/cnl-sst.c b/sound/soc/intel/skylake/cnl-sst.c index 7dcfe66..48ef04d 100644 --- a/sound/soc/intel/skylake/cnl-sst.c +++ b/sound/soc/intel/skylake/cnl-sst.c @@ -277,7 +277,7 @@ static unsigned int cnl_get_errno(struct sst_dsp *ctx) return sst_dsp_shim_read(ctx, CNL_ADSP_ERROR_CODE); } -static struct skl_dsp_fw_ops cnl_fw_ops = { +static const struct skl_dsp_fw_ops cnl_fw_ops = { .set_state_D0 = cnl_set_dsp_D0, .set_state_D3 = cnl_set_dsp_D3, .load_fw = cnl_load_base_firmware, diff --git a/sound/soc/intel/skylake/skl-sst.c b/sound/soc/intel/skylake/skl-sst.c index 6cc586d..a7ad734 100644 --- a/sound/soc/intel/skylake/skl-sst.c +++ b/sound/soc/intel/skylake/skl-sst.c @@ -503,7 +503,7 @@ static void skl_clear_module_table(struct sst_dsp *ctx) } } -static struct skl_dsp_fw_ops skl_fw_ops = { +static const struct skl_dsp_fw_ops skl_fw_ops = { .set_state_D0 = skl_set_dsp_D0, .set_state_D3 = skl_set_dsp_D3, .load_fw = skl_load_base_firmware, @@ -512,7 +512,7 @@ static void skl_clear_module_table(struct sst_dsp *ctx) .unload_mod = skl_unload_module, }; -static struct skl_dsp_fw_ops kbl_fw_ops = { +static const struct skl_dsp_fw_ops kbl_fw_ops = { .set_state_D0 = skl_set_dsp_D0, .set_state_D3 = skl_set_dsp_D3, .load_fw = skl_load_base_firmware, -- 1.9.1

1 0

[alsa-devel] [PATCH] ASoC: Intel: kbl: make snd_pcm_hw_constraint_list const
by Bhumika Goyal 11 Aug '17

11 Aug '17

Make these const as they are only passed to the function snd_pcm_hw_constraint_list having the corresponding argument as const. Done using Coccinelle. Signed-off-by: Bhumika Goyal <bhumirks(a)gmail.com> --- sound/soc/intel/boards/kbl_rt5663_max98927.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sound/soc/intel/boards/kbl_rt5663_max98927.c b/sound/soc/intel/boards/kbl_rt5663_max98927.c index 12b34b9..8bdd613 100644 --- a/sound/soc/intel/boards/kbl_rt5663_max98927.c +++ b/sound/soc/intel/boards/kbl_rt5663_max98927.c @@ -286,7 +286,7 @@ static int kabylake_5663_hdmi2_init(struct snd_soc_pcm_runtime *rtd) 48000, }; -static struct snd_pcm_hw_constraint_list constraints_rates = { +static const struct snd_pcm_hw_constraint_list constraints_rates = { .count = ARRAY_SIZE(rates), .list = rates, .mask = 0, @@ -296,7 +296,7 @@ static int kabylake_5663_hdmi2_init(struct snd_soc_pcm_runtime *rtd) 2, }; -static struct snd_pcm_hw_constraint_list constraints_channels = { +static const struct snd_pcm_hw_constraint_list constraints_channels = { .count = ARRAY_SIZE(channels), .list = channels, .mask = 0, @@ -425,7 +425,7 @@ static int kabylake_dmic_startup(struct snd_pcm_substream *substream) 16000, }; -static struct snd_pcm_hw_constraint_list constraints_16000 = { +static const struct snd_pcm_hw_constraint_list constraints_16000 = { .count = ARRAY_SIZE(rates_16000), .list = rates_16000, }; -- 1.9.1

1 0

[alsa-devel] [PATCH] ASoC: DaVinci: Delete an error message for a failed memory allocation in two functions
by SF Markus Elfring 11 Aug '17

11 Aug '17

From: Markus Elfring <elfring(a)users.sourceforge.net> Date: Fri, 11 Aug 2017 16:51:46 +0200 Omit an extra message for a memory allocation failure in these functions. This issue was detected by using the Coccinelle software. Link: http://events.linuxfoundation.org/sites/events/files/slides/LCJ16-Refactor_… Signed-off-by: Markus Elfring <elfring(a)users.sourceforge.net> --- sound/soc/davinci/davinci-mcasp.c | 2 -- sound/soc/davinci/davinci-vcif.c | 5 +---- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/sound/soc/davinci/davinci-mcasp.c b/sound/soc/davinci/davinci-mcasp.c index 56ec1d301ac2..d486908d4e0e 100644 --- a/sound/soc/davinci/davinci-mcasp.c +++ b/sound/soc/davinci/davinci-mcasp.c @@ -1604,6 +1604,4 @@ static struct davinci_mcasp_pdata *davinci_mcasp_set_pdata_from_of( if (!pdata) { - dev_err(&pdev->dev, - "Failed to allocate memory for pdata\n"); ret = -ENOMEM; return pdata; } diff --git a/sound/soc/davinci/davinci-vcif.c b/sound/soc/davinci/davinci-vcif.c index c77d9218795a..5415b72393fa 100644 --- a/sound/soc/davinci/davinci-vcif.c +++ b/sound/soc/davinci/davinci-vcif.c @@ -213,8 +213,5 @@ static int davinci_vcif_probe(struct platform_device *pdev) - if (!davinci_vcif_dev) { - dev_dbg(&pdev->dev, - "could not allocate memory for private data\n"); + if (!davinci_vcif_dev) return -ENOMEM; - } /* DMA tx params */ davinci_vcif_dev->davinci_vc = davinci_vc; -- 2.14.0

1 0

[alsa-devel] [PATCH] ASoC: Freescale: Delete an error message for a failed memory allocation in three functions
by SF Markus Elfring 11 Aug '17

11 Aug '17

>From 885ccd6c63291dcd4854a0cbaab5188cdc3db805 Mon Sep 17 00:00:00 2001 From: Markus Elfring <elfring(a)users.sourceforge.net> Date: Fri, 11 Aug 2017 15:10:43 +0200 Subject: [PATCH] ASoC: Freescale: Delete an error message for a failed memory allocation in three functions Omit an extra message for a memory allocation failure in these functions. This issue was detected by using the Coccinelle software. Link: http://events.linuxfoundation.org/sites/events/files/slides/LCJ16-Refactor_… Signed-off-by: Markus Elfring <elfring(a)users.sourceforge.net> --- sound/soc/fsl/fsl_asrc_dma.c | 4 +--- sound/soc/fsl/fsl_dma.c | 1 - sound/soc/fsl/fsl_ssi.c | 4 +--- 3 files changed, 2 insertions(+), 7 deletions(-) diff --git a/sound/soc/fsl/fsl_asrc_dma.c b/sound/soc/fsl/fsl_asrc_dma.c index 282d841840b1..2baf19608bd0 100644 --- a/sound/soc/fsl/fsl_asrc_dma.c +++ b/sound/soc/fsl/fsl_asrc_dma.c @@ -282,7 +282,5 @@ static int fsl_asrc_dma_startup(struct snd_pcm_substream *substream) - if (!pair) { - dev_err(dev, "failed to allocate pair\n"); + if (!pair) return -ENOMEM; - } pair->asrc_priv = asrc_priv; diff --git a/sound/soc/fsl/fsl_dma.c b/sound/soc/fsl/fsl_dma.c index ccadefceeff2..0ce172f86d6c 100644 --- a/sound/soc/fsl/fsl_dma.c +++ b/sound/soc/fsl/fsl_dma.c @@ -907,5 +907,4 @@ static int fsl_soc_dma_probe(struct platform_device *pdev) if (!dma) { - dev_err(&pdev->dev, "could not allocate dma object\n"); of_node_put(ssi_np); return -ENOMEM; } diff --git a/sound/soc/fsl/fsl_ssi.c b/sound/soc/fsl/fsl_ssi.c index 173cb8496641..64598d1183f8 100644 --- a/sound/soc/fsl/fsl_ssi.c +++ b/sound/soc/fsl/fsl_ssi.c @@ -1435,7 +1435,5 @@ static int fsl_ssi_probe(struct platform_device *pdev) - if (!ssi_private) { - dev_err(&pdev->dev, "could not allocate DAI object\n"); + if (!ssi_private) return -ENOMEM; - } ssi_private->soc = of_id->data; ssi_private->dev = &pdev->dev; -- 2.14.0

2 1