Skip to content

Commit

Permalink
ASoC: Move bias level update to the core
Browse files Browse the repository at this point in the history 
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>
  • Loading branch information
Lars-Peter Clausen authored and Mark Brown committed Apr 27, 2015
1 parent bd1204c commit f4bf8d7
Show file tree
Hide file tree
Showing 98 changed files with 4 additions and 130 deletions.
1 change: 0 additions & 1 deletion sound/soc/codecs/88pm860x-codec.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

Expand Down
1 change: 0 additions & 1 deletion sound/soc/codecs/adau1373.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

Expand Down
1 change: 0 additions & 1 deletion sound/soc/codecs/adau1701.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -565,7 +565,6 @@ static int adau1701_set_bias_level(struct snd_soc_codec *codec,
break;
}

codec->dapm.bias_level = level;
return 0;
}

Expand Down
1 change: 0 additions & 1 deletion sound/soc/codecs/adau1761.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -466,7 +466,6 @@ static int adau1761_set_bias_level(struct snd_soc_codec *codec,
break;

}
codec->dapm.bias_level = level;
return 0;
}

Expand Down
1 change: 0 additions & 1 deletion sound/soc/codecs/adau1781.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -339,7 +339,6 @@ static int adau1781_set_bias_level(struct snd_soc_codec *codec,
break;
}

codec->dapm.bias_level = level;
return 0;
}

Expand Down
2 changes: 0 additions & 2 deletions sound/soc/codecs/adau1977.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

Expand Down
1 change: 0 additions & 1 deletion sound/soc/codecs/adav80x.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -714,7 +714,6 @@ static int adav80x_set_bias_level(struct snd_soc_codec *codec,
break;
}

codec->dapm.bias_level = level;
return 0;
}

Expand Down
1 change: 0 additions & 1 deletion sound/soc/codecs/ak4535.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

Expand Down
1 change: 0 additions & 1 deletion sound/soc/codecs/ak4641.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

Expand Down
1 change: 0 additions & 1 deletion sound/soc/codecs/ak4642.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down
1 change: 0 additions & 1 deletion sound/soc/codecs/ak4671.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

Expand Down
1 change: 0 additions & 1 deletion sound/soc/codecs/alc5623.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

Expand Down
1 change: 0 additions & 1 deletion sound/soc/codecs/alc5632.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

Expand Down
1 change: 0 additions & 1 deletion sound/soc/codecs/cq93vc.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down
1 change: 0 additions & 1 deletion sound/soc/codecs/cs4265.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

Expand Down
1 change: 0 additions & 1 deletion sound/soc/codecs/cs42l52.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down
1 change: 0 additions & 1 deletion sound/soc/codecs/cs42l56.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down
1 change: 0 additions & 1 deletion sound/soc/codecs/cs42l73.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

Expand Down
2 changes: 0 additions & 2 deletions sound/soc/codecs/cx20442.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down
1 change: 0 additions & 1 deletion sound/soc/codecs/da7213.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

Expand Down
2 changes: 0 additions & 2 deletions sound/soc/codecs/da732x.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1502,8 +1502,6 @@ static int da732x_set_bias_level(struct snd_soc_codec *codec,
break;
}

codec->dapm.bias_level = level;

return 0;
}

Expand Down
1 change: 0 additions & 1 deletion sound/soc/codecs/da9055.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

Expand Down
1 change: 0 additions & 1 deletion sound/soc/codecs/es8328.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -566,7 +566,6 @@ static int es8328_set_bias_level(struct snd_soc_codec *codec,
0);
break;
}
codec->dapm.bias_level = level;
return 0;
}

Expand Down
2 changes: 0 additions & 2 deletions sound/soc/codecs/isabelle.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -909,8 +909,6 @@ static int isabelle_set_bias_level(struct snd_soc_codec *codec,
break;
}

codec->dapm.bias_level = level;

return 0;
}

Expand Down
2 changes: 0 additions & 2 deletions sound/soc/codecs/jz4740.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -281,8 +281,6 @@ static int jz4740_codec_set_bias_level(struct snd_soc_codec *codec,
break;
}

codec->dapm.bias_level = level;

return 0;
}

Expand Down
2 changes: 0 additions & 2 deletions sound/soc/codecs/lm4857.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -89,8 +89,6 @@ static int lm4857_set_bias_level(struct snd_soc_codec *codec,
break;
}

codec->dapm.bias_level = level;

return 0;
}

Expand Down
2 changes: 0 additions & 2 deletions sound/soc/codecs/lm49453.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1284,8 +1284,6 @@ static int lm49453_set_bias_level(struct snd_soc_codec *codec,
break;
}

codec->dapm.bias_level = level;

return 0;
}

Expand Down
1 change: 0 additions & 1 deletion sound/soc/codecs/max98088.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

Expand Down
1 change: 0 additions & 1 deletion sound/soc/codecs/max98090.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

Expand Down
1 change: 0 additions & 1 deletion sound/soc/codecs/max98095.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

Expand Down
1 change: 0 additions & 1 deletion sound/soc/codecs/max9850.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

Expand Down
1 change: 0 additions & 1 deletion sound/soc/codecs/ml26124.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

Expand Down
2 changes: 0 additions & 2 deletions sound/soc/codecs/pcm512x.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -641,8 +641,6 @@ static int pcm512x_set_bias_level(struct snd_soc_codec *codec,
break;
}

codec->dapm.bias_level = level;

return 0;
}

Expand Down
1 change: 0 additions & 1 deletion sound/soc/codecs/rt286.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1012,7 +1012,6 @@ static int rt286_set_bias_level(struct snd_soc_codec *codec,
default:
break;
}
codec->dapm.bias_level = level;

return 0;
}
Expand Down
1 change: 0 additions & 1 deletion sound/soc/codecs/rt5631.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1569,7 +1569,6 @@ static int rt5631_set_bias_level(struct snd_soc_codec *codec,
default:
break;
}
codec->dapm.bias_level = level;

return 0;
}
Expand Down
1 change: 0 additions & 1 deletion sound/soc/codecs/rt5640.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1902,7 +1902,6 @@ static int rt5640_set_bias_level(struct snd_soc_codec *codec,
default:
break;
}
codec->dapm.bias_level = level;

return 0;
}
Expand Down
1 change: 0 additions & 1 deletion sound/soc/codecs/rt5645.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2409,7 +2409,6 @@ static int rt5645_set_bias_level(struct snd_soc_codec *codec,
default:
break;
}
codec->dapm.bias_level = level;

return 0;
}
Expand Down
1 change: 0 additions & 1 deletion sound/soc/codecs/rt5651.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1604,7 +1604,6 @@ static int rt5651_set_bias_level(struct snd_soc_codec *codec,
default:
break;
}
codec->dapm.bias_level = level;

return 0;
}
Expand Down
1 change: 0 additions & 1 deletion sound/soc/codecs/rt5670.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2647,7 +2647,6 @@ static int rt5670_set_bias_level(struct snd_soc_codec *codec,
default:
break;
}
codec->dapm.bias_level = level;

return 0;
}
Expand Down
1 change: 0 additions & 1 deletion sound/soc/codecs/rt5677.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4392,7 +4392,6 @@ static int rt5677_set_bias_level(struct snd_soc_codec *codec,
default:
break;
}
codec->dapm.bias_level = level;

return 0;
}
Expand Down
1 change: 0 additions & 1 deletion sound/soc/codecs/sgtl5000.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -979,7 +979,6 @@ static int sgtl5000_set_bias_level(struct snd_soc_codec *codec,
break;
}

codec->dapm.bias_level = level;
return 0;
}

Expand Down
1 change: 0 additions & 1 deletion sound/soc/codecs/sn95031.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -226,7 +226,6 @@ static int sn95031_set_vaud_bias(struct snd_soc_codec *codec,
break;
}

codec->dapm.bias_level = level;
return 0;
}

Expand Down
2 changes: 0 additions & 2 deletions sound/soc/codecs/ssm2518.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

Expand Down
1 change: 0 additions & 1 deletion sound/soc/codecs/ssm2602.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -473,7 +473,6 @@ static int ssm2602_set_bias_level(struct snd_soc_codec *codec,
break;

}
codec->dapm.bias_level = level;
return 0;
}

Expand Down
7 changes: 1 addition & 6 deletions sound/soc/codecs/ssm4567.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 = {
Expand Down
1 change: 0 additions & 1 deletion sound/soc/codecs/sta32x.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

Expand Down
1 change: 0 additions & 1 deletion sound/soc/codecs/sta350.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

Expand Down
Loading

0 comments on commit f4bf8d7

Please sign in to comment.