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

[alsa-devel] [PATCH] ALSA: asihpi: Kill BUG_ON() usages
by Takashi Iwai 07 Sep '17

07 Sep '17

BUG_ON() is the worst choice for a trivial sanity check. Either it should be removed or replaced with a softer one like WARN_ON() if still really needed. Signed-off-by: Takashi Iwai <tiwai(a)suse.de> --- sound/pci/asihpi/asihpi.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/sound/pci/asihpi/asihpi.c b/sound/pci/asihpi/asihpi.c index 976a3d23557e..70d023a85bf5 100644 --- a/sound/pci/asihpi/asihpi.c +++ b/sound/pci/asihpi/asihpi.c @@ -558,12 +558,10 @@ static void snd_card_asihpi_pcm_int_start(struct snd_pcm_substream *substream) struct snd_card_asihpi_pcm *dpcm; struct snd_card_asihpi *card; - BUG_ON(!substream); - dpcm = (struct snd_card_asihpi_pcm *)substream->runtime->private_data; card = snd_pcm_substream_chip(substream); - BUG_ON(in_interrupt()); + WARN_ON(in_interrupt()); tasklet_disable(&card->t); card->llmode_streampriv = dpcm; tasklet_enable(&card->t); @@ -578,8 +576,6 @@ static void snd_card_asihpi_pcm_int_stop(struct snd_pcm_substream *substream) struct snd_card_asihpi_pcm *dpcm; struct snd_card_asihpi *card; - BUG_ON(!substream); - dpcm = (struct snd_card_asihpi_pcm *)substream->runtime->private_data; card = snd_pcm_substream_chip(substream); -- 2.14.1

1 0

[alsa-devel] [PATCH 14/14] sound/core: Use %pS printk format for direct addresses
by Helge Deller 07 Sep '17

07 Sep '17

The debug functions uses wrongly the %pF instead of the %pS printk format specifier for printing symbols for the address returned by _builtin_return_address(0). Fix it for the ia64, ppc64 and parisc64 architectures. Signed-off-by: Helge Deller <deller(a)gmx.de> Cc: Jaroslav Kysela <perex(a)perex.cz> Cc: Takashi Iwai <tiwai(a)suse.com> Cc: alsa-devel(a)alsa-project.org --- sound/core/device.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sound/core/device.c b/sound/core/device.c index 8918838..cb0e46f 100644 --- a/sound/core/device.c +++ b/sound/core/device.c @@ -128,7 +128,7 @@ void snd_device_disconnect(struct snd_card *card, void *device_data) if (dev) __snd_device_disconnect(dev); else - dev_dbg(card->dev, "device disconnect %p (from %pF), not found\n", + dev_dbg(card->dev, "device disconnect %p (from %pS), not found\n", device_data, __builtin_return_address(0)); } EXPORT_SYMBOL_GPL(snd_device_disconnect); @@ -152,7 +152,7 @@ void snd_device_free(struct snd_card *card, void *device_data) if (dev) __snd_device_free(dev); else - dev_dbg(card->dev, "device free %p (from %pF), not found\n", + dev_dbg(card->dev, "device free %p (from %pS), not found\n", device_data, __builtin_return_address(0)); } EXPORT_SYMBOL(snd_device_free); -- 2.1.0

2 1

[alsa-devel] [PATCH 0/3] ALSA: ymfpci: Fine-tuning for some function implementations
by SF Markus Elfring 07 Sep '17

07 Sep '17

From: Markus Elfring <elfring(a)users.sourceforge.net> Date: Wed, 6 Sep 2017 21:37:32 +0200 Three update suggestions were taken into account from static source code analysis. Markus Elfring (3): Use common error handling code in snd_card_ymfpci_probe() Use common error handling code in snd_ymfpci_create() Adjust 17 checks for null pointers sound/pci/ymfpci/ymfpci.c | 62 ++++++++++++++++++------------------ sound/pci/ymfpci/ymfpci_main.c | 72 ++++++++++++++++++++++-------------------- 2 files changed, 67 insertions(+), 67 deletions(-) -- 2.14.1

3 9

[alsa-devel] [PATCH] ALSA: 6Fire: Use common error handling code in usb6fire_chip_probe()
by SF Markus Elfring 07 Sep '17

07 Sep '17

From: Markus Elfring <elfring(a)users.sourceforge.net> Date: Wed, 6 Sep 2017 16:26:29 +0200 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/usb/6fire/chip.c | 31 +++++++++++++------------------ 1 file changed, 13 insertions(+), 18 deletions(-) diff --git a/sound/usb/6fire/chip.c b/sound/usb/6fire/chip.c index bc2a24f7a791..c7641cb50616 100644 --- a/sound/usb/6fire/chip.c +++ b/sound/usb/6fire/chip.c @@ -143,37 +143,32 @@ static int usb6fire_chip_probe(struct usb_interface *intf, chip->card = card; ret = usb6fire_comm_init(chip); - if (ret < 0) { - usb6fire_chip_destroy(chip); - return ret; - } + if (ret < 0) + goto destroy_chip; ret = usb6fire_midi_init(chip); - if (ret < 0) { - usb6fire_chip_destroy(chip); - return ret; - } + if (ret < 0) + goto destroy_chip; ret = usb6fire_pcm_init(chip); - if (ret < 0) { - usb6fire_chip_destroy(chip); - return ret; - } + if (ret < 0) + goto destroy_chip; ret = usb6fire_control_init(chip); - if (ret < 0) { - usb6fire_chip_destroy(chip); - return ret; - } + if (ret < 0) + goto destroy_chip; ret = snd_card_register(card); if (ret < 0) { dev_err(&intf->dev, "cannot register card."); - usb6fire_chip_destroy(chip); - return ret; + goto destroy_chip; } usb_set_intfdata(intf, chip); return 0; + +destroy_chip: + usb6fire_chip_destroy(chip); + return ret; } static void usb6fire_chip_disconnect(struct usb_interface *intf) -- 2.14.1

2 1

[alsa-devel] [PATCH 0/2] ALSA: usx2y: Fine-tuning for two function implementations
by SF Markus Elfring 07 Sep '17

07 Sep '17

From: Markus Elfring <elfring(a)users.sourceforge.net> Date: Wed, 6 Sep 2017 15:10:12 +0200 Two update suggestions were taken into account from static source code analysis. Markus Elfring (2): Use common error handling code in us122l_create_card() Use common error handling code in submit_urbs() sound/usb/usx2y/us122l.c | 10 ++++++---- sound/usb/usx2y/usb_stream.c | 18 ++++++++++-------- 2 files changed, 16 insertions(+), 12 deletions(-) -- 2.14.1

2 4

[alsa-devel] [PATCH 0/2] ALSA: rme9652: Adjustments for two function implementations
by SF Markus Elfring 07 Sep '17

07 Sep '17

From: Markus Elfring <elfring(a)users.sourceforge.net> Date: Tue, 5 Sep 2017 22:30:22 +0200 Two update suggestions were taken into account from static source code analysis. Markus Elfring (2): Use common code in hdsp_get_iobox_version() Use common error handling code in snd_hdspm_probe() sound/pci/rme9652/hdsp.c | 26 +++++++++++--------------- sound/pci/rme9652/hdspm.c | 16 ++++++++-------- 2 files changed, 19 insertions(+), 23 deletions(-) -- 2.14.1

2 4

[alsa-devel] [PATCH] ALSA: maestro3: Use common error handling code in two functions
by SF Markus Elfring 07 Sep '17

07 Sep '17

From: Markus Elfring <elfring(a)users.sourceforge.net> Date: Tue, 22 Aug 2017 15:00:27 +0200 Add jump targets so that a bit of exception handling can be better reused at the end of these functions. This issue was detected by using the Coccinelle software. Signed-off-by: Markus Elfring <elfring(a)users.sourceforge.net> --- sound/pci/maestro3.c | 55 +++++++++++++++++++++++++--------------------------- 1 file changed, 26 insertions(+), 29 deletions(-) diff --git a/sound/pci/maestro3.c b/sound/pci/maestro3.c index cafea6dc5c01..759c3f6ad7aa 100644 --- a/sound/pci/maestro3.c +++ b/sound/pci/maestro3.c @@ -2622,22 +2622,18 @@ snd_m3_create(struct snd_card *card, struct pci_dev *pci, err = request_firmware(&chip->assp_kernel_image, "ess/maestro3_assp_kernel.fw", &pci->dev); - if (err < 0) { - snd_m3_free(chip); - return err; - } + if (err) + goto free_chip; err = request_firmware(&chip->assp_minisrc_image, "ess/maestro3_assp_minisrc.fw", &pci->dev); - if (err < 0) { - snd_m3_free(chip); - return err; - } + if (err) + goto free_chip; + + err = pci_request_regions(pci, card->driver); + if (err) + goto free_chip; - if ((err = pci_request_regions(pci, card->driver)) < 0) { - snd_m3_free(chip); - return err; - } chip->iobase = pci_resource_start(pci, 0); /* just to be sure */ @@ -2655,8 +2651,8 @@ snd_m3_create(struct snd_card *card, struct pci_dev *pci, if (request_irq(pci->irq, snd_m3_interrupt, IRQF_SHARED, KBUILD_MODNAME, chip)) { dev_err(card->dev, "unable to grab IRQ %d\n", pci->irq); - snd_m3_free(chip); - return -ENOMEM; + err = -ENOMEM; + goto free_chip; } chip->irq = pci->irq; @@ -2666,10 +2662,9 @@ snd_m3_create(struct snd_card *card, struct pci_dev *pci, dev_warn(card->dev, "can't allocate apm buffer\n"); #endif - if ((err = snd_device_new(card, SNDRV_DEV_LOWLEVEL, chip, &ops)) < 0) { - snd_m3_free(chip); - return err; - } + err = snd_device_new(card, SNDRV_DEV_LOWLEVEL, chip, &ops); + if (err) + goto free_chip; if ((err = snd_m3_mixer(chip)) < 0) return err; @@ -2699,6 +2694,9 @@ snd_m3_create(struct snd_card *card, struct pci_dev *pci, *chip_ret = chip; return 0; +free_chip: + snd_m3_free(chip); + return err; } /* @@ -2741,23 +2739,19 @@ snd_m3_probe(struct pci_dev *pci, const struct pci_device_id *pci_id) break; } - if ((err = snd_m3_create(card, pci, - external_amp[dev], - amp_gpio[dev], - &chip)) < 0) { - snd_card_free(card); - return err; - } + err = snd_m3_create(card, pci, external_amp[dev], amp_gpio[dev], &chip); + if (err) + goto free_card; + card->private_data = chip; sprintf(card->shortname, "ESS %s PCI", card->driver); sprintf(card->longname, "%s at 0x%lx, irq %d", card->shortname, chip->iobase, chip->irq); - if ((err = snd_card_register(card)) < 0) { - snd_card_free(card); - return err; - } + err = snd_card_register(card); + if (err) + goto free_card; #if 0 /* TODO: not supported yet */ /* TODO enable MIDI IRQ and I/O */ @@ -2772,6 +2766,9 @@ snd_m3_probe(struct pci_dev *pci, const struct pci_device_id *pci_id) pci_set_drvdata(pci, card); dev++; return 0; +free_card: + snd_card_free(card); + return err; } static void snd_m3_remove(struct pci_dev *pci) -- 2.14.0

3 3

[alsa-devel] [PATCH] ASoC: cs4270: Use common error handling code in two functions
by SF Markus Elfring 06 Sep '17

06 Sep '17

From: Markus Elfring <elfring(a)users.sourceforge.net> Date: Wed, 6 Sep 2017 19:09:31 +0200 Add jump targets so that a bit of exception handling can be better reused at the end of these functions. This issue was detected by using the Coccinelle software. Signed-off-by: Markus Elfring <elfring(a)users.sourceforge.net> --- sound/soc/codecs/cs4270.c | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/sound/soc/codecs/cs4270.c b/sound/soc/codecs/cs4270.c index 84f86745c30e..aa70d471cc57 100644 --- a/sound/soc/codecs/cs4270.c +++ b/sound/soc/codecs/cs4270.c @@ -362,10 +362,8 @@ static int cs4270_hw_params(struct snd_pcm_substream *substream, reg |= cs4270_mode_ratios[i].speed_mode; ret = snd_soc_write(codec, CS4270_MODE, reg); - if (ret < 0) { - dev_err(codec->dev, "i2c write failed\n"); - return ret; - } + if (ret < 0) + goto report_failure; /* Set the DAI format */ @@ -385,11 +383,13 @@ static int cs4270_hw_params(struct snd_pcm_substream *substream, } ret = snd_soc_write(codec, CS4270_FORMAT, reg); - if (ret < 0) { - dev_err(codec->dev, "i2c write failed\n"); - return ret; - } + if (ret < 0) + goto report_failure; + + return ret; +report_failure: + dev_err(codec->dev, "i2c write failed\n"); return ret; } @@ -512,10 +512,8 @@ static int cs4270_probe(struct snd_soc_codec *codec) * re-enabled it by using the controls. */ ret = snd_soc_update_bits(codec, CS4270_MUTE, CS4270_MUTE_AUTO, 0); - if (ret < 0) { - dev_err(codec->dev, "i2c write failed\n"); - return ret; - } + if (ret < 0) + goto report_failure; /* Disable automatic volume control. The hardware enables, and it * causes volume change commands to be delayed, sometimes until after @@ -524,15 +522,17 @@ static int cs4270_probe(struct snd_soc_codec *codec) */ ret = snd_soc_update_bits(codec, CS4270_TRANS, CS4270_TRANS_SOFT | CS4270_TRANS_ZERO, 0); - if (ret < 0) { - dev_err(codec->dev, "i2c write failed\n"); - return ret; - } + if (ret < 0) + goto report_failure; ret = regulator_bulk_enable(ARRAY_SIZE(cs4270->supplies), cs4270->supplies); return ret; + +report_failure: + dev_err(codec->dev, "i2c write failed\n"); + return ret; } /** -- 2.14.1

1 0

[alsa-devel] ALSA MIDI exclusive mode ?
by happy musicmaker 06 Sep '17

06 Sep '17

I ready somewhere that some applications, like Bitwig, allocate(?) MIDI ports in "exclusive" mode so that other application cannot connect to the MIDI ports. I used Bitwig and confirmed that after starting Bitwig in qjackctrl you cannot connect any of the MIDI write/read ports. ( qjackctrl MIDI option is set to "none") I could not find any documentation on such "exclusive" feature though ?

2 2

[alsa-devel] USB dB data
by Jack Bates 06 Sep '17

06 Sep '17

I confirmed with Wireshark that my USB sound card responds to GET_MIN with 0x0000 and GET_MAX with 0x6300 .. The audio device class definition [1] says the units are 1/256 dB (section 5.2.2.2.3: Mixer Control) ... So by my calculation, the min and max are 0 and 99 dB (0x6300 / 256 == 99) ... Why then does alsactl print: > range '0 - 99' > dbmin 0 > dbmax 38 (/usr/sbin/aslactl -f - store) I originally asked about this on the pulseaudio-discuss list [2] because it uses "dB data" [3]. The "0 - 99" makes sense -- it lines up with my calculation ... Where does the 38 come from? (I expect it's obvious, I just haven't found the explanation?) Background: I just got a Bose SoundLink Revolve ... When I connect it with USB, the volume is silent from 0 to 99% and deafening at 100% (using PulseAudio). Directly adjusting the volume with alsamixer works properly: It increases smoothly from 0 to 100% -- changes that are reflected in the PulseAudio volume as fine adjustments in between 99 and 100% (64587 to 65536 PulseAudio volume). From what I've read there's a common problem where especially USB devices report the wrong dB data (don't follow the spec [4]) -- this has previously been handled by patching the USB audio driver [5] ... However I haven't figured out how my device deviates from the spec (0x0000 to 0x6300 or 0 to 99 dB seem plausible) -- my understanding is incomplete: I haven't figured out where the value 38 comes from ... [1] http://www.usb.org/developers/docs/devclass_docs/audio10.pdf [2] https://lists.freedesktop.org/archives/pulseaudio-discuss/2017-August/02860… [3] http://0pointer.de/blog/projects/decibel-data [4] https://bugs.launchpad.net/ubuntu/+source/pulseaudio/+bug/637066 [5] https://bugs.freedesktop.org/show_bug.cgi?id=93193#c14

2 3