Skip to content

Commit

Permalink
Revert "mfd: wm5102: Manually apply register patch"
Browse files Browse the repository at this point in the history
This reverts commit d9d0349.

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

commit 4c9bb8b
mfd: wm5102: Manually apply register patch

commit d9d0349
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>
  • Loading branch information
Charles Keepax authored and Lee Jones committed Sep 26, 2014
1 parent f0933a6 commit 7be180c
Showing 1 changed file with 0 additions and 12 deletions.
12 changes: 0 additions & 12 deletions drivers/mfd/arizona-core.c
Original file line number Diff line number Diff line change
Expand Up @@ -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");
Expand Down

0 comments on commit 7be180c

Please sign in to comment.