projects
/
deliverable
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ASoC: wm8962: Replace direct snd_soc_codec dapm field access
[deliverable/linux.git]
/
sound
/
soc
/
codecs
/
sta32x.c
diff --git
a/sound/soc/codecs/sta32x.c
b/sound/soc/codecs/sta32x.c
index 3a1343fa109b482860811baea1566d354e574399..ffe6187dce85773c65f586065ccec390c3ba5552 100644
(file)
--- a/
sound/soc/codecs/sta32x.c
+++ b/
sound/soc/codecs/sta32x.c
@@
-106,13
+106,11
@@
static const struct reg_default sta32x_regs[] = {
};
static const struct regmap_range sta32x_write_regs_range[] = {
};
static const struct regmap_range sta32x_write_regs_range[] = {
- regmap_reg_range(STA32X_CONFA, STA32X_AUTO2),
- regmap_reg_range(STA32X_C1CFG, STA32X_FDRC2),
+ regmap_reg_range(STA32X_CONFA, STA32X_FDRC2),
};
static const struct regmap_range sta32x_read_regs_range[] = {
};
static const struct regmap_range sta32x_read_regs_range[] = {
- regmap_reg_range(STA32X_CONFA, STA32X_AUTO2),
- regmap_reg_range(STA32X_C1CFG, STA32X_FDRC2),
+ regmap_reg_range(STA32X_CONFA, STA32X_FDRC2),
};
static const struct regmap_range sta32x_volatile_regs_range[] = {
};
static const struct regmap_range sta32x_volatile_regs_range[] = {
@@
-821,7
+819,7
@@
static int sta32x_set_bias_level(struct snd_soc_codec *codec,
break;
case SND_SOC_BIAS_STANDBY:
break;
case SND_SOC_BIAS_STANDBY:
- if (
codec->dapm.bias_level
== SND_SOC_BIAS_OFF) {
+ if (
snd_soc_codec_get_bias_level(codec)
== SND_SOC_BIAS_OFF) {
ret = regulator_bulk_enable(ARRAY_SIZE(sta32x->supplies),
sta32x->supplies);
if (ret != 0) {
ret = regulator_bulk_enable(ARRAY_SIZE(sta32x->supplies),
sta32x->supplies);
if (ret != 0) {
@@
-856,7
+854,6
@@
static int sta32x_set_bias_level(struct snd_soc_codec *codec,
sta32x->supplies);
break;
}
sta32x->supplies);
break;
}
- codec->dapm.bias_level = level;
return 0;
}
return 0;
}
@@
-972,7
+969,7
@@
static int sta32x_probe(struct snd_soc_codec *codec)
if (sta32x->pdata->needs_esd_watchdog)
INIT_DELAYED_WORK(&sta32x->watchdog_work, sta32x_watchdog);
if (sta32x->pdata->needs_esd_watchdog)
INIT_DELAYED_WORK(&sta32x->watchdog_work, sta32x_watchdog);
- s
ta32x_set
_bias_level(codec, SND_SOC_BIAS_STANDBY);
+ s
nd_soc_codec_force
_bias_level(codec, SND_SOC_BIAS_STANDBY);
/* Bias level configuration will have done an extra enable */
regulator_bulk_disable(ARRAY_SIZE(sta32x->supplies), sta32x->supplies);
/* Bias level configuration will have done an extra enable */
regulator_bulk_disable(ARRAY_SIZE(sta32x->supplies), sta32x->supplies);
This page took
0.027575 seconds
and
5
git commands to generate.