diff options
| author | Charles Keepax <ckeepax@opensource.wolfsonmicro.com> | 2014-09-24 13:37:10 +0400 |
|---|---|---|
| committer | Lee Jones <lee.jones@linaro.org> | 2014-09-26 11:24:04 +0400 |
| commit | 7be180cc7a0c5768a984126d9468afc82dcf93a2 (patch) | |
| tree | 2682e37064c791262d33114d21feb01f970fd553 /drivers/mfd | |
| parent | f0933a60d1902c918249d11fb6d9a5ffd581ef5b (diff) | |
| download | linux-7be180cc7a0c5768a984126d9468afc82dcf93a2.tar.xz | |
Revert "mfd: wm5102: Manually apply register patch"
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>
Diffstat (limited to 'drivers/mfd')
| -rw-r--r-- | drivers/mfd/arizona-core.c | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/drivers/mfd/arizona-core.c b/drivers/mfd/arizona-core.c index 4afb232b5cde..72b3202c6674 100644 --- a/drivers/mfd/arizona-core.c +++ b/drivers/mfd/arizona-core.c @@ -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"); |