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

Groups > linux.kernel > #1532438

[PATCH V2 5/5] Input: arizona-haptics - 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/input/misc/arizona-haptics.c | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/drivers/input/misc/arizona-haptics.c b/drivers/input/misc/arizona-haptics.c
index 9829363..07ec465 100644
--- a/drivers/input/misc/arizona-haptics.c
+++ b/drivers/input/misc/arizona-haptics.c
@@ -37,6 +37,8 @@ static void arizona_haptics_work(struct work_struct *work)
 						       struct arizona_haptics,
 						       work);
 	struct arizona *arizona = haptics->arizona;
+	struct snd_soc_component *component =
+		snd_soc_dapm_to_component(arizona->dapm);
 	int ret;
 
 	if (!haptics->arizona->dapm) {
@@ -66,7 +68,7 @@ static void arizona_haptics_work(struct work_struct *work)
 			return;
 		}
 
-		ret = snd_soc_dapm_enable_pin(arizona->dapm, "HAPTICS");
+		ret = snd_soc_component_enable_pin(component, "HAPTICS");
 		if (ret != 0) {
 			dev_err(arizona->dev, "Failed to start HAPTICS: %d\n",
 				ret);
@@ -81,7 +83,7 @@ static void arizona_haptics_work(struct work_struct *work)
 		}
 	} else {
 		/* This disable sequence will be a noop if already enabled */
-		ret = snd_soc_dapm_disable_pin(arizona->dapm, "HAPTICS");
+		ret = snd_soc_component_disable_pin(component, "HAPTICS");
 		if (ret != 0) {
 			dev_err(arizona->dev, "Failed to disable HAPTICS: %d\n",
 				ret);
@@ -140,11 +142,14 @@ static int arizona_haptics_play(struct input_dev *input, void *data,
 static void arizona_haptics_close(struct input_dev *input)
 {
 	struct arizona_haptics *haptics = input_get_drvdata(input);
+	struct snd_soc_component *component;
 
 	cancel_work_sync(&haptics->work);
 
-	if (haptics->arizona->dapm)
-		snd_soc_dapm_disable_pin(haptics->arizona->dapm, "HAPTICS");
+	if (haptics->arizona->dapm) {
+		component = snd_soc_dapm_to_component(haptics->arizona->dapm);
+		snd_soc_component_disable_pin(component, "HAPTICS");
+	}
 }
 
 static int arizona_haptics_probe(struct platform_device *pdev)
-- 
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