Commit 7be180cc authored Sep 24, 2014 by Charles Keepax Committed by Lee Jones Sep 26, 2014

Revert "mfd: wm5102: Manually apply register patch"



This reverts commit d9d03496.

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

commit 4c9bb8bc
mfd: wm5102: Manually apply register patch

commit d9d03496
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>

parent f0933a60

drivers/mfd/arizona-core.c

+0 −12

Original line number	Original line	Diff line number	Diff line
	@@ -393,18 +393,6 @@ static int arizona_runtime_resume(struct device *dev)
	break;		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);		ret = regcache_sync(arizona->regmap);
	if (ret != 0) {		if (ret != 0) {
	dev_err(arizona->dev, "Failed to restore register cache\n");		dev_err(arizona->dev, "Failed to restore register cache\n");