From 754376f046de05c364cb70e5b5344bdc28666cea Mon Sep 17 00:00:00 2001 From: Mark Brown Date: Tue, 27 Nov 2012 15:23:30 +0000 Subject: [PATCH] --- yaml --- r: 345040 b: refs/heads/master c: d54e17f9f1d14706e6df1d5509e7eb5878bcd766 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/mfd/wm8994-core.c | 18 ++++-------------- 2 files changed, 5 insertions(+), 15 deletions(-) diff --git a/[refs] b/[refs] index a924c2b21d4f..ba2be8a07854 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 64cdfe256aae6d43d472331ba03bd4ccbfcb1abb +refs/heads/master: d54e17f9f1d14706e6df1d5509e7eb5878bcd766 diff --git a/trunk/drivers/mfd/wm8994-core.c b/trunk/drivers/mfd/wm8994-core.c index f1ac2888d488..be1a424cbdeb 100644 --- a/trunk/drivers/mfd/wm8994-core.c +++ b/trunk/drivers/mfd/wm8994-core.c @@ -529,11 +529,10 @@ static __devinit int wm8994_device_init(struct wm8994 *wm8994, int irq) break; case 2: case 3: + default: regmap_patch = wm8994_revc_patch; patch_regs = ARRAY_SIZE(wm8994_revc_patch); break; - default: - break; } break; @@ -552,18 +551,9 @@ static __devinit int wm8994_device_init(struct wm8994 *wm8994, int irq) /* Revision C did not change the relevant layer */ if (wm8994->revision > 1) wm8994->revision++; - switch (wm8994->revision) { - case 0: - case 1: - case 2: - case 3: - case 4: - regmap_patch = wm1811_reva_patch; - patch_regs = ARRAY_SIZE(wm1811_reva_patch); - break; - default: - break; - } + + regmap_patch = wm1811_reva_patch; + patch_regs = ARRAY_SIZE(wm1811_reva_patch); break; default: