From: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date: Wed, 9 May 2012 18:24:39 +0000 (+0100)
Subject: ASoC: wm8994: Use regmap directly for wm8994_mic_work
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=fdfc4f3eb796896133a4dbcb1c1f94ff02274649;p=GitHub%2FLineageOS%2Fandroid_kernel_samsung_universal7580.git

ASoC: wm8994: Use regmap directly for wm8994_mic_work

Make it clearer what context we're operating in.

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
---

diff --git a/sound/soc/codecs/wm8994.c b/sound/soc/codecs/wm8994.c
index 54512880e19..50003b33772 100644
--- a/sound/soc/codecs/wm8994.c
+++ b/sound/soc/codecs/wm8994.c
@@ -3064,18 +3064,20 @@ static void wm8994_mic_work(struct work_struct *work)
 	struct wm8994_priv *priv = container_of(work,
 						struct wm8994_priv,
 						mic_work.work);
-	struct snd_soc_codec *codec = priv->codec;
-	int reg;
+	struct regmap *regmap = priv->wm8994->regmap;
+	struct device *dev = priv->wm8994->dev;
+	unsigned int reg;
+	int ret;
 	int report;
 
-	reg = snd_soc_read(codec, WM8994_INTERRUPT_RAW_STATUS_2);
-	if (reg < 0) {
-		dev_err(codec->dev, "Failed to read microphone status: %d\n",
-			reg);
+	ret = regmap_read(regmap, WM8994_INTERRUPT_RAW_STATUS_2, &reg);
+	if (ret < 0) {
+		dev_err(dev, "Failed to read microphone status: %d\n",
+			ret);
 		return;
 	}
 
-	dev_dbg(codec->dev, "Microphone status: %x\n", reg);
+	dev_dbg(dev, "Microphone status: %x\n", reg);
 
 	report = 0;
 	if (reg & WM8994_MIC1_DET_STS) {