From 9fe5d86f392c1d1d9fb99568e794d91aca9ec968 Mon Sep 17 00:00:00 2001 From: Mark Brown Date: Wed, 1 Jun 2011 19:17:02 +0100 Subject: [PATCH] --- yaml --- r: 257483 b: refs/heads/master c: cf4a39105ab7d73583f142c492f2880247f520f9 h: refs/heads/master i: 257481: ae62b9d409f0fa0b5a3ece477059d672fd2c5dea 257479: bae11ca03f4ed98ab93c3cf945a824f564e8976d v: v3 --- [refs] | 2 +- trunk/sound/soc/codecs/wm8915.c | 8 +------- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/[refs] b/[refs] index d446be2d26a6..f8728f224451 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a2dc56c8a0009ba3879a26dfe416fc453fa2e32f +refs/heads/master: cf4a39105ab7d73583f142c492f2880247f520f9 diff --git a/trunk/sound/soc/codecs/wm8915.c b/trunk/sound/soc/codecs/wm8915.c index bb1ff2c25eb0..5ff6a773c8fb 100644 --- a/trunk/sound/soc/codecs/wm8915.c +++ b/trunk/sound/soc/codecs/wm8915.c @@ -41,14 +41,12 @@ #define HPOUT2L 4 #define HPOUT2R 8 -#define WM8915_NUM_SUPPLIES 6 +#define WM8915_NUM_SUPPLIES 4 static const char *wm8915_supply_names[WM8915_NUM_SUPPLIES] = { - "DCVDD", "DBVDD", "AVDD1", "AVDD2", "CPVDD", - "MICVDD", }; struct wm8915_priv { @@ -113,8 +111,6 @@ WM8915_REGULATOR_EVENT(0) WM8915_REGULATOR_EVENT(1) WM8915_REGULATOR_EVENT(2) WM8915_REGULATOR_EVENT(3) -WM8915_REGULATOR_EVENT(4) -WM8915_REGULATOR_EVENT(5) static const u16 wm8915_reg[WM8915_MAX_REGISTER] = { [WM8915_SOFTWARE_RESET] = 0x8915, @@ -2495,8 +2491,6 @@ static int wm8915_probe(struct snd_soc_codec *codec) wm8915->disable_nb[1].notifier_call = wm8915_regulator_event_1; wm8915->disable_nb[2].notifier_call = wm8915_regulator_event_2; wm8915->disable_nb[3].notifier_call = wm8915_regulator_event_3; - wm8915->disable_nb[4].notifier_call = wm8915_regulator_event_4; - wm8915->disable_nb[5].notifier_call = wm8915_regulator_event_5; /* This should really be moved into the regulator core */ for (i = 0; i < ARRAY_SIZE(wm8915->supplies); i++) {