ASoC: wm8994: Use regmap directly for wm8994_mic_work
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Wed, 9 May 2012 18:24:39 +0000 (19:24 +0100)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Wed, 9 May 2012 18:32:44 +0000 (19:32 +0100)
Make it clearer what context we're operating in.

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
sound/soc/codecs/wm8994.c

index 5451288..50003b3 100644 (file)
@@ -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) {