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

[alsa-devel] [PATCH] ASoC: wm8804: Use common error handling code in wm8804_probe()
by SF Markus Elfring 20 Nov '17

20 Nov '17

From: Markus Elfring <elfring(a)users.sourceforge.net> Date: Sun, 19 Nov 2017 07:55:49 +0100 * Add a jump target so that a specific error message is stored only once at the end of this function implementation. * Replace two calls of the function "dev_err" by goto statements. This issue was detected by using the Coccinelle software. Signed-off-by: Markus Elfring <elfring(a)users.sourceforge.net> --- sound/soc/codecs/wm8804.c | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/sound/soc/codecs/wm8804.c b/sound/soc/codecs/wm8804.c index fc69b87443d8..a45812417909 100644 --- a/sound/soc/codecs/wm8804.c +++ b/sound/soc/codecs/wm8804.c @@ -626,16 +626,12 @@ int wm8804_probe(struct device *dev, struct regmap *regmap) gpiod_set_value_cansleep(wm8804->reset, 1); ret = regmap_read(regmap, WM8804_RST_DEVID1, &id1); - if (ret < 0) { - dev_err(dev, "Failed to read device ID: %d\n", ret); - goto err_reg_enable; - } + if (ret < 0) + goto report_read_failure; ret = regmap_read(regmap, WM8804_DEVID2, &id2); - if (ret < 0) { - dev_err(dev, "Failed to read device ID: %d\n", ret); - goto err_reg_enable; - } + if (ret < 0) + goto report_read_failure; id2 = (id2 << 8) | id1; @@ -674,6 +670,8 @@ int wm8804_probe(struct device *dev, struct regmap *regmap) return 0; +report_read_failure: + dev_err(dev, "Failed to read device ID: %d\n", ret); err_reg_enable: regulator_bulk_disable(ARRAY_SIZE(wm8804->supplies), wm8804->supplies); return ret; -- 2.15.0

2 1

[alsa-devel] [PATCH 0/4] ALSA SoC PCM: Fine-tuning for some function implementations
by SF Markus Elfring 19 Nov '17

19 Nov '17

From: Markus Elfring <elfring(a)users.sourceforge.net> Date: Sun, 19 Nov 2017 21:12:34 +0100 A few update suggestions were taken into account from static source code analysis. Markus Elfring (4): Improve unlocking of a mutex in soc_dpcm_runtime_update() Add some blank lines for better code readability Add some spaces for better code readability Improve a size determination in dpcm_be_connect() sound/soc/soc-pcm.c | 60 ++++++++++++++++++++++++++++++++--------------------- 1 file changed, 36 insertions(+), 24 deletions(-) -- 2.15.0

1 4

[alsa-devel] [PATCH 0/2] ASoC-Rockchip: Fine-tuning for rk_aif1_hw_params()
by SF Markus Elfring 19 Nov '17

19 Nov '17

From: Markus Elfring <elfring(a)users.sourceforge.net> Date: Sun, 19 Nov 2017 13:34:56 +0100 Two update suggestions were taken into account from static source code analysis. Markus Elfring (2): Use common error handling code Delete two unnecessary variable initialisations sound/soc/rockchip/rockchip_max98090.c | 13 +++++-------- sound/soc/rockchip/rockchip_rt5645.c | 13 +++++-------- 2 files changed, 10 insertions(+), 16 deletions(-) -- 2.15.0

1 2

[alsa-devel] [PATCH] ASoC: sst-firmware: Improve unlocking of a mutex in sst_block_alloc_scratch()
by SF Markus Elfring 19 Nov '17

19 Nov '17

From: Markus Elfring <elfring(a)users.sourceforge.net> Date: Sun, 19 Nov 2017 10:45:36 +0100 * Add a jump target so that a call of the function "mutex_unlock" is stored only once in this function implementation. * Replace three calls by goto statements. * Increase the lock scope. This issue was detected by using the Coccinelle software. Signed-off-by: Markus Elfring <elfring(a)users.sourceforge.net> --- sound/soc/intel/common/sst-firmware.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/sound/soc/intel/common/sst-firmware.c b/sound/soc/intel/common/sst-firmware.c index 79a9fdf94d38..665e66670512 100644 --- a/sound/soc/intel/common/sst-firmware.c +++ b/sound/soc/intel/common/sst-firmware.c @@ -1097,8 +1097,8 @@ int sst_block_alloc_scratch(struct sst_dsp *dsp) if (dsp->scratch_size == 0) { dev_info(dsp->dev, "no modules need scratch buffer\n"); - mutex_unlock(&dsp->mutex); - return 0; + ret = 0; + goto unlock; } /* allocate blocks for module scratch buffers */ @@ -1127,21 +1127,21 @@ int sst_block_alloc_scratch(struct sst_dsp *dsp) } if (ret < 0) { dev_err(dsp->dev, "error: can't alloc scratch blocks\n"); - mutex_unlock(&dsp->mutex); - return ret; + goto unlock; } ret = block_list_prepare(dsp, &dsp->scratch_block_list); if (ret < 0) { dev_err(dsp->dev, "error: scratch block prepare failed\n"); - mutex_unlock(&dsp->mutex); - return ret; + goto unlock; } /* assign the same offset of scratch to each module */ dsp->scratch_offset = ba.offset; + ret = dsp->scratch_size; +unlock: mutex_unlock(&dsp->mutex); - return dsp->scratch_size; + return ret; } EXPORT_SYMBOL_GPL(sst_block_alloc_scratch); -- 2.15.0

1 0

[alsa-devel] [PATCH] ASoC: audio-graph-scu-card: Use common error handling code in asoc_graph_card_parse_of()
by SF Markus Elfring 19 Nov '17

19 Nov '17

From: Markus Elfring <elfring(a)users.sourceforge.net> Date: Sun, 19 Nov 2017 08:51:41 +0100 Add a jump target so that a bit of exception handling can be better reused at the end of this function. This issue was detected by using the Coccinelle software. Signed-off-by: Markus Elfring <elfring(a)users.sourceforge.net> --- sound/soc/generic/audio-graph-scu-card.c | 22 +++++++++------------- 1 file changed, 9 insertions(+), 13 deletions(-) diff --git a/sound/soc/generic/audio-graph-scu-card.c b/sound/soc/generic/audio-graph-scu-card.c index a967aa143d51..c4b999fba7e6 100644 --- a/sound/soc/generic/audio-graph-scu-card.c +++ b/sound/soc/generic/audio-graph-scu-card.c @@ -231,10 +231,8 @@ static int asoc_graph_card_parse_of(struct graph_card_data *priv) ret = asoc_simple_card_parse_daifmt(dev, cpu_ep, codec_ep, NULL, &daifmt); - if (ret < 0) { - of_node_put(cpu_port); - goto parse_of_err; - } + if (ret < 0) + goto put_node; } dai_idx = 0; @@ -266,17 +264,13 @@ static int asoc_graph_card_parse_of(struct graph_card_data *priv) /* Back-End (= Codec) */ ret = asoc_graph_card_dai_link_of(codec_ep, priv, daifmt, dai_idx++, 0); - if (ret < 0) { - of_node_put(cpu_port); - goto parse_of_err; - } + if (ret < 0) + goto put_node; } else { /* Front-End (= CPU) */ ret = asoc_graph_card_dai_link_of(cpu_ep, priv, daifmt, dai_idx++, 1); - if (ret < 0) { - of_node_put(cpu_port); - goto parse_of_err; - } + if (ret < 0) + goto put_node; } } } @@ -285,8 +279,10 @@ static int asoc_graph_card_parse_of(struct graph_card_data *priv) if (ret) goto parse_of_err; - ret = 0; + return 0; +put_node: + of_node_put(cpu_port); parse_of_err: return ret; } -- 2.15.0

1 0

[alsa-devel] [PATCH] ALSA: via82xx: Use common error handling code in snd_via82xx_create()
by SF Markus Elfring 19 Nov '17

19 Nov '17

From: Markus Elfring <elfring(a)users.sourceforge.net> Date: Tue, 22 Aug 2017 19:37:26 +0200 Add jump targets so that a bit of exception handling can be better reused at the end of this function. This issue was detected by using the Coccinelle software. Signed-off-by: Markus Elfring <elfring(a)users.sourceforge.net> --- sound/pci/via82xx_modem.c | 33 +++++++++++++++++++-------------- 1 file changed, 19 insertions(+), 14 deletions(-) diff --git a/sound/pci/via82xx_modem.c b/sound/pci/via82xx_modem.c index 55f79b2599e7..8659776887b2 100644 --- a/sound/pci/via82xx_modem.c +++ b/sound/pci/via82xx_modem.c @@ -1110,8 +1110,8 @@ static int snd_via82xx_create(struct snd_card *card, return err; if ((chip = kzalloc(sizeof(*chip), GFP_KERNEL)) == NULL) { - pci_disable_device(pci); - return -ENOMEM; + err = -ENOMEM; + goto disable_device; } spin_lock_init(&chip->reg_lock); @@ -1121,30 +1121,27 @@ static int snd_via82xx_create(struct snd_card *card, if ((err = pci_request_regions(pci, card->driver)) < 0) { kfree(chip); - pci_disable_device(pci); - return err; + goto disable_device; } chip->port = pci_resource_start(pci, 0); if (request_irq(pci->irq, snd_via82xx_interrupt, IRQF_SHARED, KBUILD_MODNAME, chip)) { dev_err(card->dev, "unable to grab IRQ %d\n", pci->irq); - snd_via82xx_free(chip); - return -EBUSY; + err = -EBUSY; + goto free_chip; } chip->irq = pci->irq; if (ac97_clock >= 8000 && ac97_clock <= 48000) chip->ac97_clock = ac97_clock; synchronize_irq(chip->irq); - if ((err = snd_via82xx_chip_init(chip)) < 0) { - snd_via82xx_free(chip); - return err; - } + err = snd_via82xx_chip_init(chip); + if (err < 0) + goto free_chip; - if ((err = snd_device_new(card, SNDRV_DEV_LOWLEVEL, chip, &ops)) < 0) { - snd_via82xx_free(chip); - return err; - } + err = snd_device_new(card, SNDRV_DEV_LOWLEVEL, chip, &ops); + if (err < 0) + goto free_chip; /* The 8233 ac97 controller does not implement the master bit * in the pci command register. IMHO this is a violation of the PCI spec. @@ -1153,6 +1150,14 @@ static int snd_via82xx_create(struct snd_card *card, *r_via = chip; return 0; + +disable_device: + pci_disable_device(pci); + goto exit; +free_chip: + snd_via82xx_free(chip); +exit: + return err; } -- 2.14.0

3 6

[alsa-devel] [PATCH] ALSA: cs5530: Use common error handling code in snd_cs5530_probe()
by SF Markus Elfring 18 Nov '17

18 Nov '17

From: Markus Elfring <elfring(a)users.sourceforge.net> Date: Sat, 18 Nov 2017 22:10:19 +0100 Add a jump target so that a bit of exception handling can be better reused at the end of this function. This issue was detected by using the Coccinelle software. Signed-off-by: Markus Elfring <elfring(a)users.sourceforge.net> --- sound/pci/cs5530.c | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/sound/pci/cs5530.c b/sound/pci/cs5530.c index 0a8cf94c4858..674572edf2d2 100644 --- a/sound/pci/cs5530.c +++ b/sound/pci/cs5530.c @@ -269,23 +269,24 @@ static int snd_cs5530_probe(struct pci_dev *pci, return err; err = snd_cs5530_create(card, pci, &chip); - if (err < 0) { - snd_card_free(card); - return err; - } + if (err < 0) + goto free_card; strcpy(card->driver, "CS5530"); strcpy(card->shortname, "CS5530 Audio"); sprintf(card->longname, "%s at 0x%lx", card->shortname, chip->pci_base); err = snd_card_register(card); - if (err < 0) { - snd_card_free(card); - return err; - } + if (err < 0) + goto free_card; + pci_set_drvdata(pci, card); dev++; return 0; + +free_card: + snd_card_free(card); + return err; } static struct pci_driver cs5530_driver = { -- 2.15.0

1 0

[alsa-devel] [PATCH 0/2] ALSA-Digigram VX222: Fine-tuning for four function implementations
by SF Markus Elfring 18 Nov '17

18 Nov '17

From: Markus Elfring <elfring(a)users.sourceforge.net> Date: Sat, 18 Nov 2017 21:27:50 +0100 Two update suggestions were taken into account from static source code analysis. Markus Elfring (2): Adjust ten function calls together with a variable assignment Use common error handling code in two functions sound/pci/vx222/vx222.c | 53 +++++++++++++++++++++++++-------------------- sound/pci/vx222/vx222_ops.c | 19 +++++++++------- 2 files changed, 41 insertions(+), 31 deletions(-) -- 2.15.0

1 2

[alsa-devel] [PATCH 0/3] ALSA-Trident 4DWave: Fine-tuning for nine function implementations
by SF Markus Elfring 18 Nov '17

18 Nov '17

From: Markus Elfring <elfring(a)users.sourceforge.net> Date: Sat, 18 Nov 2017 19:50:12 +0100 A few update suggestions were taken into account from static source code analysis. Markus Elfring (3): Adjust 34 function calls together with a variable assignment Use common error handling code in two functions Use common error handling code in snd_trident_mixer() sound/pci/trident/trident.c | 68 ++++++------ sound/pci/trident/trident_main.c | 221 ++++++++++++++++++++++----------------- 2 files changed, 163 insertions(+), 126 deletions(-) -- 2.15.0

1 3

[alsa-devel] [PATCH 0/3] ALSA-S3 SonicVibes: Fine-tuning for five function implementations
by SF Markus Elfring 18 Nov '17

18 Nov '17

From: Markus Elfring <elfring(a)users.sourceforge.net> Date: Sat, 18 Nov 2017 16:25:43 +0100 A few update suggestions were taken into account from static source code analysis. Markus Elfring (3): Adjust 15 function calls together with a variable assignment Use common error handling code in snd_sonic_probe() Use common error handling code in snd_sonicvibes_create() sound/pci/sonicvibes.c | 144 +++++++++++++++++++++++++++---------------------- 1 file changed, 79 insertions(+), 65 deletions(-) -- 2.15.0

1 3