aboutsummaryrefslogtreecommitdiffstats
path: root/sound/soc/codecs/wm8350.c
diff options
context:
space:
mode:
Diffstat (limited to 'sound/soc/codecs/wm8350.c')
-rw-r--r--sound/soc/codecs/wm8350.c21
1 files changed, 1 insertions, 20 deletions
diff --git a/sound/soc/codecs/wm8350.c b/sound/soc/codecs/wm8350.c
index 628ec774cf22..87f664b9cc7d 100644
--- a/sound/soc/codecs/wm8350.c
+++ b/sound/soc/codecs/wm8350.c
@@ -1242,19 +1242,6 @@ static int wm8350_set_bias_level(struct snd_soc_codec *codec,
1242 return 0; 1242 return 0;
1243} 1243}
1244 1244
1245static int wm8350_suspend(struct snd_soc_codec *codec)
1246{
1247 wm8350_set_bias_level(codec, SND_SOC_BIAS_OFF);
1248 return 0;
1249}
1250
1251static int wm8350_resume(struct snd_soc_codec *codec)
1252{
1253 wm8350_set_bias_level(codec, SND_SOC_BIAS_STANDBY);
1254
1255 return 0;
1256}
1257
1258static void wm8350_hp_work(struct wm8350_data *priv, 1245static void wm8350_hp_work(struct wm8350_data *priv,
1259 struct wm8350_jack_data *jack, 1246 struct wm8350_jack_data *jack,
1260 u16 mask) 1247 u16 mask)
@@ -1565,9 +1552,6 @@ static int wm8350_codec_probe(struct snd_soc_codec *codec)
1565 wm8350_register_irq(wm8350, WM8350_IRQ_CODEC_MICD, 1552 wm8350_register_irq(wm8350, WM8350_IRQ_CODEC_MICD,
1566 wm8350_mic_handler, 0, "Microphone detect", priv); 1553 wm8350_mic_handler, 0, "Microphone detect", priv);
1567 1554
1568
1569 wm8350_set_bias_level(codec, SND_SOC_BIAS_STANDBY);
1570
1571 return 0; 1555 return 0;
1572} 1556}
1573 1557
@@ -1596,8 +1580,6 @@ static int wm8350_codec_remove(struct snd_soc_codec *codec)
1596 * wait for its completion */ 1580 * wait for its completion */
1597 flush_delayed_work(&codec->dapm.delayed_work); 1581 flush_delayed_work(&codec->dapm.delayed_work);
1598 1582
1599 wm8350_set_bias_level(codec, SND_SOC_BIAS_OFF);
1600
1601 wm8350_clear_bits(wm8350, WM8350_POWER_MGMT_5, WM8350_CODEC_ENA); 1583 wm8350_clear_bits(wm8350, WM8350_POWER_MGMT_5, WM8350_CODEC_ENA);
1602 1584
1603 return 0; 1585 return 0;
@@ -1613,10 +1595,9 @@ static struct regmap *wm8350_get_regmap(struct device *dev)
1613static struct snd_soc_codec_driver soc_codec_dev_wm8350 = { 1595static struct snd_soc_codec_driver soc_codec_dev_wm8350 = {
1614 .probe = wm8350_codec_probe, 1596 .probe = wm8350_codec_probe,
1615 .remove = wm8350_codec_remove, 1597 .remove = wm8350_codec_remove,
1616 .suspend = wm8350_suspend,
1617 .resume = wm8350_resume,
1618 .get_regmap = wm8350_get_regmap, 1598 .get_regmap = wm8350_get_regmap,
1619 .set_bias_level = wm8350_set_bias_level, 1599 .set_bias_level = wm8350_set_bias_level,
1600 .suspend_bias_off = true,
1620 1601
1621 .controls = wm8350_snd_controls, 1602 .controls = wm8350_snd_controls,
1622 .num_controls = ARRAY_SIZE(wm8350_snd_controls), 1603 .num_controls = ARRAY_SIZE(wm8350_snd_controls),