diff options
Diffstat (limited to 'sound/soc/codecs/da732x.c')
-rw-r--r-- | sound/soc/codecs/da732x.c | 27 |
1 files changed, 1 insertions, 26 deletions
diff --git a/sound/soc/codecs/da732x.c b/sound/soc/codecs/da732x.c index 2fae31cb0067..61b2f9a2eef1 100644 --- a/sound/soc/codecs/da732x.c +++ b/sound/soc/codecs/da732x.c | |||
@@ -35,7 +35,6 @@ | |||
35 | 35 | ||
36 | struct da732x_priv { | 36 | struct da732x_priv { |
37 | struct regmap *regmap; | 37 | struct regmap *regmap; |
38 | struct snd_soc_codec *codec; | ||
39 | 38 | ||
40 | unsigned int sysclk; | 39 | unsigned int sysclk; |
41 | bool pll_en; | 40 | bool pll_en; |
@@ -217,7 +216,7 @@ static void da732x_set_charge_pump(struct snd_soc_codec *codec, int state) | |||
217 | snd_soc_write(codec, DA732X_REG_CP_CTRL1, DA723X_CP_DIS); | 216 | snd_soc_write(codec, DA732X_REG_CP_CTRL1, DA723X_CP_DIS); |
218 | break; | 217 | break; |
219 | default: | 218 | default: |
220 | pr_err(KERN_ERR "Wrong charge pump state\n"); | 219 | pr_err("Wrong charge pump state\n"); |
221 | break; | 220 | break; |
222 | } | 221 | } |
223 | } | 222 | } |
@@ -1508,31 +1507,7 @@ static int da732x_set_bias_level(struct snd_soc_codec *codec, | |||
1508 | return 0; | 1507 | return 0; |
1509 | } | 1508 | } |
1510 | 1509 | ||
1511 | static int da732x_probe(struct snd_soc_codec *codec) | ||
1512 | { | ||
1513 | struct da732x_priv *da732x = snd_soc_codec_get_drvdata(codec); | ||
1514 | struct snd_soc_dapm_context *dapm = &codec->dapm; | ||
1515 | |||
1516 | da732x->codec = codec; | ||
1517 | |||
1518 | dapm->idle_bias_off = false; | ||
1519 | |||
1520 | da732x_set_bias_level(codec, SND_SOC_BIAS_STANDBY); | ||
1521 | |||
1522 | return 0; | ||
1523 | } | ||
1524 | |||
1525 | static int da732x_remove(struct snd_soc_codec *codec) | ||
1526 | { | ||
1527 | |||
1528 | da732x_set_bias_level(codec, SND_SOC_BIAS_OFF); | ||
1529 | |||
1530 | return 0; | ||
1531 | } | ||
1532 | |||
1533 | static struct snd_soc_codec_driver soc_codec_dev_da732x = { | 1510 | static struct snd_soc_codec_driver soc_codec_dev_da732x = { |
1534 | .probe = da732x_probe, | ||
1535 | .remove = da732x_remove, | ||
1536 | .set_bias_level = da732x_set_bias_level, | 1511 | .set_bias_level = da732x_set_bias_level, |
1537 | .controls = da732x_snd_controls, | 1512 | .controls = da732x_snd_controls, |
1538 | .num_controls = ARRAY_SIZE(da732x_snd_controls), | 1513 | .num_controls = ARRAY_SIZE(da732x_snd_controls), |