ASoC: Drop unnecessary bias level check on resume

Commit Message

Lars-Peter Clausen May 15, 2015, 10:41 a.m. UTC

The suspended flag will only be set if the CODEC bias level was either
STANDBY or OFF. This means we don't need to check for that on resume since
the condition will always be true.

Signed-off-by: Lars-Peter Clausen <[e-mail]>
---
 sound/soc/soc-core.c | 19 +++----------------
 1 file changed, 3 insertions(+), 16 deletions(-)

Comments

Mark Brown May 15, 2015, 3:50 p.m. UTC | #1

On Fri, May 15, 2015 at 12:41:30PM +0200, Lars-Peter Clausen wrote:
> The suspended flag will only be set if the CODEC bias level was either
> STANDBY or OFF. This means we don't need to check for that on resume since
> the condition will always be true.

Applied, thanks.  I've got a feeling that's bitrot and wasn't always
true...

Patch

diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c
index 2373252..95b5f03 100644
--- a/sound/soc/soc-core.c
+++ b/sound/soc/soc-core.c
@@ -750,23 +750,10 @@  static void soc_resume_deferred(struct work_struct *work)
 	}
 
 	list_for_each_entry(codec, &card->codec_dev_list, card_list) {
-		/* If the CODEC was idle over suspend then it will have been
-		 * left with bias OFF or STANDBY and suspended so we must now
-		 * resume.  Otherwise the suspend was suppressed.
-		 */
 		if (codec->suspended) {
-			switch (codec->dapm.bias_level) {
-			case SND_SOC_BIAS_STANDBY:
-			case SND_SOC_BIAS_OFF:
-				if (codec->driver->resume)
-					codec->driver->resume(codec);
-				codec->suspended = 0;
-				break;
-			default:
-				dev_dbg(codec->dev,
-					"ASoC: CODEC was on over suspend\n");
-				break;
-			}
+			if (codec->driver->resume)
+				codec->driver->resume(codec);
+			codec->suspended = 0;
 		}
 	}