July 2014 - Alsa-devel - mailman.alsa-project.org

[alsa-devel] [PATCH - alsa-utils 0/5] The amidicat program as a patch
by Josh Lehan 10 Jul '14

10 Jul '14

This is my "amidicat" program, which makes it easy and straightforward to interact with the ALSA MIDI sequencer from the command line, by simply using standard input and output. It took just over a year, to find the time to work on it again, but here it is, formatted as a patch to alsa-utils, as requested. http://mailman.alsa-project.org/pipermail/alsa-devel/2013-May/062353.html It has been cleaned up to match "checkpatch" coding standards, and all compiler warnings have been fixed. The documentation has also been cleaned up, in particular, the Perl examples have been brought up to date: the raw bytes no longer cause errors on Unicode systems. I respectfully submit this program to alsa-utils, and hope that it makes it in there :) Josh Lehan Josh Lehan (5): Adding amidicat subdirectory to SUBDIRS Add amidicat Makefile to AC_OUTPUT list Makefile for amidicat, includes manual page Documentation manual page for amidicat The amidicat program itself, better late than never Makefile.am | 2 +- amidicat/Makefile.am | 5 + amidicat/amidicat.1 | 392 ++++++++++++ amidicat/amidicat.c | 1708 ++++++++++++++++++++++++++++++++++++++++++++++++++ configure.ac | 2 +- 5 files changed, 2107 insertions(+), 2 deletions(-) create mode 100644 amidicat/Makefile.am create mode 100644 amidicat/amidicat.1 create mode 100644 amidicat/amidicat.c -- 1.8.3.2

3 16

[alsa-devel] [PATCH] ASoC: wm-adsp: Add missing MODULE_LICENSE
by Vinod Koul 09 Jul '14

09 Jul '14

From: Praveen Diwakar <praveen.diwakar(a)intel.com> Since MODULE_LICENSE is missing the module load fails, so add this for module. Signed-off-by: Praveen Diwakar <praveen.diwakar(a)intel.com> Signed-off-by: Vinod Koul <vinod.koul(a)intel.com> --- --- sound/soc/codecs/wm_adsp.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/sound/soc/codecs/wm_adsp.c b/sound/soc/codecs/wm_adsp.c index 0600271..2537725 100644 --- a/sound/soc/codecs/wm_adsp.c +++ b/sound/soc/codecs/wm_adsp.c @@ -1758,3 +1758,5 @@ int wm_adsp2_init(struct wm_adsp *adsp, bool dvfs) return 0; } EXPORT_SYMBOL_GPL(wm_adsp2_init); + +MODULE_LICENSE("GPL v2"); -- 1.7.0.4

3 4

[alsa-devel] Split a 7.1 device into 4 stereo devices
by Xavier Claessens 09 Jul '14

09 Jul '14

Hello, I have a 7.1 sound device and speaker-test -c8 can output on each speaker. But what I would like to do is using it as 4 stereo devices so I could play different sounds on each of them. Ideally I would like to avoid dmix and friends to be able to have gapless and bit-perfect output. On IRC "debianuser" said it is possible with hdajackretask to make it appear as 4 different hw devices in "aplay -l" but we didn't succeed doing that. Anyone knows what configuration is needed for that? Here is my setting: http://www.alsa-project.org/db/?f=bf0744873d5e6d42d3adc0076c5f66189e9191b7 Regards, Xavier Claessens.

3 2

[alsa-devel] [PATCH V2] ASoC: omap-hdmi: Use devm_snd_soc_register_component
by Manish Badarkhe 09 Jul '14

09 Jul '14

Replaced snd_soc_register_component with its devres equivalent, devm_snd_soc_register_component. Signed-off-by: Manish Badarkhe <badarkhe.manish(a)gmail.com> --- Changes since V1: Aligned function parameter properly. :100644 100644 eb9c392... 8dcd7f7... M sound/soc/omap/omap-hdmi.c sound/soc/omap/omap-hdmi.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/sound/soc/omap/omap-hdmi.c b/sound/soc/omap/omap-hdmi.c index eb9c392..8dcd7f7 100644 --- a/sound/soc/omap/omap-hdmi.c +++ b/sound/soc/omap/omap-hdmi.c @@ -322,8 +322,9 @@ static int omap_hdmi_probe(struct platform_device *pdev) } dev_set_drvdata(&pdev->dev, hdmi_data); - ret = snd_soc_register_component(&pdev->dev, &omap_hdmi_component, - &omap_hdmi_dai, 1); + ret = devm_snd_soc_register_component(&pdev->dev, + &omap_hdmi_component, + &omap_hdmi_dai, 1); if (ret) return ret; @@ -335,8 +336,6 @@ static int omap_hdmi_remove(struct platform_device *pdev) { struct hdmi_priv *hdmi_data = dev_get_drvdata(&pdev->dev); - snd_soc_unregister_component(&pdev->dev); - if (hdmi_data == NULL) { dev_err(&pdev->dev, "cannot obtain HDMi data\n"); return -ENODEV; -- 1.7.10.4

2 2

Re: [alsa-devel] [PATCH] ALSA: Provide a CLOCK_MONOTONIC_RAW timestamp type
by Takashi Iwai 09 Jul '14

09 Jul '14

At Tue, 8 Jul 2014 16:51:49 +0200, Mark Brown wrote: > > From: Mark Brown <broonie(a)linaro.org> > > For applications which need to synchronise with external timebases such > as broadcast TV applications the kernel monotonic time is not optimal as > it includes adjustments from NTP and so may still include discontinuities > due to that. A raw monotonic time which does not include any adjustments > is available in the kernel from getrawmonotonic() so provide userspace with > a new timestamp type SNDRV_PCM_TSTAMP_TYPE_MONOTONIC_RAW which provides > timestamps based on this as an option. > > Reported-by: Daniel Thompson <daniel.thompson(a)linaro.org> > Signed-off-by: Mark Brown <broonie(a)linaro.org> > --- > > Mostly an RFC at this point as I don't have hardware to test this week. This looks good to me. Or, thinking of the original use case, should we just replace ktime_get_ts() with getrawmonotonic()? The MONOTONIC mode is really to be monotonic. While we're at it: there's been long-standing request from V4L guys for improving the timestamps to sync with video streams. I suggested to add a new mode that can be set by the driver. Worth to consider it, too? thanks, Takashi > > include/sound/pcm.h | 11 +++++++++-- > include/uapi/sound/asound.h | 3 ++- > sound/core/pcm_native.c | 12 +++++++++--- > 3 files changed, 20 insertions(+), 6 deletions(-) > > diff --git a/include/sound/pcm.h b/include/sound/pcm.h > index d854fb3..6f3e10c 100644 > --- a/include/sound/pcm.h > +++ b/include/sound/pcm.h > @@ -931,10 +931,17 @@ void snd_pcm_timer_done(struct snd_pcm_substream *substream); > static inline void snd_pcm_gettime(struct snd_pcm_runtime *runtime, > struct timespec *tv) > { > - if (runtime->tstamp_type == SNDRV_PCM_TSTAMP_TYPE_MONOTONIC) > + switch (runtime->tstamp_type) { > + case SNDRV_PCM_TSTAMP_TYPE_MONOTONIC: > ktime_get_ts(tv); > - else > + break; > + case SNDRV_PCM_TSTAMP_TYPE_MONOTONIC_RAW: > + getrawmonotonic(tv); > + break; > + default: > getnstimeofday(tv); > + break; > + } > } > > /* > diff --git a/include/uapi/sound/asound.h b/include/uapi/sound/asound.h > index 2249483..cbf7dc85 100644 > --- a/include/uapi/sound/asound.h > +++ b/include/uapi/sound/asound.h > @@ -462,7 +462,8 @@ struct snd_xfern { > enum { > SNDRV_PCM_TSTAMP_TYPE_GETTIMEOFDAY = 0, /* gettimeofday equivalent */ > SNDRV_PCM_TSTAMP_TYPE_MONOTONIC, /* posix_clock_monotonic equivalent */ > - SNDRV_PCM_TSTAMP_TYPE_LAST = SNDRV_PCM_TSTAMP_TYPE_MONOTONIC, > + SNDRV_PCM_TSTAMP_TYPE_MONOTONIC_RAW, /* monotonic_raw (no NTP) */ > + SNDRV_PCM_TSTAMP_TYPE_LAST = SNDRV_PCM_TSTAMP_TYPE_MONOTONIC_RAW, > }; > > /* channel positions */ > diff --git a/sound/core/pcm_native.c b/sound/core/pcm_native.c > index b653ab0..fd6d7a7 100644 > --- a/sound/core/pcm_native.c > +++ b/sound/core/pcm_native.c > @@ -2540,9 +2540,15 @@ static int snd_pcm_tstamp(struct snd_pcm_substream *substream, int __user *_arg) > return -EFAULT; > if (arg < 0 || arg > SNDRV_PCM_TSTAMP_TYPE_LAST) > return -EINVAL; > - runtime->tstamp_type = SNDRV_PCM_TSTAMP_TYPE_GETTIMEOFDAY; > - if (arg == SNDRV_PCM_TSTAMP_TYPE_MONOTONIC) > - runtime->tstamp_type = SNDRV_PCM_TSTAMP_TYPE_MONOTONIC; > + switch (runtime->tstamp_type) { > + case SNDRV_PCM_TSTAMP_TYPE_MONOTONIC: > + case SNDRV_PCM_TSTAMP_TYPE_MONOTONIC_RAW: > + runtime->tstamp_type = runtime->tstamp_type; > + break; > + default: > + runtime->tstamp_type = SNDRV_PCM_TSTAMP_TYPE_GETTIMEOFDAY; > + break; > + } > return 0; > } > > -- > 2.0.0 >

4 4

[alsa-devel] [PATCH] ASoC: s3c64xx/smartq: use dynamic registration
by Arnd Bergmann 09 Jul '14

09 Jul '14

As a prerequisite for moving s3c64xx into multiplatform configurations, we need to change the smartq audio driver to stop using hardcoded gpio numbers from the header file, and instead pass the gpio data through platform_data. In order to do that, we also move the code to use module_platform_driver and register the platform device using platform_device_register_data. Signed-off-by: Arnd Bergmann <arnd(a)arndb.de> Cc: Maurus Cuelenaere <mcuelenaere(a)gmail.com> Cc: Kukjin Kim <kgene.kim(a)samsung.com> --- arch/arm/mach-s3c64xx/mach-smartq.c | 10 +++++ sound/soc/samsung/smartq_wm8987.c | 73 ++++++++++++++----------------------- 2 files changed, 37 insertions(+), 46 deletions(-) diff --git a/arch/arm/mach-s3c64xx/mach-smartq.c b/arch/arm/mach-s3c64xx/mach-smartq.c index b3d1353..4c111f6 100644 --- a/arch/arm/mach-s3c64xx/mach-smartq.c +++ b/arch/arm/mach-s3c64xx/mach-smartq.c @@ -20,6 +20,7 @@ #include <linux/spi/spi_gpio.h> #include <linux/usb/gpio_vbus.h> #include <linux/platform_data/s3c-hsotg.h> +#include <linux/platform_data/asoc-s3c-smartq.h> #include <asm/mach-types.h> #include <asm/mach/map.h> @@ -379,6 +380,11 @@ void __init smartq_map_io(void) smartq_lcd_mode_set(); } +static const __initconst struct smartq_audio_pdata smartq_audio_pdata = { + .gpio_jack = S3C64XX_GPL(12), + .gpio_amp = S3C64XX_GPK(12), +}; + void __init smartq_machine_init(void) { s3c_i2c0_set_platdata(NULL); @@ -397,4 +403,8 @@ void __init smartq_machine_init(void) WARN_ON(smartq_wifi_init()); platform_add_devices(smartq_devices, ARRAY_SIZE(smartq_devices)); + + platform_device_register_data(NULL, "smartq-audio", -1, + &smartq_audio_pdata, + sizeof (smartq_audio_pdata)); } diff --git a/sound/soc/samsung/smartq_wm8987.c b/sound/soc/samsung/smartq_wm8987.c index 9b0ffac..8c4a0a2 100644 --- a/sound/soc/samsung/smartq_wm8987.c +++ b/sound/soc/samsung/smartq_wm8987.c @@ -19,8 +19,7 @@ #include <sound/soc.h> #include <sound/jack.h> -#include <mach/gpio-samsung.h> -#include <asm/mach-types.h> +#include <linux/platform_data/asoc-s3c-smartq.h> #include "i2s.h" #include "../codecs/wm8750.h" @@ -110,7 +109,7 @@ static struct snd_soc_jack_pin smartq_jack_pins[] = { static struct snd_soc_jack_gpio smartq_jack_gpios[] = { { - .gpio = S3C64XX_GPL(12), + .gpio = -1, .name = "headphone detect", .report = SND_JACK_HEADPHONE, .debounce_time = 200, @@ -127,7 +126,10 @@ static int smartq_speaker_event(struct snd_soc_dapm_widget *w, struct snd_kcontrol *k, int event) { - gpio_set_value(S3C64XX_GPK(12), SND_SOC_DAPM_EVENT_OFF(event)); + struct smartq_audio_pdata *pdata; + pdata = snd_soc_smartq.dev->platform_data; + + gpio_set_value(pdata->gpio_amp, SND_SOC_DAPM_EVENT_OFF(event)); return 0; } @@ -218,62 +220,41 @@ static struct snd_soc_card snd_soc_smartq = { .num_controls = ARRAY_SIZE(wm8987_smartq_controls), }; -static struct platform_device *smartq_snd_device; - -static int __init smartq_init(void) +static int smartq_probe(struct platform_device *pdev) { + struct smartq_audio_pdata *pdata = pdev->dev.platform_data; int ret; - if (!machine_is_smartq7() && !machine_is_smartq5()) { - pr_info("Only SmartQ is supported by this ASoC driver\n"); - return -ENODEV; - } - - smartq_snd_device = platform_device_alloc("soc-audio", -1); - if (!smartq_snd_device) - return -ENOMEM; - - platform_set_drvdata(smartq_snd_device, &snd_soc_smartq); - - ret = platform_device_add(smartq_snd_device); - if (ret) { - platform_device_put(smartq_snd_device); - return ret; - } + platform_set_drvdata(pdev, &snd_soc_smartq); /* Initialise GPIOs used by amplifiers */ - ret = gpio_request(S3C64XX_GPK(12), "amplifiers shutdown"); + ret = devm_gpio_request_one(&pdev->dev, pdata->gpio_amp, + GPIOF_DIR_OUT | GPIOF_INIT_HIGH, + "amplifiers shutdown"); if (ret) { - dev_err(&smartq_snd_device->dev, "Failed to register GPK12\n"); - goto err_unregister_device; + dev_err(&pdev->dev, "Failed to register GPK12\n"); + goto out; } - /* Disable amplifiers */ - ret = gpio_direction_output(S3C64XX_GPK(12), 1); - if (ret) { - dev_err(&smartq_snd_device->dev, "Failed to configure GPK12\n"); - goto err_free_gpio_amp_shut; - } + smartq_jack_gpios[0].gpio = pdata->gpio_jack; - return 0; - -err_free_gpio_amp_shut: - gpio_free(S3C64XX_GPK(12)); -err_unregister_device: - platform_device_unregister(smartq_snd_device); + ret = devm_snd_soc_register_card(&pdev->dev, &snd_soc_smartq); + if (ret) + dev_err(&pdev->dev, "Failed to register card\n"); +out: return ret; } -static void __exit smartq_exit(void) -{ - gpio_free(S3C64XX_GPK(12)); - - platform_device_unregister(smartq_snd_device); -} +static struct platform_driver smartq_driver = { + .driver = { + .name = "smartq-audio", + .owner = THIS_MODULE, + }, + .probe = smartq_probe, +}; -module_init(smartq_init); -module_exit(smartq_exit); +module_platform_driver(smartq_driver); /* Module information */ MODULE_AUTHOR("Maurus Cuelenaere <mcuelenaere(a)gmail.com>"); -- 1.8.3.2

2 1

[alsa-devel] [PATCH V2] ASoC: omap-dmic: Use devm_snd_soc_register_component
by Manish Badarkhe 09 Jul '14

09 Jul '14

Replaced snd_soc_register_component with its devres equivalent, devm_snd_soc_register_component. Signed-off-by: Manish Badarkhe <badarkhe.manish(a)gmail.com> --- Changes since V1: Aligned function parameter properly. :100644 100644 6925d71... f125eb9... M sound/soc/omap/omap-dmic.c sound/soc/omap/omap-dmic.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sound/soc/omap/omap-dmic.c b/sound/soc/omap/omap-dmic.c index 6925d71..f125eb9 100644 --- a/sound/soc/omap/omap-dmic.c +++ b/sound/soc/omap/omap-dmic.c @@ -490,8 +490,9 @@ static int asoc_dmic_probe(struct platform_device *pdev) } - ret = snd_soc_register_component(&pdev->dev, &omap_dmic_component, - &omap_dmic_dai, 1); + ret = devm_snd_soc_register_component(&pdev->dev, + &omap_dmic_component, + &omap_dmic_dai, 1); if (ret) goto err_put_clk; @@ -510,7 +511,6 @@ static int asoc_dmic_remove(struct platform_device *pdev) { struct omap_dmic *dmic = platform_get_drvdata(pdev); - snd_soc_unregister_component(&pdev->dev); clk_put(dmic->fclk); return 0; -- 1.7.10.4

3 2

[alsa-devel] [PATCH V2] ASoC: omap-mcbsp: Use devm_snd_soc_register_component
by Manish Badarkhe 09 Jul '14

09 Jul '14

Replaced snd_soc_register_component with its devres equivalent, devm_snd_soc_register_component. Signed-off-by: Manish Badarkhe <badarkhe.manish(a)gmail.com> --- Changes since V1: Aligned function parameter properly. :100644 100644 efe2cd6... bd3ef2a... M sound/soc/omap/omap-mcbsp.c sound/soc/omap/omap-mcbsp.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/sound/soc/omap/omap-mcbsp.c b/sound/soc/omap/omap-mcbsp.c index efe2cd6..bd3ef2a 100644 --- a/sound/soc/omap/omap-mcbsp.c +++ b/sound/soc/omap/omap-mcbsp.c @@ -805,8 +805,9 @@ static int asoc_mcbsp_probe(struct platform_device *pdev) if (ret) return ret; - ret = snd_soc_register_component(&pdev->dev, &omap_mcbsp_component, - &omap_mcbsp_dai, 1); + ret = devm_snd_soc_register_component(&pdev->dev, + &omap_mcbsp_component, + &omap_mcbsp_dai, 1); if (ret) return ret; @@ -817,8 +818,6 @@ static int asoc_mcbsp_remove(struct platform_device *pdev) { struct omap_mcbsp *mcbsp = platform_get_drvdata(pdev); - snd_soc_unregister_component(&pdev->dev); - if (mcbsp->pdata->ops && mcbsp->pdata->ops->free) mcbsp->pdata->ops->free(mcbsp->id); -- 1.7.10.4

3 2

[alsa-devel] [PATCH] ASoC: sgtl5000: Fix driver unbound
by Fabio Estevam 09 Jul '14

09 Jul '14

Using the sgtl5000 codec driver as a module and trying to remove it causes the followig kernel oops: root@freescale /$ rmmod snd-soc-imx-sgtl5000 [ 117.122920] ------------[ cut here ]------------ [ 117.127609] WARNING: CPU: 0 PID: 631 at drivers/regulator/core.c:3604 regula) [ 117.137046] Modules linked in: snd_soc_imx_sgtl5000(-) snd_soc_sgtl5000 evbug [ 117.144315] CPU: 0 PID: 631 Comm: rmmod Not tainted 3.16.0-rc3-next-201407043 [ 117.153366] Backtrace: [ 117.155865] [<80011e5c>] (dump_backtrace) from [<80011ff8>] (show_stack+0x18) [ 117.163484] r6:802fcc48 r5:00000000 r4:00000000 r3:00000000 [ 117.169228] [<80011fe0>] (show_stack) from [<80668cc0>] (dump_stack+0x88/0xa) [ 117.176508] [<80668c38>] (dump_stack) from [<80029a38>] (warn_slowpath_commo) [ 117.184696] r5:00000009 r4:00000000 [ 117.188322] [<800299c8>] (warn_slowpath_common) from [<80029a80>] (warn_slow) [ 117.197150] r8:dd60d600 r7:ddfa6d00 r6:dd5d9064 r5:dd5e0f90 r4:dd5d9400 [ 117.203983] [<80029a5c>] (warn_slowpath_null) from [<802fcc48>] (regulator_u) [ 117.212828] [<802fcb74>] (regulator_unregister) from [<7f0047c4>] (ldo_regul) [ 117.223475] r4:dd59e300 r3:dd5e0f90 [ 117.227100] [<7f00479c>] (ldo_regulator_remove [snd_soc_sgtl5000]) from [<7f) [ 117.238959] r4:dd5d8000 r3:ddd51420 [ 117.242623] [<7f0047dc>] (sgtl5000_remove [snd_soc_sgtl5000]) from [<804e5b1) [ 117.252489] r5:00000000 r4:dd5d8000 [ 117.256111] [<804e5af8>] (soc_remove_codec) from [<804e5ed4>] (soc_remove_da) [ 117.264933] r4:ddfb640c r3:00000000 [ 117.268555] [<804e5c10>] (soc_remove_dai_links) from [<804e5fbc>] (snd_soc_u) [ 117.277810] r10:80359e48 r9:dd684000 r8:dd5ca800 r7:dd685e60 r6:00000001 r5c [ 117.285761] r4:dd5d9064 [ 117.288329] [<804e5f28>] (snd_soc_unregister_card) from [<804f29f0>] (devm_c) [ 117.297324] r6:00000004 r5:ddd0fc10 r4:dd5a7980 r3:804f29dc [ 117.303095] [<804f29dc>] (devm_card_release) from [<8035a418>] (release_node) [ 117.311369] [<8035a2a8>] (release_nodes) from [<8035aab4>] (devres_release_a) [ 117.319583] r10:00000000 r9:dd684000 r8:8000ed64 r7:00000081 r6:ddd0fc44 r54 [ 117.327543] r4:ddd0fc10 [ 117.330108] [<8035aa7c>] (devres_release_all) from [<803571c8>] (__device_re) [ 117.339214] r4:ddd0fc10 r3:dd5d9010 [ 117.342989] [<80357148>] (__device_release_driver) from [<80357a48>] (driver) [ 117.351607] r5:7f00c9e4 r4:ddd0fc10 [ 117.355285] [<8035798c>] (driver_detach) from [<80357030>] (bus_remove_drive) [ 117.363454] r6:00000880 r5:00000000 r4:7f00c9e4 r3:dd6c3a80 [ 117.369195] [<80356fdc>] (bus_remove_driver) from [<803580b8>] (driver_unreg) [ 117.377683] r4:7f00c9e4 r3:dd60d480 [ 117.381305] [<80358088>] (driver_unregister) from [<80358bb4>] (platform_dri) [ 117.390642] r4:7f00ca28 r3:7f00c35c [ 117.394309] [<80358ba0>] (platform_driver_unregister) from [<7f00c370>] (imx) [ 117.406188] [<7f00c35c>] (imx_sgtl5000_driver_exit [snd_soc_imx_sgtl5000]) f) [ 117.417452] [<8008c2b8>] (SyS_delete_module) from [<8000eba0>] (ret_fast_sys) [ 117.425753] r6:5f636f73 r5:5f646e73 r4:00016f40 [ 117.430428] ---[ end trace 8fd8a5cb39e46d0e ]--- This problem is well explained by Russell King: "The sgtl5000 uses a two-stage initialisation process. The first stage is when the platform driver is probed, where some resources are found and initialised. The second stage is via the codec driver's probe function, where regulators are found and initialised using the managed resource support. The problem here is that this works fine until the codec driver is unbound. When this occurs, sgtl5000_remove() is called which is a no-op as far as the managed resource code is concerned. The regulators remain allocated, and their pointers in sgtl5000_priv remain valid. If the codec is now re-probed, it will again try and find the regulators, which will now be busy. This will fail. That's not the only problem - if using the LDO regulator, the regulator is unregistered from the regulator core code, but it still has a user. When the user is cleaned up (eg, by removing the module) it hits the free'd regulator, and this can oops the kernel. This bug was originally introduced by 63e54cd9caa3ce ("ASoC: sgtl5000: Use devm_regulator_bulk_get()")." This reverts commit 63e54cd9caa3ce. Tested on a imx53-qsb board. Reported-by: Russell King <rmk+kernel(a)arm.linux.org.uk> Signed-off-by: Fabio Estevam <fabio.estevam(a)freescale.com> --- sound/soc/codecs/sgtl5000.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/sound/soc/codecs/sgtl5000.c b/sound/soc/codecs/sgtl5000.c index 249fadb..d739f83 100644 --- a/sound/soc/codecs/sgtl5000.c +++ b/sound/soc/codecs/sgtl5000.c @@ -1275,7 +1275,7 @@ static int sgtl5000_enable_regulators(struct snd_soc_codec *codec) return ret; } - ret = devm_regulator_bulk_get(codec->dev, ARRAY_SIZE(sgtl5000->supplies), + ret = regulator_bulk_get(codec->dev, ARRAY_SIZE(sgtl5000->supplies), sgtl5000->supplies); if (ret) goto err_ldo_remove; @@ -1283,13 +1283,16 @@ static int sgtl5000_enable_regulators(struct snd_soc_codec *codec) ret = regulator_bulk_enable(ARRAY_SIZE(sgtl5000->supplies), sgtl5000->supplies); if (ret) - goto err_ldo_remove; + goto err_regulator_free; /* wait for all power rails bring up */ udelay(10); return 0; +err_regulator_free: + regulator_bulk_free(ARRAY_SIZE(sgtl5000->supplies), + sgtl5000->supplies); err_ldo_remove: if (!external_vddd) ldo_regulator_remove(codec); @@ -1359,6 +1362,8 @@ static int sgtl5000_probe(struct snd_soc_codec *codec) err: regulator_bulk_disable(ARRAY_SIZE(sgtl5000->supplies), sgtl5000->supplies); + regulator_bulk_free(ARRAY_SIZE(sgtl5000->supplies), + sgtl5000->supplies); ldo_regulator_remove(codec); return ret; @@ -1372,6 +1377,8 @@ static int sgtl5000_remove(struct snd_soc_codec *codec) regulator_bulk_disable(ARRAY_SIZE(sgtl5000->supplies), sgtl5000->supplies); + regulator_bulk_free(ARRAY_SIZE(sgtl5000->supplies), + sgtl5000->supplies); ldo_regulator_remove(codec); return 0; -- 1.8.3.2

2 1

[alsa-devel] [PATCH] ASoC: sgtl5000: Use devm_ functions
by Himangi Saraogi 09 Jul '14

09 Jul '14

This patch introduces the use of managed interfaces like devm_kzalloc, devm_kstrdup and devm_regulator_register and does avay with the calls to the functions to free the allocated memory in ldo_regulator_register and ldo_regulator_remove. The ldo_regulator_remove function is completely removed as it is no longer required. ldo_regulator_register is called from a probe function and on failure its value is returned as the result. Signed-off-by: Himangi Saraogi <himangi774(a)gmail.com> --- To send to: Liam Girdwood <lgirdwood(a)gmail.com>,Mark Brown <broonie(a)kernel.org>,Jaroslav Kysela <perex(a)perex.cz>,Takashi Iwai <tiwai(a)suse.de>,alsa-devel@alsa-project.org,linux-kernel@vger.kernel.org sound/soc/codecs/sgtl5000.c | 46 +++++++-------------------------------------- 1 file changed, 7 insertions(+), 39 deletions(-) diff --git a/sound/soc/codecs/sgtl5000.c b/sound/soc/codecs/sgtl5000.c index 249fadb..0efd6d6 100644 --- a/sound/soc/codecs/sgtl5000.c +++ b/sound/soc/codecs/sgtl5000.c @@ -841,14 +841,15 @@ static int ldo_regulator_register(struct snd_soc_codec *codec, struct sgtl5000_priv *sgtl5000 = snd_soc_codec_get_drvdata(codec); struct regulator_config config = { }; - ldo = kzalloc(sizeof(struct ldo_regulator), GFP_KERNEL); + ldo = devm_kzalloc(codec->dev, sizeof(struct ldo_regulator), + GFP_KERNEL); if (!ldo) return -ENOMEM; - ldo->desc.name = kstrdup(dev_name(codec->dev), GFP_KERNEL); + ldo->desc.name = devm_kstrdup(codec->dev, dev_name(codec->dev), + GFP_KERNEL); if (!ldo->desc.name) { - kfree(ldo); dev_err(codec->dev, "failed to allocate decs name memory\n"); return -ENOMEM; } @@ -865,35 +866,17 @@ static int ldo_regulator_register(struct snd_soc_codec *codec, config.driver_data = ldo; config.init_data = init_data; - ldo->dev = regulator_register(&ldo->desc, &config); + ldo->dev = devm_regulator_register(codec->dev, &ldo->desc, &config); if (IS_ERR(ldo->dev)) { int ret = PTR_ERR(ldo->dev); dev_err(codec->dev, "failed to register regulator\n"); - kfree(ldo->desc.name); - kfree(ldo); - return ret; } sgtl5000->ldo = ldo; return 0; } - -static int ldo_regulator_remove(struct snd_soc_codec *codec) -{ - struct sgtl5000_priv *sgtl5000 = snd_soc_codec_get_drvdata(codec); - struct ldo_regulator *ldo = sgtl5000->ldo; - - if (!ldo) - return 0; - - regulator_unregister(ldo->dev); - kfree(ldo->desc.name); - kfree(ldo); - - return 0; -} #else static int ldo_regulator_register(struct snd_soc_codec *codec, struct regulator_init_data *init_data, @@ -902,11 +885,6 @@ static int ldo_regulator_register(struct snd_soc_codec *codec, dev_err(codec->dev, "this setup needs regulator support in the kernel\n"); return -EINVAL; } - -static int ldo_regulator_remove(struct snd_soc_codec *codec) -{ - return 0; -} #endif /* @@ -1278,23 +1256,17 @@ static int sgtl5000_enable_regulators(struct snd_soc_codec *codec) ret = devm_regulator_bulk_get(codec->dev, ARRAY_SIZE(sgtl5000->supplies), sgtl5000->supplies); if (ret) - goto err_ldo_remove; + return ret; ret = regulator_bulk_enable(ARRAY_SIZE(sgtl5000->supplies), sgtl5000->supplies); if (ret) - goto err_ldo_remove; + return ret; /* wait for all power rails bring up */ udelay(10); return 0; - -err_ldo_remove: - if (!external_vddd) - ldo_regulator_remove(codec); - return ret; - } static int sgtl5000_probe(struct snd_soc_codec *codec) @@ -1359,8 +1331,6 @@ static int sgtl5000_probe(struct snd_soc_codec *codec) err: regulator_bulk_disable(ARRAY_SIZE(sgtl5000->supplies), sgtl5000->supplies); - ldo_regulator_remove(codec); - return ret; } @@ -1372,8 +1342,6 @@ static int sgtl5000_remove(struct snd_soc_codec *codec) regulator_bulk_disable(ARRAY_SIZE(sgtl5000->supplies), sgtl5000->supplies); - ldo_regulator_remove(codec); - return 0; } -- 1.9.1

5 11