public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
From: Lars-Peter Clausen <lars@metafoo.de>
To: Charles Keepax <ckeepax@opensource.wolfsonmicro.com>
Cc: broonie@kernel.org, myungjoo.ham@samsung.com,
	cw00.choi@samsung.com, dmitry.torokhov@gmail.com,
	lgirdwood@gmail.com, peter.ujfalusi@ti.com,
	jarkko.nikula@bitmer.com, eric.y.miao@gmail.com,
	haojian.zhuang@gmail.com, linux-kernel@vger.kernel.org,
	patches@opensource.wolfsonmicro.com, alsa-devel@alsa-project.org,
	linux@arm.linux.org.uk
Subject: Re: [PATCH 02/15] ASoC: dapm: Add locked version of snd_soc_dapm_xxxx_pin functions
Date: Mon, 17 Feb 2014 18:06:03 +0100	[thread overview]
Message-ID: <5302417B.3070408@metafoo.de> (raw)
In-Reply-To: <1392655903-24537-3-git-send-email-ckeepax@opensource.wolfsonmicro.com>

[...]
> +int snd_soc_dapm_enable_pin_locked(struct snd_soc_dapm_context *dapm,
> +				   const char *pin)
> +{
> +	return snd_soc_dapm_set_pin(dapm, pin, 1);
> +}
> +EXPORT_SYMBOL_GPL(snd_soc_dapm_enable_pin_locked);
> +
> +/**
>    * snd_soc_dapm_enable_pin - enable pin.
>    * @dapm: DAPM context
>    * @pin: pin name
>    *
>    * Enables input/output pin and its parents or children widgets iff there is
>    * a valid audio route and active audio stream.
> + *
>    * NOTE: snd_soc_dapm_sync() needs to be called after this for DAPM to
>    * do any widget power switching.
>    */
>   int snd_soc_dapm_enable_pin(struct snd_soc_dapm_context *dapm, const char *pin)
>   {
> -	return snd_soc_dapm_set_pin(dapm, pin, 1);
> +	int ret;
> +
> +	mutex_lock_nested(&dapm->card->dapm_mutex, SND_SOC_DAPM_CLASS_RUNTIME);
> +
> +	ret = snd_soc_dapm_set_pin(dapm, pin, 1);
> +
> +	mutex_unlock(&dapm->card->dapm_mutex);
> +
> +	return ret;
>   }

Hm, this is a bit confusing. For other functions in ASoC when we have a pair 
of functions with the _locked suffix and without the one with _locked takes 
the lock, the other one doesn't. E.g. snd_soc_update_bits_locked. Here we do 
it the other way around.

- Lars


  reply	other threads:[~2014-02-17 17:06 UTC|newest]

Thread overview: 25+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-02-17 16:51 [PATCH 00/15] Update locking for snd_soc_dapm_xxxx_pin functions Charles Keepax
2014-02-17 16:51 ` [PATCH 01/15] Input - arizona-haptics: Fix double lock of dapm_mutex Charles Keepax
2014-02-17 19:20   ` Dmitry Torokhov
2014-02-18  0:28     ` Mark Brown
2014-02-18 14:53     ` [alsa-devel] " Charles Keepax
2014-02-17 16:51 ` [PATCH 02/15] ASoC: dapm: Add locked version of snd_soc_dapm_xxxx_pin functions Charles Keepax
2014-02-17 17:06   ` Lars-Peter Clausen [this message]
2014-02-18  0:30     ` Mark Brown
2014-02-18  9:04       ` [alsa-devel] " Charles Keepax
2014-02-17 16:51 ` [PATCH 03/15] ASoC: adav80x: Update locking around use of DAPM pin API Charles Keepax
2014-02-18  0:33   ` Mark Brown
2014-02-17 16:51 ` [PATCH 04/15] ASoC: wm5100: " Charles Keepax
2014-02-18  0:47   ` Mark Brown
2014-02-18  9:24     ` [alsa-devel] " Charles Keepax
2014-02-17 16:51 ` [PATCH 05/15] ASoC: wm8962: " Charles Keepax
2014-02-17 16:51 ` [PATCH 06/15] ASoC: wm8994: " Charles Keepax
2014-02-17 16:51 ` [PATCH 07/15] ASoC: wm8996: " Charles Keepax
2014-02-17 16:51 ` [PATCH 08/15] ASoC: mfld_machine: " Charles Keepax
2014-02-17 16:51 ` [PATCH 09/15] ASoC: ams-delta: " Charles Keepax
2014-02-17 16:51 ` [PATCH 10/15] ASoC: omap: n810: " Charles Keepax
2014-02-17 16:51 ` [PATCH 11/15] ASoC: omap: rx51: " Charles Keepax
2014-02-17 16:51 ` [PATCH 12/15] ASoC: pxa: corgi: " Charles Keepax
2014-02-17 16:51 ` [PATCH 13/15] ASoC: pxa: magician: " Charles Keepax
2014-02-17 16:51 ` [PATCH 14/15] ASoC: pxa: spitz: " Charles Keepax
2014-02-17 16:51 ` [PATCH 15/15] ASoC: pxa: tosa: " Charles Keepax

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=5302417B.3070408@metafoo.de \
    --to=lars@metafoo.de \
    --cc=alsa-devel@alsa-project.org \
    --cc=broonie@kernel.org \
    --cc=ckeepax@opensource.wolfsonmicro.com \
    --cc=cw00.choi@samsung.com \
    --cc=dmitry.torokhov@gmail.com \
    --cc=eric.y.miao@gmail.com \
    --cc=haojian.zhuang@gmail.com \
    --cc=jarkko.nikula@bitmer.com \
    --cc=lgirdwood@gmail.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux@arm.linux.org.uk \
    --cc=myungjoo.ham@samsung.com \
    --cc=patches@opensource.wolfsonmicro.com \
    --cc=peter.ujfalusi@ti.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox