diff options
| author | Mark Brown <broonie@kernel.org> | 2018-12-13 17:36:46 +0300 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2018-12-13 17:36:46 +0300 |
| commit | 8fe8915b6c0b5298fa547be21957b3860c39c46e (patch) | |
| tree | f16772eef6506fa40fe43f53b416cd4cd4eccf6b /sound/soc/codecs/pcm3168a.c | |
| parent | 1b46ed96961db1a826b3e5cadac18c7c4857f054 (diff) | |
| parent | a01b8d1d24451bfc00d3a975d107f9b1590bf826 (diff) | |
| download | linux-8fe8915b6c0b5298fa547be21957b3860c39c46e.tar.xz | |
Merge branch 'for-4.20' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into asoc-4.21 intel dep
Diffstat (limited to 'sound/soc/codecs/pcm3168a.c')
| -rw-r--r-- | sound/soc/codecs/pcm3168a.c | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/sound/soc/codecs/pcm3168a.c b/sound/soc/codecs/pcm3168a.c index 115f21658222..08d3fe192e65 100644 --- a/sound/soc/codecs/pcm3168a.c +++ b/sound/soc/codecs/pcm3168a.c @@ -758,15 +758,22 @@ err_clk: } EXPORT_SYMBOL_GPL(pcm3168a_probe); -void pcm3168a_remove(struct device *dev) +static void pcm3168a_disable(struct device *dev) { struct pcm3168a_priv *pcm3168a = dev_get_drvdata(dev); - pm_runtime_disable(dev); regulator_bulk_disable(ARRAY_SIZE(pcm3168a->supplies), - pcm3168a->supplies); + pcm3168a->supplies); clk_disable_unprepare(pcm3168a->scki); } + +void pcm3168a_remove(struct device *dev) +{ + pm_runtime_disable(dev); +#ifndef CONFIG_PM + pcm3168a_disable(dev); +#endif +} EXPORT_SYMBOL_GPL(pcm3168a_remove); #ifdef CONFIG_PM @@ -821,10 +828,7 @@ static int pcm3168a_rt_suspend(struct device *dev) regcache_cache_only(pcm3168a->regmap, true); - regulator_bulk_disable(ARRAY_SIZE(pcm3168a->supplies), - pcm3168a->supplies); - - clk_disable_unprepare(pcm3168a->scki); + pcm3168a_disable(dev); return 0; } |