ASoC: cs42l42: Remove unused runtime_suspend/runtime_resume callbacks
authorRichard Fitzgerald <rf@opensource.cirrus.com>
Mon, 18 Oct 2021 16:44:31 +0000 (17:44 +0100)
committerMark Brown <broonie@kernel.org>
Fri, 22 Oct 2021 00:55:25 +0000 (01:55 +0100)
The driver has runtime_suspend and runtime_resume callbacks, but
pm_runtime is never enabled so these functions won't be called. They
could not be used anyway because the runtime_suspend would cause jack
detect to stop working.

These functions are unused - delete them.

Signed-off-by: Richard Fitzgerald <rf@opensource.cirrus.com>
Link: https://lore.kernel.org/r/20211018164431.5871-1-rf@opensource.cirrus.com
Signed-off-by: Mark Brown <broonie@kernel.org>
sound/soc/codecs/cs42l42.c

index 5e4d6791756bcc01b4c002b054e890188805f2d1..0dbe4e23194b20d381d4e01177d4e5044ce60b6c 100644 (file)
@@ -25,7 +25,6 @@
 #include <linux/regulator/consumer.h>
 #include <linux/gpio/consumer.h>
 #include <linux/of_device.h>
-#include <linux/pm_runtime.h>
 #include <sound/core.h>
 #include <sound/pcm.h>
 #include <sound/pcm_params.h>
@@ -2175,59 +2174,12 @@ static int cs42l42_i2c_remove(struct i2c_client *i2c_client)
        if (i2c_client->irq)
                devm_free_irq(&i2c_client->dev, i2c_client->irq, cs42l42);
 
-       pm_runtime_suspend(&i2c_client->dev);
-       pm_runtime_disable(&i2c_client->dev);
-
-       return 0;
-}
-
-#ifdef CONFIG_PM
-static int cs42l42_runtime_suspend(struct device *dev)
-{
-       struct cs42l42_private *cs42l42 = dev_get_drvdata(dev);
-
-       regcache_cache_only(cs42l42->regmap, true);
-       regcache_mark_dirty(cs42l42->regmap);
-
-       /* Hold down reset */
        gpiod_set_value_cansleep(cs42l42->reset_gpio, 0);
-
-       /* remove power */
-       regulator_bulk_disable(ARRAY_SIZE(cs42l42->supplies),
-                               cs42l42->supplies);
+       regulator_bulk_disable(ARRAY_SIZE(cs42l42->supplies), cs42l42->supplies);
 
        return 0;
 }
 
-static int cs42l42_runtime_resume(struct device *dev)
-{
-       struct cs42l42_private *cs42l42 = dev_get_drvdata(dev);
-       int ret;
-
-       /* Enable power */
-       ret = regulator_bulk_enable(ARRAY_SIZE(cs42l42->supplies),
-                                       cs42l42->supplies);
-       if (ret != 0) {
-               dev_err(dev, "Failed to enable supplies: %d\n",
-                       ret);
-               return ret;
-       }
-
-       gpiod_set_value_cansleep(cs42l42->reset_gpio, 1);
-       usleep_range(CS42L42_BOOT_TIME_US, CS42L42_BOOT_TIME_US * 2);
-
-       regcache_cache_only(cs42l42->regmap, false);
-       regcache_sync(cs42l42->regmap);
-
-       return 0;
-}
-#endif
-
-static const struct dev_pm_ops cs42l42_runtime_pm = {
-       SET_RUNTIME_PM_OPS(cs42l42_runtime_suspend, cs42l42_runtime_resume,
-                          NULL)
-};
-
 #ifdef CONFIG_OF
 static const struct of_device_id cs42l42_of_match[] = {
        { .compatible = "cirrus,cs42l42", },
@@ -2254,7 +2206,6 @@ MODULE_DEVICE_TABLE(i2c, cs42l42_id);
 static struct i2c_driver cs42l42_i2c_driver = {
        .driver = {
                .name = "cs42l42",
-               .pm = &cs42l42_runtime_pm,
                .of_match_table = of_match_ptr(cs42l42_of_match),
                .acpi_match_table = ACPI_PTR(cs42l42_acpi_match),
                },