ASoC: rt5682: Implement remove callback

[ Upstream commit 87b42abae99d3d851aec64cd4d0f7def8113950e ]

Let's implement a remove callback for this driver that's similar to the
shutdown hook, but also disables the regulators before they're put by
devm code.

Cc: Jairaj Arava <jairaj.arava@intel.com>
Cc: Sathyanarayana Nujella <sathyanarayana.nujella@intel.com>
Cc: Pierre-Louis Bossart <pierre-louis.bossart@intel.com>
Cc: Shuming Fan <shumingf@realtek.com>
Cc: Ranjani Sridharan <ranjani.sridharan@linux.intel.com>
Signed-off-by: Stephen Boyd <swboyd@chromium.org>
Link: https://lore.kernel.org/r/20210508075151.1626903-2-swboyd@chromium.org
Signed-off-by: Mark Brown <broonie@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/sound/soc/codecs/rt5682-i2c.c b/sound/soc/codecs/rt5682-i2c.c
index 547445d..e2b4b10 100644 (file)
--- a/sound/soc/codecs/rt5682-i2c.c
+++ b/sound/soc/codecs/rt5682-i2c.c
@@ -275,6 +275,16 @@ static void rt5682_i2c_shutdown(struct i2c_client *client)
        rt5682_reset(rt5682);
 }
 
+static int rt5682_i2c_remove(struct i2c_client *client)
+{
+       struct rt5682_priv *rt5682 = i2c_get_clientdata(client);
+
+       rt5682_i2c_shutdown(client);
+       regulator_bulk_disable(ARRAY_SIZE(rt5682->supplies), rt5682->supplies);
+
+       return 0;
+}
+
 static const struct of_device_id rt5682_of_match[] = {
        {.compatible = "realtek,rt5682i"},
        {},
@@ -301,6 +311,7 @@ static struct i2c_driver rt5682_i2c_driver = {
                .probe_type = PROBE_PREFER_ASYNCHRONOUS,
        },
        .probe = rt5682_i2c_probe,
+       .remove = rt5682_i2c_remove,
        .shutdown = rt5682_i2c_shutdown,
        .id_table = rt5682_i2c_id,
 };