Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1532436

[PATCH V2 3/5] regulator: arizona-micsupp: Use SoC component pin control functions

Show all headers | View raw

The name of a codec pin can have an optional prefix string, which is
defined by the SoC machine driver. The snd_soc_dapm_x_pin functions
take the fully-specified name including the prefix and so the existing
code would fail to find the pin if the audio machine driver had added
a prefix.

Switch to using the snd_soc_component_x_pin equivalent functions that
take a specified SoC component and automatically add the name prefix to
the provided pin name.

Signed-off-by: Richard Fitzgerald <rf@opensource.wolfsonmicro.com>
---
 drivers/regulator/arizona-micsupp.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/drivers/regulator/arizona-micsupp.c b/drivers/regulator/arizona-micsupp.c
index fcb98db..1439462 100644
--- a/drivers/regulator/arizona-micsupp.c
+++ b/drivers/regulator/arizona-micsupp.c
@@ -45,6 +45,7 @@ static void arizona_micsupp_check_cp(struct work_struct *work)
 	struct arizona_micsupp *micsupp =
 		container_of(work, struct arizona_micsupp, check_cp_work);
 	struct snd_soc_dapm_context *dapm = micsupp->arizona->dapm;
+	struct snd_soc_component *component = snd_soc_dapm_to_component(dapm);
 	struct arizona *arizona = micsupp->arizona;
 	struct regmap *regmap = arizona->regmap;
 	unsigned int reg;
@@ -59,9 +60,10 @@ static void arizona_micsupp_check_cp(struct work_struct *work)
 	if (dapm) {
 		if ((reg & (ARIZONA_CPMIC_ENA | ARIZONA_CPMIC_BYPASS)) ==
 		    ARIZONA_CPMIC_ENA)
-			snd_soc_dapm_force_enable_pin(dapm, "MICSUPP");
+			snd_soc_component_force_enable_pin(component,
+							   "MICSUPP");
 		else
-			snd_soc_dapm_disable_pin(dapm, "MICSUPP");
+			snd_soc_component_disable_pin(component, "MICSUPP");
 
 		snd_soc_dapm_sync(dapm);
 	}
-- 
1.9.1

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[PATCH V2 0/5] ASoC/arizona: Ensure pin searches use widget name prefix Richard Fitzgerald <rf@opensource.wolfsonmicro.com> - 2016-11-29 16:50 +0100
  [PATCH V2 3/5] regulator: arizona-micsupp: Use SoC component pin control functions Richard Fitzgerald <rf@opensource.wolfsonmicro.com> - 2016-11-29 16:50 +0100
  [PATCH V2 1/5] ASoC: core: Add component pin control functions Richard Fitzgerald <rf@opensource.wolfsonmicro.com> - 2016-11-29 16:50 +0100
    Applied "ASoC: core: Add component pin control functions" to the asoc tree Mark Brown <broonie@kernel.org> - 2016-11-30 18:20 +0100
  [PATCH V2 5/5] Input: arizona-haptics - Use SoC component pin control functions Richard Fitzgerald <rf@opensource.wolfsonmicro.com> - 2016-11-29 16:50 +0100
    Re: [PATCH V2 5/5] Input: arizona-haptics - Use SoC component pin  control functions Dmitry Torokhov <dmitry.torokhov@gmail.com> - 2016-11-30 02:50 +0100
      Re: [PATCH V2 5/5] Input: arizona-haptics - Use SoC component pin  control functions Mark Brown <broonie@kernel.org> - 2016-11-30 18:30 +0100
        Re: [PATCH V2 5/5] Input: arizona-haptics - Use SoC component pin  control functions Dmitry Torokhov <dmitry.torokhov@gmail.com> - 2016-11-30 19:40 +0100
  [PATCH V2 2/5] ASoC: arizona: Use component pin control functions Richard Fitzgerald <rf@opensource.wolfsonmicro.com> - 2016-11-29 16:50 +0100
    Applied "ASoC: arizona: Use component pin control functions" to the asoc tree Mark Brown <broonie@kernel.org> - 2016-11-30 19:10 +0100

csiph-web