niansa-misc/linux
1
0
Fork 0
mirror of synced 2025-03-06 20:59:54 +01:00
Code Issues Projects Releases Packages Wiki Activity

ASoC: cs42l42: Remove unused runtime_suspend/runtime_resume callbacks

Browse source 
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>
This commit is contained in:
Richard Fitzgerald 2021-10-18 17:44:31 +01:00 • committed by Mark Brown
parent 6cace797f1
commit c778c01d3e
No known key found for this signature in database
GPG key ID: 24D68B725D5487D0
1 changed files with 1 additions and 50 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

51
sound/soc/codecs/cs42l42.c
View file

@ -25,7 +25,6 @@
#include <linux/regulator/consumer.h> #include <linux/regulator/consumer.h>
#include <linux/gpio/consumer.h> #include <linux/gpio/consumer.h>
#include <linux/of_device.h> #include <linux/of_device.h>
#include <linux/pm_runtime.h>
#include <sound/core.h> #include <sound/core.h>
#include <sound/pcm.h> #include <sound/pcm.h>
#include <sound/pcm_params.h> #include <sound/pcm_params.h>
@ -2175,59 +2174,12 @@ static int cs42l42_i2c_remove(struct i2c_client *i2c_client)
if (i2c_client->irq) if (i2c_client->irq)
devm_free_irq(&i2c_client->dev, i2c_client->irq, cs42l42); 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); gpiod_set_value_cansleep(cs42l42->reset_gpio, 0);
regulator_bulk_disable(ARRAY_SIZE(cs42l42->supplies), cs42l42->supplies);
/* remove power */
regulator_bulk_disable(ARRAY_SIZE(cs42l42->supplies),
cs42l42->supplies);
return 0; 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 #ifdef CONFIG_OF
static const struct of_device_id cs42l42_of_match[] = { static const struct of_device_id cs42l42_of_match[] = {
{ .compatible = "cirrus,cs42l42", }, { .compatible = "cirrus,cs42l42", },
@ -2254,7 +2206,6 @@ MODULE_DEVICE_TABLE(i2c, cs42l42_id);
static struct i2c_driver cs42l42_i2c_driver = { static struct i2c_driver cs42l42_i2c_driver = {
.driver = { .driver = {
.name = "cs42l42", .name = "cs42l42",
.pm = &cs42l42_runtime_pm,
.of_match_table = of_match_ptr(cs42l42_of_match), .of_match_table = of_match_ptr(cs42l42_of_match),
.acpi_match_table = ACPI_PTR(cs42l42_acpi_match), .acpi_match_table = ACPI_PTR(cs42l42_acpi_match),
}, },