]> git.karo-electronics.de Git - linux-beck.git/commitdiff
ASoC: Move bias level update to the core
authorLars-Peter Clausen <lars@metafoo.de>
Mon, 27 Apr 2015 20:13:25 +0000 (22:13 +0200)
committerMark Brown <broonie@kernel.org>
Mon, 27 Apr 2015 20:34:45 +0000 (21:34 +0100)
All drivers have the same line at the end of the set_bias_level callback to
update the bias_level state. Move this update into
snd_soc_dapm_force_bias_level() and remove them from the drivers.

Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
Signed-off-by: Mark Brown <broonie@kernel.org>
98 files changed:
sound/soc/codecs/88pm860x-codec.c
sound/soc/codecs/adau1373.c
sound/soc/codecs/adau1701.c
sound/soc/codecs/adau1761.c
sound/soc/codecs/adau1781.c
sound/soc/codecs/adau1977.c
sound/soc/codecs/adav80x.c
sound/soc/codecs/ak4535.c
sound/soc/codecs/ak4641.c
sound/soc/codecs/ak4642.c
sound/soc/codecs/ak4671.c
sound/soc/codecs/alc5623.c
sound/soc/codecs/alc5632.c
sound/soc/codecs/cq93vc.c
sound/soc/codecs/cs4265.c
sound/soc/codecs/cs42l52.c
sound/soc/codecs/cs42l56.c
sound/soc/codecs/cs42l73.c
sound/soc/codecs/cx20442.c
sound/soc/codecs/da7213.c
sound/soc/codecs/da732x.c
sound/soc/codecs/da9055.c
sound/soc/codecs/es8328.c
sound/soc/codecs/isabelle.c
sound/soc/codecs/jz4740.c
sound/soc/codecs/lm4857.c
sound/soc/codecs/lm49453.c
sound/soc/codecs/max98088.c
sound/soc/codecs/max98090.c
sound/soc/codecs/max98095.c
sound/soc/codecs/max9850.c
sound/soc/codecs/ml26124.c
sound/soc/codecs/pcm512x.c
sound/soc/codecs/rt286.c
sound/soc/codecs/rt5631.c
sound/soc/codecs/rt5640.c
sound/soc/codecs/rt5645.c
sound/soc/codecs/rt5651.c
sound/soc/codecs/rt5670.c
sound/soc/codecs/rt5677.c
sound/soc/codecs/sgtl5000.c
sound/soc/codecs/sn95031.c
sound/soc/codecs/ssm2518.c
sound/soc/codecs/ssm2602.c
sound/soc/codecs/ssm4567.c
sound/soc/codecs/sta32x.c
sound/soc/codecs/sta350.c
sound/soc/codecs/sta529.c
sound/soc/codecs/stac9766.c
sound/soc/codecs/tlv320aic23.c
sound/soc/codecs/tlv320aic31xx.c
sound/soc/codecs/tlv320aic32x4.c
sound/soc/codecs/tlv320aic3x.c
sound/soc/codecs/tlv320dac33.c
sound/soc/codecs/twl4030.c
sound/soc/codecs/twl6040.c
sound/soc/codecs/uda134x.c
sound/soc/codecs/uda1380.c
sound/soc/codecs/wm0010.c
sound/soc/codecs/wm1250-ev1.c
sound/soc/codecs/wm8350.c
sound/soc/codecs/wm8400.c
sound/soc/codecs/wm8510.c
sound/soc/codecs/wm8523.c
sound/soc/codecs/wm8580.c
sound/soc/codecs/wm8711.c
sound/soc/codecs/wm8728.c
sound/soc/codecs/wm8731.c
sound/soc/codecs/wm8737.c
sound/soc/codecs/wm8750.c
sound/soc/codecs/wm8753.c
sound/soc/codecs/wm8770.c
sound/soc/codecs/wm8776.c
sound/soc/codecs/wm8900.c
sound/soc/codecs/wm8903.c
sound/soc/codecs/wm8904.c
sound/soc/codecs/wm8940.c
sound/soc/codecs/wm8955.c
sound/soc/codecs/wm8960.c
sound/soc/codecs/wm8961.c
sound/soc/codecs/wm8962.c
sound/soc/codecs/wm8971.c
sound/soc/codecs/wm8974.c
sound/soc/codecs/wm8978.c
sound/soc/codecs/wm8983.c
sound/soc/codecs/wm8985.c
sound/soc/codecs/wm8988.c
sound/soc/codecs/wm8990.c
sound/soc/codecs/wm8991.c
sound/soc/codecs/wm8993.c
sound/soc/codecs/wm8994.c
sound/soc/codecs/wm8995.c
sound/soc/codecs/wm8996.c
sound/soc/codecs/wm9081.c
sound/soc/codecs/wm9090.c
sound/soc/codecs/wm9712.c
sound/soc/codecs/wm9713.c
sound/soc/soc-dapm.c

index a0f265327fdf8949e15b17187732d1da8702a7a9..c0b2686a6aac51905561c5a48da0c31dcafbc0d8 100644 (file)
@@ -1156,7 +1156,6 @@ static int pm860x_set_bias_level(struct snd_soc_codec *codec,
                pm860x_set_bits(pm860x->i2c, REG_MISC2, data, 0);
                break;
        }
-       codec->dapm.bias_level = level;
        return 0;
 }
 
index 783dcb57043a1a02c14e34ce1a94d754c8772440..a43160254929d5b31d7105cd75486263e14bf551 100644 (file)
@@ -1444,7 +1444,6 @@ static int adau1373_set_bias_level(struct snd_soc_codec *codec,
                        ADAU1373_PWDN_CTRL3_PWR_EN, 0);
                break;
        }
-       codec->dapm.bias_level = level;
        return 0;
 }
 
index d4e219b6b98f24636af3e4857bb297db005c10f8..808b964086e36ba5e3df497693f72fe8b091c22a 100644 (file)
@@ -565,7 +565,6 @@ static int adau1701_set_bias_level(struct snd_soc_codec *codec,
                break;
        }
 
-       codec->dapm.bias_level = level;
        return 0;
 }
 
index a1baeee160f43b35780a7914c428e3b886e55c01..5ba24618b576390722c2130f8f2b6f0631bc0c3b 100644 (file)
@@ -466,7 +466,6 @@ static int adau1761_set_bias_level(struct snd_soc_codec *codec,
                break;
 
        }
-       codec->dapm.bias_level = level;
        return 0;
 }
 
index 35581f43fa6d5e212d3d2c6735b70a8b3f0e2c3a..9c01ef0de0c06b7a68bc7818a859fcd0418b5e03 100644 (file)
@@ -339,7 +339,6 @@ static int adau1781_set_bias_level(struct snd_soc_codec *codec,
                break;
        }
 
-       codec->dapm.bias_level = level;
        return 0;
 }
 
index 7ad8e156e2df9010a6d2fbe2d70bf45358da79af..c5b1b8e4e7fc8c81d3b1dcd85906fac051c91891 100644 (file)
@@ -496,8 +496,6 @@ static int adau1977_set_bias_level(struct snd_soc_codec *codec,
        if (ret)
                return ret;
 
-       codec->dapm.bias_level = level;
-
        return 0;
 }
 
index 4373ada95648e6890f013582b97c355b45e76dd1..260a652e4a434b2a45c607448ab4cdc5ce30b93d 100644 (file)
@@ -714,7 +714,6 @@ static int adav80x_set_bias_level(struct snd_soc_codec *codec,
                break;
        }
 
-       codec->dapm.bias_level = level;
        return 0;
 }
 
index 9130d916f2f4d07badd45361de7b8e5415398986..8670861e5bec8d17130976487dffeab1069e4aff 100644 (file)
@@ -341,7 +341,6 @@ static int ak4535_set_bias_level(struct snd_soc_codec *codec,
                snd_soc_update_bits(codec, AK4535_PM1, 0x80, 0);
                break;
        }
-       codec->dapm.bias_level = level;
        return 0;
 }
 
index 81b54a270bd8f800637108d027f9edfffb464d04..3b22b587a82067ed8b05282484d38a1e80e85752 100644 (file)
@@ -439,7 +439,6 @@ static int ak4641_set_bias_level(struct snd_soc_codec *codec,
                regcache_mark_dirty(ak4641->regmap);
                break;
        }
-       codec->dapm.bias_level = level;
        return 0;
 }
 
index 13585e88f59704530e17ff36c0394b17d8c04571..7c0f6552c229b641ab8a81c83080411be9724ae9 100644 (file)
@@ -482,7 +482,6 @@ static int ak4642_set_bias_level(struct snd_soc_codec *codec,
                snd_soc_update_bits(codec, PW_MGMT1, PMVCM, PMVCM);
                break;
        }
-       codec->dapm.bias_level = level;
 
        return 0;
 }
index 2a58b1dccd2f18cb41221c45ac4d026e731240c9..0e59063aeb6f7916265a66636d8debb5d02e2853 100644 (file)
@@ -577,7 +577,6 @@ static int ak4671_set_bias_level(struct snd_soc_codec *codec,
                snd_soc_write(codec, AK4671_AD_DA_POWER_MANAGEMENT, 0x00);
                break;
        }
-       codec->dapm.bias_level = level;
        return 0;
 }
 
index 0e357996864bd141f4d57283c03fba3b0e11b8d7..e92b5ae3cab2d828f63a5851e1d762ba57d5174a 100644 (file)
@@ -826,7 +826,6 @@ static int alc5623_set_bias_level(struct snd_soc_codec *codec,
                snd_soc_write(codec, ALC5623_PWR_MANAG_ADD1, 0);
                break;
        }
-       codec->dapm.bias_level = level;
        return 0;
 }
 
index db3283abbe180788f10b3d7e5b70df996087867b..607a63b9705f939288c6a270e0fe46b06e6a21ab 100644 (file)
@@ -1000,7 +1000,6 @@ static int alc5632_set_bias_level(struct snd_soc_codec *codec,
                                ALC5632_PWR_MANAG_ADD1_MASK, 0);
                break;
        }
-       codec->dapm.bias_level = level;
        return 0;
 }
 
index d6dedd4eab292613138428d2429e35d03da3bf7a..1c895a53001d9b313f0ef69cd0c9ab15ae54dfd8 100644 (file)
@@ -92,7 +92,6 @@ static int cq93vc_set_bias_level(struct snd_soc_codec *codec,
                             DAVINCI_VC_REG12_POWER_ALL_OFF);
                break;
        }
-       codec->dapm.bias_level = level;
 
        return 0;
 }
index cac48ddf3ba6bb71a20da39945fd6f819b24037a..d7ec4756e45bf9bab0c08059ee74c39b4ea3c812 100644 (file)
@@ -503,7 +503,6 @@ static int cs4265_set_bias_level(struct snd_soc_codec *codec,
                        CS4265_PWRCTL_PDN);
                break;
        }
-       codec->dapm.bias_level = level;
        return 0;
 }
 
index 1589e7a881d817ab403f7a7a149cecfda4797a92..3c49a756b89b82862aa8bc85e5dc7072093a1328 100644 (file)
@@ -908,7 +908,6 @@ static int cs42l52_set_bias_level(struct snd_soc_codec *codec,
                regcache_cache_only(cs42l52->regmap, true);
                break;
        }
-       codec->dapm.bias_level = level;
 
        return 0;
 }
index cbc654fe48c76d7fa1c231a874f0e60588ecfc2f..a7638c52b50998c45b7076753ecb09b190e8888f 100644 (file)
@@ -978,7 +978,6 @@ static int cs42l56_set_bias_level(struct snd_soc_codec *codec,
                                                    cs42l56->supplies);
                break;
        }
-       codec->dapm.bias_level = level;
 
        return 0;
 }
index 8ecedba79606c561c0a385e04091513074662210..156ec938f441aba653c33836acd4c7e2e89f18c2 100644 (file)
@@ -1228,7 +1228,6 @@ static int cs42l73_set_bias_level(struct snd_soc_codec *codec,
                snd_soc_update_bits(codec, CS42L73_DMMCC, CS42L73_MCLKDIS, 1);
                break;
        }
-       codec->dapm.bias_level = level;
        return 0;
 }
 
index 0f334bc1b63c78893a452cd5d2cbda86b2f47a0f..13041ccf101061f0f6ce535e3743fa2476e1b185 100644 (file)
@@ -351,8 +351,6 @@ static int cx20442_set_bias_level(struct snd_soc_codec *codec,
        default:
                break;
        }
-       if (!err)
-               codec->dapm.bias_level = level;
 
        return err;
 }
index 9ec577f0edb4c061197e75b932f671c43577b208..925dd3c16d6c5ac74a62d525c745460ed8d73cd0 100644 (file)
@@ -1387,7 +1387,6 @@ static int da7213_set_bias_level(struct snd_soc_codec *codec,
                                    DA7213_VMID_EN | DA7213_BIAS_EN, 0);
                break;
        }
-       codec->dapm.bias_level = level;
        return 0;
 }
 
index 911c26c705fc8d226e819d469c669b72f989517a..06519057bdffca0d26323ca6840cb2bc6fc5d5d1 100644 (file)
@@ -1502,8 +1502,6 @@ static int da732x_set_bias_level(struct snd_soc_codec *codec,
                break;
        }
 
-       codec->dapm.bias_level = level;
-
        return 0;
 }
 
index ad19cc56702b46fda1d98045730ae27bd3a2b633..3bdc95a70112341d3ebc910f0c469afd8f2ff8fe 100644 (file)
@@ -1377,7 +1377,6 @@ static int da9055_set_bias_level(struct snd_soc_codec *codec,
                                    DA9055_VMID_EN | DA9055_BIAS_EN, 0);
                break;
        }
-       codec->dapm.bias_level = level;
        return 0;
 }
 
index c5f35a07e8e48106335df49153acd81e104f7aa9..996e3f4e73430ee22ce8c30c703ed56ace24271f 100644 (file)
@@ -566,7 +566,6 @@ static int es8328_set_bias_level(struct snd_soc_codec *codec,
                                0);
                break;
        }
-       codec->dapm.bias_level = level;
        return 0;
 }
 
index 3a89ce66d51d7e1c56b7c655fc0ed984e520e75b..ebd90283c9604119f2bfe41ecba6d5051307cf09 100644 (file)
@@ -909,8 +909,6 @@ static int isabelle_set_bias_level(struct snd_soc_codec *codec,
                break;
        }
 
-       codec->dapm.bias_level = level;
-
        return 0;
 }
 
index 933f4476d76ccd0bd009d27c40d9a43fa4e7b352..8425d262e56639b9facfc055967b456e1fe4f658 100644 (file)
@@ -281,8 +281,6 @@ static int jz4740_codec_set_bias_level(struct snd_soc_codec *codec,
                break;
        }
 
-       codec->dapm.bias_level = level;
-
        return 0;
 }
 
index a924bb9d78860c11c84d7420f46c54929d3b7eb8..79ad4cbdcdd4a6c16a06d2ba7073444af2dbd143 100644 (file)
@@ -89,8 +89,6 @@ static int lm4857_set_bias_level(struct snd_soc_codec *codec,
                break;
        }
 
-       codec->dapm.bias_level = level;
-
        return 0;
 }
 
index c4dfde9bdf1c10b21dc443374d1e534f6046b016..166fd4c88ddb2f91a431a09e24bebb18d0164fd0 100644 (file)
@@ -1284,8 +1284,6 @@ static int lm49453_set_bias_level(struct snd_soc_codec *codec,
                break;
        }
 
-       codec->dapm.bias_level = level;
-
        return 0;
 }
 
index 805b3f8cd39df1d526543385dd273da18d40e35f..3200aa80f1f226fcf9dc5d072eed62603866cae1 100644 (file)
@@ -1584,7 +1584,6 @@ static int max98088_set_bias_level(struct snd_soc_codec *codec,
                regcache_mark_dirty(max98088->regmap);
                break;
        }
-       codec->dapm.bias_level = level;
        return 0;
 }
 
index 3e33ef2acf3c993b6ae1d87317452c9fb4e9021c..c5736b2f7c768f8a6f95e57f4c84eae0f3c38714 100644 (file)
@@ -1824,7 +1824,6 @@ static int max98090_set_bias_level(struct snd_soc_codec *codec,
                regcache_mark_dirty(max98090->regmap);
                break;
        }
-       codec->dapm.bias_level = level;
        return 0;
 }
 
index d6e80a932ec3d58b3e1f86a3098b844531d14d99..66c7ca431a2ed974bf45b53e2e408577703ac47f 100644 (file)
@@ -1678,7 +1678,6 @@ static int max98095_set_bias_level(struct snd_soc_codec *codec,
                regcache_mark_dirty(max98095->regmap);
                break;
        }
-       codec->dapm.bias_level = level;
        return 0;
 }
 
index 10f8e47ce2c28604a1d8cfdbe87b871d1e029290..f6b616b6ffcade8f0511cfad178a23f348d608bd 100644 (file)
@@ -264,7 +264,6 @@ static int max9850_set_bias_level(struct snd_soc_codec *codec,
        case SND_SOC_BIAS_OFF:
                break;
        }
-       codec->dapm.bias_level = level;
        return 0;
 }
 
index 711f55039522f473a5070cb1454a03132423f5d6..f1d5778e6599873492bb204a31fac917de77e0f0 100644 (file)
@@ -536,7 +536,6 @@ static int ml26124_set_bias_level(struct snd_soc_codec *codec,
                                    ML26124_VMID, 0);
                break;
        }
-       codec->dapm.bias_level = level;
        return 0;
 }
 
index e12764d15431be69046bd4db72b5a822986255df..c305b2871c597f3a8673b2e815ad0c4be71b135e 100644 (file)
@@ -641,8 +641,6 @@ static int pcm512x_set_bias_level(struct snd_soc_codec *codec,
                break;
        }
 
-       codec->dapm.bias_level = level;
-
        return 0;
 }
 
index 0fcda35a3a93694fa5352d06144e934ee99b7583..dbdbb9e8d4baa26f982dadb5a682dea2da70a005 100644 (file)
@@ -1012,7 +1012,6 @@ static int rt286_set_bias_level(struct snd_soc_codec *codec,
        default:
                break;
        }
-       codec->dapm.bias_level = level;
 
        return 0;
 }
index 2c10d77727af5d0c848a64fae5202a183dcd3f69..e285d8ad260ab47c96137a39f42582895ae51aa2 100644 (file)
@@ -1569,7 +1569,6 @@ static int rt5631_set_bias_level(struct snd_soc_codec *codec,
        default:
                break;
        }
-       codec->dapm.bias_level = level;
 
        return 0;
 }
index d39b25cd62efc518b43d5822d3d696b7cee875aa..7d488d8b03d6622df6808e99afc10142bf9a4d40 100644 (file)
@@ -1902,7 +1902,6 @@ static int rt5640_set_bias_level(struct snd_soc_codec *codec,
        default:
                break;
        }
-       codec->dapm.bias_level = level;
 
        return 0;
 }
index b1e681a3e8dbfcb2cf67bef5b9c14a1756c5715e..ea583675fa001344781774d4d1c137edd8cf72d2 100644 (file)
@@ -2409,7 +2409,6 @@ static int rt5645_set_bias_level(struct snd_soc_codec *codec,
        default:
                break;
        }
-       codec->dapm.bias_level = level;
 
        return 0;
 }
index 35c9725059483e7e8dcb0c5b3e473fde9ca87f4e..f03c6fc1a7e9f7637bd80f80bfc50e60c9a50920 100644 (file)
@@ -1604,7 +1604,6 @@ static int rt5651_set_bias_level(struct snd_soc_codec *codec,
        default:
                break;
        }
-       codec->dapm.bias_level = level;
 
        return 0;
 }
index cc7f84a150a7f03878795a7a96f991a6db5b1de5..9235711e86c245667613ce26a97803fb0289fc12 100644 (file)
@@ -2647,7 +2647,6 @@ static int rt5670_set_bias_level(struct snd_soc_codec *codec,
        default:
                break;
        }
-       codec->dapm.bias_level = level;
 
        return 0;
 }
index ba408ad23457fd825895ee6bc4a1a523f635c965..696ba587969e8e1ed28ed7820673df3150315b2e 100644 (file)
@@ -4392,7 +4392,6 @@ static int rt5677_set_bias_level(struct snd_soc_codec *codec,
        default:
                break;
        }
-       codec->dapm.bias_level = level;
 
        return 0;
 }
index 3593a1496056d2aa7648142c67bd7952d5b589f6..b01c985a23075438f9090ce534a6a5e5cdf7f227 100644 (file)
@@ -979,7 +979,6 @@ static int sgtl5000_set_bias_level(struct snd_soc_codec *codec,
                break;
        }
 
-       codec->dapm.bias_level = level;
        return 0;
 }
 
index 7947c0ebb1ed88a442ecd8e73338fe858c67819c..e4743684cc1d7065a9218f6c3cf772fd27ed0e4e 100644 (file)
@@ -226,7 +226,6 @@ static int sn95031_set_vaud_bias(struct snd_soc_codec *codec,
                break;
        }
 
-       codec->dapm.bias_level = level;
        return 0;
 }
 
index 67ea55adb307d373dd4f3d91291b930b35d68a7a..40b22b3fd5f6199961bfe09a31c07af5f486624e 100644 (file)
@@ -521,8 +521,6 @@ static int ssm2518_set_bias_level(struct snd_soc_codec *codec,
        if (ret)
                return ret;
 
-       codec->dapm.bias_level = level;
-
        return 0;
 }
 
index 314eaece1b7d6ac50bfb2d8af18ef1247bd3194c..296a140b8c35c72c19ff51ba64ec46ec4a03372e 100644 (file)
@@ -473,7 +473,6 @@ static int ssm2602_set_bias_level(struct snd_soc_codec *codec,
                break;
 
        }
-       codec->dapm.bias_level = level;
        return 0;
 }
 
index a984485108cd10a028b45f1a7974c294c43ba3ed..643bcff4a919d7e391dc0a467bdf8adf37b83bca 100644 (file)
@@ -361,12 +361,7 @@ static int ssm4567_set_bias_level(struct snd_soc_codec *codec,
                break;
        }
 
-       if (ret)
-               return ret;
-
-       codec->dapm.bias_level = level;
-
-       return 0;
+       return ret;
 }
 
 static const struct snd_soc_dai_ops ssm4567_dai_ops = {
index 686ec765ea0e40f2c3fae04d66d550ec0945435f..033b7d9f45f7039036ffb849fed2f8d5c8a59650 100644 (file)
@@ -854,7 +854,6 @@ static int sta32x_set_bias_level(struct snd_soc_codec *codec,
                                       sta32x->supplies);
                break;
        }
-       codec->dapm.bias_level = level;
        return 0;
 }
 
index 46fc07a94fcdc01c665f4201a8e3ef2cc1753197..50d8bbf90ce215c101037838adc59e3fe9d03cb2 100644 (file)
@@ -890,7 +890,6 @@ static int sta350_set_bias_level(struct snd_soc_codec *codec,
                                       sta350->supplies);
                break;
        }
-       codec->dapm.bias_level = level;
        return 0;
 }
 
index b0f436d101253419dccdbd15d6abe694d383c2a7..c3217af1ca29b136b840603ce00ef6c8042797f2 100644 (file)
@@ -179,12 +179,6 @@ static int sta529_set_bias_level(struct snd_soc_codec *codec, enum
                break;
        }
 
-       /*
-        * store the label for powers down audio subsystem for suspend.This is
-        * used by soc core layer
-        */
-       codec->dapm.bias_level = level;
-
        return 0;
 
 }
index 6464caf72b21d6bda252c5a91f5669574e852a98..2341e8e6bfc15b26e157c85bf9e2b1dd397e0eec 100644 (file)
@@ -236,7 +236,6 @@ static int stac9766_set_bias_level(struct snd_soc_codec *codec,
                stac9766_ac97_write(codec, AC97_POWERDOWN, 0xffff);
                break;
        }
-       codec->dapm.bias_level = level;
        return 0;
 }
 
index cc17e7e5126e0750d46c933a8e96bc52c42a07df..cd8c02b6e4de471ceb7b3d33b8687fb98310b8ea 100644 (file)
@@ -506,7 +506,6 @@ static int tlv320aic23_set_bias_level(struct snd_soc_codec *codec,
                snd_soc_write(codec, TLV320AIC23_PWR, 0x1ff);
                break;
        }
-       codec->dapm.bias_level = level;
        return 0;
 }
 
index c86dd9aae1576670925b0ae1ce4b7959e5f199e4..e629273019d07dde5d90feefdc3e9b2663bc8518 100644 (file)
@@ -1053,7 +1053,6 @@ static int aic31xx_set_bias_level(struct snd_soc_codec *codec,
                        aic31xx_power_off(codec);
                break;
        }
-       codec->dapm.bias_level = level;
 
        return 0;
 }
index 015467ed606bc895ef9ce074f437453e498bfaef..ad6cb90e5f9b3fcc6edef66bfe295f9d8631a82e 100644 (file)
@@ -564,7 +564,6 @@ static int aic32x4_set_bias_level(struct snd_soc_codec *codec,
        case SND_SOC_BIAS_OFF:
                break;
        }
-       codec->dapm.bias_level = level;
        return 0;
 }
 
index 51c4713ac6e39059efbb6d296be7ee3527435649..57d709075746d577c338f9b033cc6f6162df8f63 100644 (file)
@@ -1406,7 +1406,6 @@ static int aic3x_set_bias_level(struct snd_soc_codec *codec,
                        aic3x_set_power(codec, 0);
                break;
        }
-       codec->dapm.bias_level = level;
 
        return 0;
 }
index 4e3e607dec13085df4cbc4a3d198ae5cacf78c32..33e93f62de305ff54ba1f5bde7b648cd410abd93 100644 (file)
@@ -651,7 +651,6 @@ static int dac33_set_bias_level(struct snd_soc_codec *codec,
                        return ret;
                break;
        }
-       codec->dapm.bias_level = level;
 
        return 0;
 }
index d04693e9cf9f8c9b362b212b04058e7fe6ee2278..e725e13a7f59011ab1a3ca975abbb5220a29b707 100644 (file)
@@ -1595,7 +1595,6 @@ static int twl4030_set_bias_level(struct snd_soc_codec *codec,
                twl4030_codec_enable(codec, 0);
                break;
        }
-       codec->dapm.bias_level = level;
 
        return 0;
 }
index 9bd887ed7f4406c186b9a1425522b11a3f279a6e..b8ecce206af8a87f0fa4c5cd7f1f3dc3f663c240 100644 (file)
@@ -853,8 +853,6 @@ static int twl6040_set_bias_level(struct snd_soc_codec *codec,
                break;
        }
 
-       codec->dapm.bias_level = level;
-
        return 0;
 }
 
index f883308c00de20738235c536111202d08241f7f5..dbecbc05cf7b1b56c2514b80bea58cf60e06f5a1 100644 (file)
@@ -350,7 +350,6 @@ static int uda134x_set_bias_level(struct snd_soc_codec *codec,
                        pd->power(0);
                break;
        }
-       codec->dapm.bias_level = level;
        return 0;
 }
 
index dc7778b6dd7f6fa40b76b598e3441aa5c2c5d571..cc5b1769958a59ea1d83a830701c0244655aa183 100644 (file)
@@ -623,7 +623,6 @@ static int uda1380_set_bias_level(struct snd_soc_codec *codec,
                for (reg = UDA1380_MVOL; reg < UDA1380_CACHEREGNUM; reg++)
                        set_bit(reg - 0x10, &uda1380_cache_dirty);
        }
-       codec->dapm.bias_level = level;
        return 0;
 }
 
index f37989ec7cbaff9509c50f4b5a66b1c4e1fe1e85..3358dd6811fadb7cecb2731a387ca105e422b5ed 100644 (file)
@@ -767,8 +767,6 @@ static int wm0010_set_bias_level(struct snd_soc_codec *codec,
                break;
        }
 
-       codec->dapm.bias_level = level;
-
        return 0;
 }
 
index 8011f75fb6cbd45b5328c9f238a61da1325b080b..048f00568260a82b82b544b09c4b24625aeb2f62 100644 (file)
@@ -61,8 +61,6 @@ static int wm1250_ev1_set_bias_level(struct snd_soc_codec *codec,
                break;
        }
 
-       codec->dapm.bias_level = level;
-
        return 0;
 }
 
index c65e5a75fc1afd4e992cca9bda59db14ddba24f1..dd0d0248e641052f53976135cdecc79cacc5ae45 100644 (file)
@@ -1235,7 +1235,6 @@ static int wm8350_set_bias_level(struct snd_soc_codec *codec,
                                       priv->supplies);
                break;
        }
-       codec->dapm.bias_level = level;
        return 0;
 }
 
index b0d84e552fca758786100c5eca18b746013a1d61..adbfebe04c77d76861678d78f270e6ad3af2fc07 100644 (file)
@@ -1232,7 +1232,6 @@ static int wm8400_set_bias_level(struct snd_soc_codec *codec,
                break;
        }
 
-       codec->dapm.bias_level = level;
        return 0;
 }
 
index 8736ad094b248926051b3bf2590356c8db7ce3da..a380c10e867bdee4d142298fe6cc83d9dd0105a8 100644 (file)
@@ -538,7 +538,6 @@ static int wm8510_set_bias_level(struct snd_soc_codec *codec,
                break;
        }
 
-       codec->dapm.bias_level = level;
        return 0;
 }
 
index b1cc94f5fc4b253282a71d167cbb1815861d99d1..34ebe95d93f17019ed4ab99f2d8a191bd392221e 100644 (file)
@@ -344,7 +344,6 @@ static int wm8523_set_bias_level(struct snd_soc_codec *codec,
                                       wm8523->supplies);
                break;
        }
-       codec->dapm.bias_level = level;
        return 0;
 }
 
index 0a887c5ec83a4c69edd6a0079cb17b676c46c774..5951d88e3dc918962ec404a42da65f54bfae045c 100644 (file)
@@ -812,7 +812,6 @@ static int wm8580_set_bias_level(struct snd_soc_codec *codec,
                                    WM8580_PWRDN1_PWDN, WM8580_PWRDN1_PWDN);
                break;
        }
-       codec->dapm.bias_level = level;
        return 0;
 }
 
index 121e46d53779f33cf7f9c0eb49b8531c61323774..a4aab6e7f5ccb8166ae5221e227b46f1189da56e 100644 (file)
@@ -320,7 +320,6 @@ static int wm8711_set_bias_level(struct snd_soc_codec *codec,
                snd_soc_write(codec, WM8711_PWR, 0xffff);
                break;
        }
-       codec->dapm.bias_level = level;
        return 0;
 }
 
index 55c7fb4fc78667c49d799faef3e1e89a7af2bd1c..a737068d55762d90ee8b25916e08c5088cf468dd 100644 (file)
@@ -185,7 +185,6 @@ static int wm8728_set_bias_level(struct snd_soc_codec *codec,
                snd_soc_write(codec, WM8728_DACCTL, reg | 0x4);
                break;
        }
-       codec->dapm.bias_level = level;
        return 0;
 }
 
index 00898d9d977d12fdd053b06fdac20de375f9880e..a13a20ac47af849a592b05d885882129a587def0 100644 (file)
@@ -523,7 +523,6 @@ static int wm8731_set_bias_level(struct snd_soc_codec *codec,
                regcache_mark_dirty(wm8731->regmap);
                break;
        }
-       codec->dapm.bias_level = level;
        return 0;
 }
 
index 40e6acb4f3f41a279b42affc98d2c199809bb554..4a9407dadae30e04c563464a3f214ee9e216ffd9 100644 (file)
@@ -510,7 +510,6 @@ static int wm8737_set_bias_level(struct snd_soc_codec *codec,
                break;
        }
 
-       codec->dapm.bias_level = level;
        return 0;
 }
 
index eb0a1644ba1142d05cc8ac561945a507f776e066..d6ff25a9d5af46eebd655ee96ca79aebd6265d94 100644 (file)
@@ -651,7 +651,6 @@ static int wm8750_set_bias_level(struct snd_soc_codec *codec,
                snd_soc_write(codec, WM8750_PWR1, 0x0001);
                break;
        }
-       codec->dapm.bias_level = level;
        return 0;
 }
 
index c50a5959345fcf346f55e32056c2b1d4ae5ebd11..b7d38f7ba6366230f0a077c96546c2bddba481b3 100644 (file)
@@ -1367,7 +1367,6 @@ static int wm8753_set_bias_level(struct snd_soc_codec *codec,
                snd_soc_write(codec, WM8753_PWR1, 0x0001);
                break;
        }
-       codec->dapm.bias_level = level;
        return 0;
 }
 
index 53e977da2f86d325c0366efae3e3ba121e49fedd..c24db80372017aff1cdb1de520a0b67282c4773d 100644 (file)
@@ -534,7 +534,6 @@ static int wm8770_set_bias_level(struct snd_soc_codec *codec,
                break;
        }
 
-       codec->dapm.bias_level = level;
        return 0;
 }
 
index c13050b7793190b029668effdb5c177e4cdd3389..b0e3c3bbd44057c84810d98b0ba62d8dbe63df8e 100644 (file)
@@ -357,7 +357,6 @@ static int wm8776_set_bias_level(struct snd_soc_codec *codec,
                break;
        }
 
-       codec->dapm.bias_level = level;
        return 0;
 }
 
index 065da37bbf2160e74405c91616372ed748051b73..e7d2ecd150cfdee684a36b3a142114479147871c 100644 (file)
@@ -1117,7 +1117,6 @@ static int wm8900_set_bias_level(struct snd_soc_codec *codec,
                             WM8900_REG_POWER2_SYSCLK_ENA);
                break;
        }
-       codec->dapm.bias_level = level;
        return 0;
 }
 
index 04b04f8e147c6bdeada6decdca981a026ce57afa..5e0bef62d974a393cab3bc11684b8f322ad118a0 100644 (file)
@@ -1200,8 +1200,6 @@ static int wm8903_set_bias_level(struct snd_soc_codec *codec,
                break;
        }
 
-       codec->dapm.bias_level = level;
-
        return 0;
 }
 
index 215e93c1ddf0358f42dc5581fd01b1d9a3d7e1e0..a7a8fa0567b109f59891ec85cc3a884ae04aa736 100644 (file)
@@ -1907,7 +1907,6 @@ static int wm8904_set_bias_level(struct snd_soc_codec *codec,
                clk_disable_unprepare(wm8904->mclk);
                break;
        }
-       codec->dapm.bias_level = level;
        return 0;
 }
 
index 4b4b9973c74094d13dfb82d04a41106386ff85fd..f2d6a490713f3e56329a5280450c866b9ad5812e 100644 (file)
@@ -510,8 +510,6 @@ static int wm8940_set_bias_level(struct snd_soc_codec *codec,
                break;
        }
 
-       codec->dapm.bias_level = level;
-
        return ret;
 }
 
index 8080eabf63bda47d7d0486548da741f8625f2b6b..f400d5c7234c842eee028e6cc03cab5cb346c45f 100644 (file)
@@ -838,7 +838,6 @@ static int wm8955_set_bias_level(struct snd_soc_codec *codec,
                                       wm8955->supplies);
                break;
        }
-       codec->dapm.bias_level = level;
        return 0;
 }
 
index 3035d98564156746bc4e814f744e1ea0f236564a..6fa832b6365b7b5da80984b91fbce2ca58b67b8e 100644 (file)
@@ -691,8 +691,6 @@ static int wm8960_set_bias_level_out3(struct snd_soc_codec *codec,
                break;
        }
 
-       codec->dapm.bias_level = level;
-
        return 0;
 }
 
@@ -802,8 +800,6 @@ static int wm8960_set_bias_level_capless(struct snd_soc_codec *codec,
                break;
        }
 
-       codec->dapm.bias_level = level;
-
        return 0;
 }
 
index 95e2c1bfc809ff1a0d9c20b6f280c0afed491239..6f95d7044aaca8401c45742eddbfdfab2ca63da1 100644 (file)
@@ -795,8 +795,6 @@ static int wm8961_set_bias_level(struct snd_soc_codec *codec,
                break;
        }
 
-       codec->dapm.bias_level = level;
-
        return 0;
 }
 
index 118b0034ba235d238bfc5c137db7681126bba45b..00793b7b0a835ba4150445ef413c1384a1afd1a3 100644 (file)
@@ -2538,7 +2538,6 @@ static int wm8962_set_bias_level(struct snd_soc_codec *codec,
                break;
        }
 
-       codec->dapm.bias_level = level;
        return 0;
 }
 
index f9cbabdc623889e1adfa066674bed51a868bd49a..94eb27ec572f8e60f1995a4cf72b37d80733acba 100644 (file)
@@ -594,7 +594,6 @@ static int wm8971_set_bias_level(struct snd_soc_codec *codec,
                snd_soc_write(codec, WM8971_PWR1, 0x0001);
                break;
        }
-       codec->dapm.bias_level = level;
        return 0;
 }
 
index ff0e4646b934c6dc9427206ac71889ccd3f30f5a..d2180c83a5ccae0f14ff8799e20fefb323767536 100644 (file)
@@ -533,7 +533,6 @@ static int wm8974_set_bias_level(struct snd_soc_codec *codec,
                break;
        }
 
-       codec->dapm.bias_level = level;
        return 0;
 }
 
index 572b1bf07d6c41de9ba8c41a7d2b83367b003fff..e2363b9a38a06b9caf5e8974cf068afa2c1bc268 100644 (file)
@@ -888,7 +888,6 @@ static int wm8978_set_bias_level(struct snd_soc_codec *codec,
 
        dev_dbg(codec->dev, "%s: %d, %x\n", __func__, level, power1);
 
-       codec->dapm.bias_level = level;
        return 0;
 }
 
index 5d1cf08a72b872539fc8fce5a5c228ce69d1cfb5..f9245715cebdb4c0da4e67445d9548f29edf387c 100644 (file)
@@ -963,7 +963,6 @@ static int wm8983_set_bias_level(struct snd_soc_codec *codec,
                break;
        }
 
-       codec->dapm.bias_level = level;
        return 0;
 }
 
index 0b3b54c9971dc7300337f401c32b261b8db576d5..4e6901b5c81956f631c96548b6884cf1775dc26d 100644 (file)
@@ -957,7 +957,6 @@ static int wm8985_set_bias_level(struct snd_soc_codec *codec,
                break;
        }
 
-       codec->dapm.bias_level = level;
        return 0;
 }
 
index 24968aa8618a52e705fdbfe3f04de156abb5a6da..92680c6d247ed30d091ca231817d3e138b0f5177 100644 (file)
@@ -756,7 +756,6 @@ static int wm8988_set_bias_level(struct snd_soc_codec *codec,
                snd_soc_write(codec, WM8988_PWR1, 0x0000);
                break;
        }
-       codec->dapm.bias_level = level;
        return 0;
 }
 
index c642b3abba5de2a8c8995d8e159f1f55486992c7..ff377cab5775b7e7f7aa1bdddbf85a9cebd31a2d 100644 (file)
@@ -1227,7 +1227,6 @@ static int wm8990_set_bias_level(struct snd_soc_codec *codec,
                break;
        }
 
-       codec->dapm.bias_level = level;
        return 0;
 }
 
index 49df0dc607e67f41252cd6c56eb38cc0abdf06dc..abd439fb08207237dce4460604e0a7b76f6b7851 100644 (file)
@@ -1224,7 +1224,6 @@ static int wm8991_set_bias_level(struct snd_soc_codec *codec,
                break;
        }
 
-       codec->dapm.bias_level = level;
        return 0;
 }
 
index b8385ac26b90cab575f62539c20f0f5c6cbc0934..52ec4fe03b2392c00a65dde12f87bab086f498ee 100644 (file)
@@ -1065,8 +1065,6 @@ static int wm8993_set_bias_level(struct snd_soc_codec *codec,
                break;
        }
 
-       codec->dapm.bias_level = level;
-
        return 0;
 }
 
index fedf48d8e7ae490b544c0e77dcad9d09ec433553..2d32b542f1033b355915684c025d70ef08db220d 100644 (file)
@@ -2546,8 +2546,6 @@ static int wm8994_set_bias_level(struct snd_soc_codec *codec,
                break;
        }
 
-       codec->dapm.bias_level = level;
-
        return 0;
 }
 
index 66103c2b012e522062a9d29d5f92a099223c6015..47af27fb339ab22e0c47a7e3b464bfeeee743cd5 100644 (file)
@@ -1990,7 +1990,6 @@ static int wm8995_set_bias_level(struct snd_soc_codec *codec,
                break;
        }
 
-       codec->dapm.bias_level = level;
        return 0;
 }
 
index 308748a022c55214949b9003f81f67dccad2995e..3dce5075146968ce26896baea365164920263549 100644 (file)
@@ -1628,8 +1628,6 @@ static int wm8996_set_bias_level(struct snd_soc_codec *codec,
                break;
        }
 
-       codec->dapm.bias_level = level;
-
        return 0;
 }
 
index 13a3f335ea5b6cb4bfeecd8ed0eb9ce13a1bb7ce..02d9a5012c1b2eb97e9c7da10c78a59424e909d9 100644 (file)
@@ -898,8 +898,6 @@ static int wm9081_set_bias_level(struct snd_soc_codec *codec,
                break;
        }
 
-       codec->dapm.bias_level = level;
-
        return 0;
 }
 
index 60d243c904f529597399c408c8426c2ca879ccd6..03bca8581bc7385047fc76a3dbf336226aaf41e8 100644 (file)
@@ -515,8 +515,6 @@ static int wm9090_set_bias_level(struct snd_soc_codec *codec,
                break;
        }
 
-       codec->dapm.bias_level = level;
-
        return 0;
 }
 
index 9119a779f728aede3c3c91b9e8f35c25e172d61b..1fda104dfc455cafcf83e13ed210302f8b825fbe 100644 (file)
@@ -610,7 +610,6 @@ static int wm9712_set_bias_level(struct snd_soc_codec *codec,
                ac97_write(codec, AC97_POWERDOWN, 0xffff);
                break;
        }
-       codec->dapm.bias_level = level;
        return 0;
 }
 
index 39c3e717c577cd601b6eb48ec75722150a88f44c..9d18a0ec42809a29a38034e7147aff8a539a76b1 100644 (file)
@@ -1171,7 +1171,6 @@ static int wm9713_set_bias_level(struct snd_soc_codec *codec,
                ac97_write(codec, AC97_POWERDOWN, 0xffff);
                break;
        }
-       codec->dapm.bias_level = level;
        return 0;
 }
 
index b24782b50809fa752ac4000da5e88a347174f804..79b9478202312e4ac33fbfdc4af012e9203d6fd2 100644 (file)
@@ -550,6 +550,9 @@ int snd_soc_dapm_force_bias_level(struct snd_soc_dapm_context *dapm,
        if (dapm->set_bias_level)
                ret = dapm->set_bias_level(dapm, level);
 
+       if (ret == 0)
+               dapm->bias_level = level;
+
        return ret;
 }
 EXPORT_SYMBOL_GPL(snd_soc_dapm_force_bias_level);