Commit 12e102b1 authored by Ricardo Rivera-Matos's avatar Ricardo Rivera-Matos Committed by Mark Brown

ASoC: cs35l45: Use modern pm_ops

Make use of the recently introduced EXPORT_GPL_DEV_PM_OPS() macro, to
conditionally export the runtime/system PM functions.

Replace the old SET_{RUNTIME,SYSTEM_SLEEP,NOIRQ_SYSTEM_SLEEP}_PM_OPS()
helpers with their modern alternatives and get rid of the now
unnecessary '__maybe_unused' annotations on all PM functions.

Additionally, use the pm_ptr() macro to fix the following errors when
building with CONFIG_PM disabled:
Signed-off-by: default avatarRicardo Rivera-Matos <rriveram@opensource.cirrus.com>
Acked-by: default avatarCharles Keepax <ckeepax@opensource.cirrus.com>
Link: https://lore.kernel.org/r/20231206160318.1255034-2-rriveram@opensource.cirrus.comSigned-off-by: default avatarMark Brown <broonie@kernel.org>
parent d20d3675
...@@ -62,7 +62,7 @@ static struct i2c_driver cs35l45_i2c_driver = { ...@@ -62,7 +62,7 @@ static struct i2c_driver cs35l45_i2c_driver = {
.driver = { .driver = {
.name = "cs35l45", .name = "cs35l45",
.of_match_table = cs35l45_of_match, .of_match_table = cs35l45_of_match,
.pm = &cs35l45_pm_ops, .pm = pm_ptr(&cs35l45_pm_ops),
}, },
.id_table = cs35l45_id_i2c, .id_table = cs35l45_id_i2c,
.probe = cs35l45_i2c_probe, .probe = cs35l45_i2c_probe,
......
...@@ -64,7 +64,7 @@ static struct spi_driver cs35l45_spi_driver = { ...@@ -64,7 +64,7 @@ static struct spi_driver cs35l45_spi_driver = {
.driver = { .driver = {
.name = "cs35l45", .name = "cs35l45",
.of_match_table = cs35l45_of_match, .of_match_table = cs35l45_of_match,
.pm = &cs35l45_pm_ops, .pm = pm_ptr(&cs35l45_pm_ops),
}, },
.id_table = cs35l45_id_spi, .id_table = cs35l45_id_spi,
.probe = cs35l45_spi_probe, .probe = cs35l45_spi_probe,
......
...@@ -982,7 +982,7 @@ static int cs35l45_exit_hibernate(struct cs35l45_private *cs35l45) ...@@ -982,7 +982,7 @@ static int cs35l45_exit_hibernate(struct cs35l45_private *cs35l45)
return -ETIMEDOUT; return -ETIMEDOUT;
} }
static int __maybe_unused cs35l45_runtime_suspend(struct device *dev) static int cs35l45_runtime_suspend(struct device *dev)
{ {
struct cs35l45_private *cs35l45 = dev_get_drvdata(dev); struct cs35l45_private *cs35l45 = dev_get_drvdata(dev);
...@@ -999,7 +999,7 @@ static int __maybe_unused cs35l45_runtime_suspend(struct device *dev) ...@@ -999,7 +999,7 @@ static int __maybe_unused cs35l45_runtime_suspend(struct device *dev)
return 0; return 0;
} }
static int __maybe_unused cs35l45_runtime_resume(struct device *dev) static int cs35l45_runtime_resume(struct device *dev)
{ {
struct cs35l45_private *cs35l45 = dev_get_drvdata(dev); struct cs35l45_private *cs35l45 = dev_get_drvdata(dev);
int ret; int ret;
...@@ -1466,10 +1466,9 @@ void cs35l45_remove(struct cs35l45_private *cs35l45) ...@@ -1466,10 +1466,9 @@ void cs35l45_remove(struct cs35l45_private *cs35l45)
} }
EXPORT_SYMBOL_NS_GPL(cs35l45_remove, SND_SOC_CS35L45); EXPORT_SYMBOL_NS_GPL(cs35l45_remove, SND_SOC_CS35L45);
const struct dev_pm_ops cs35l45_pm_ops = { EXPORT_GPL_DEV_PM_OPS(cs35l45_pm_ops) = {
SET_RUNTIME_PM_OPS(cs35l45_runtime_suspend, cs35l45_runtime_resume, NULL) RUNTIME_PM_OPS(cs35l45_runtime_suspend, cs35l45_runtime_resume, NULL)
}; };
EXPORT_SYMBOL_NS_GPL(cs35l45_pm_ops, SND_SOC_CS35L45);
MODULE_DESCRIPTION("ASoC CS35L45 driver"); MODULE_DESCRIPTION("ASoC CS35L45 driver");
MODULE_AUTHOR("James Schulman, Cirrus Logic Inc, <james.schulman@cirrus.com>"); MODULE_AUTHOR("James Schulman, Cirrus Logic Inc, <james.schulman@cirrus.com>");
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment