Revert "mfd: wm5102: Manually apply register patch"
authorCharles Keepax <ckeepax@opensource.wolfsonmicro.com>
Wed, 24 Sep 2014 09:37:10 +0000 (10:37 +0100)
committerLee Jones <lee.jones@linaro.org>
Fri, 26 Sep 2014 07:24:04 +0000 (08:24 +0100)
This reverts commit d9d03496f6f904a3588bdb8b215853bc4e50132c.

It seems this commit was applied twice, once through ASoC and once
through MFD:

commit 4c9bb8bc352a14c9613c77bc3f1e9038cd086b9b
mfd: wm5102: Manually apply register patch

commit d9d03496f6f904a3588bdb8b215853bc4e50132c
mfd: wm5102: Manually apply register patch

This has lead to a small piece of duplicate code. It is harmless hence
how it has gone unoticed for so long. This patch reverts one of the two
commits removing the unneeded code.

Signed-off-by: Charles Keepax <ckeepax@opensource.wolfsonmicro.com>
Signed-off-by: Lee Jones <lee.jones@linaro.org>
drivers/mfd/arizona-core.c

index 4afb232b5cdef6c2462ec2b65db6359a8626f2e1..72b3202c66745f230f45c14f1c5f4ba8ec08f7de 100644 (file)
@@ -393,18 +393,6 @@ static int arizona_runtime_resume(struct device *dev)
                break;
        }
 
-       switch (arizona->type) {
-       case WM5102:
-               ret = wm5102_patch(arizona);
-               if (ret != 0) {
-                       dev_err(arizona->dev, "Failed to apply patch: %d\n",
-                               ret);
-                       goto err;
-               }
-       default:
-               break;
-       }
-
        ret = regcache_sync(arizona->regmap);
        if (ret != 0) {
                dev_err(arizona->dev, "Failed to restore register cache\n");