mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
synced 2026-02-21 23:29:26 -05:00
ASoC: ak4458: Convert to RUNTIME_PM_OPS() & co
Use the newer RUNTIME_PM_OPS() and SYSTEM_SLEEP_PM_OPS() macros instead of SET_RUNTIME_PM_OPS() and SET_SYSTEM_SLEEP_PM_OPS() together with pm_ptr(), which allows us dropping ugly __maybe_unused attributes and CONFIG_PM ifdefs. This optimizes slightly when CONFIG_PM is disabled, too. Signed-off-by: Takashi Iwai <tiwai@suse.de> Reviewed-by: Charles Keepax <ckeepax@opensource.cirrus.com> Link: https://patch.msgid.link/20250317095603.20073-4-tiwai@suse.de Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
@@ -639,8 +639,7 @@ static void ak4458_reset(struct ak4458_priv *ak4458, bool active)
|
||||
}
|
||||
}
|
||||
|
||||
#ifdef CONFIG_PM
|
||||
static int __maybe_unused ak4458_runtime_suspend(struct device *dev)
|
||||
static int ak4458_runtime_suspend(struct device *dev)
|
||||
{
|
||||
struct ak4458_priv *ak4458 = dev_get_drvdata(dev);
|
||||
|
||||
@@ -656,7 +655,7 @@ static int __maybe_unused ak4458_runtime_suspend(struct device *dev)
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int __maybe_unused ak4458_runtime_resume(struct device *dev)
|
||||
static int ak4458_runtime_resume(struct device *dev)
|
||||
{
|
||||
struct ak4458_priv *ak4458 = dev_get_drvdata(dev);
|
||||
int ret;
|
||||
@@ -678,7 +677,6 @@ static int __maybe_unused ak4458_runtime_resume(struct device *dev)
|
||||
|
||||
return regcache_sync(ak4458->regmap);
|
||||
}
|
||||
#endif /* CONFIG_PM */
|
||||
|
||||
static const struct snd_soc_component_driver soc_codec_dev_ak4458 = {
|
||||
.controls = ak4458_snd_controls,
|
||||
@@ -727,9 +725,8 @@ static const struct ak4458_drvdata ak4497_drvdata = {
|
||||
};
|
||||
|
||||
static const struct dev_pm_ops ak4458_pm = {
|
||||
SET_RUNTIME_PM_OPS(ak4458_runtime_suspend, ak4458_runtime_resume, NULL)
|
||||
SET_SYSTEM_SLEEP_PM_OPS(pm_runtime_force_suspend,
|
||||
pm_runtime_force_resume)
|
||||
RUNTIME_PM_OPS(ak4458_runtime_suspend, ak4458_runtime_resume, NULL)
|
||||
SYSTEM_SLEEP_PM_OPS(pm_runtime_force_suspend, pm_runtime_force_resume)
|
||||
};
|
||||
|
||||
static int ak4458_i2c_probe(struct i2c_client *i2c)
|
||||
@@ -805,7 +802,7 @@ MODULE_DEVICE_TABLE(of, ak4458_of_match);
|
||||
static struct i2c_driver ak4458_i2c_driver = {
|
||||
.driver = {
|
||||
.name = "ak4458",
|
||||
.pm = &ak4458_pm,
|
||||
.pm = pm_ptr(&ak4458_pm),
|
||||
.of_match_table = ak4458_of_match,
|
||||
},
|
||||
.probe = ak4458_i2c_probe,
|
||||
|
||||
Reference in New Issue
Block a user