ASoC: cs35l56: Use pm_ptr()

Use pm_ptr() when setting the pointer to the dev_pm_ops so that it
will be NULL if CONFIG_PM is disabled. This allows the dev_pm_ops to be
compiled out in that case.

Signed-off-by: Richard Fitzgerald <rf@opensource.cirrus.com>
Link: https://lore.kernel.org/r/20230914150918.14505-2-rf@opensource.cirrus.com
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/codecs/cs35l56-i2c.c b/sound/soc/codecs/cs35l56-i2c.c
index 9f4f2f4f23f5668c846f2a051eee64c533deb38f..7063c400e89615df48a04ed50262e9cf2cbeaa95 100644 (file)
--- a/sound/soc/codecs/cs35l56-i2c.c
+++ b/sound/soc/codecs/cs35l56-i2c.c
@@ -73,7 +73,7 @@ MODULE_DEVICE_TABLE(acpi, cs35l56_asoc_acpi_match);
 static struct i2c_driver cs35l56_i2c_driver = {
        .driver = {
                .name           = "cs35l56",
-               .pm = &cs35l56_pm_ops_i2c_spi,
+               .pm = pm_ptr(&cs35l56_pm_ops_i2c_spi),
                .acpi_match_table = ACPI_PTR(cs35l56_asoc_acpi_match),
        },
        .id_table       = cs35l56_id_i2c,

diff --git a/sound/soc/codecs/cs35l56-sdw.c b/sound/soc/codecs/cs35l56-sdw.c
index b433266b784467f4e71416c5cba9bb85683ddc10..ab960a1c171e629e4becb57c653fdc4b917b026b 100644 (file)
--- a/sound/soc/codecs/cs35l56-sdw.c
+++ b/sound/soc/codecs/cs35l56-sdw.c
@@ -550,7 +550,7 @@ MODULE_DEVICE_TABLE(sdw, cs35l56_sdw_id);
 static struct sdw_driver cs35l56_sdw_driver = {
        .driver = {
                .name = "cs35l56",
-               .pm = &cs35l56_sdw_pm,
+               .pm = pm_ptr(&cs35l56_sdw_pm),
        },
        .probe = cs35l56_sdw_probe,
        .remove = cs35l56_sdw_remove,

diff --git a/sound/soc/codecs/cs35l56-spi.c b/sound/soc/codecs/cs35l56-spi.c
index 9962703915e1f146d682af2b05a2175014dcee9a..768ffe8213dc3dfd8c29cd2c46d5fca25a4551b3 100644 (file)
--- a/sound/soc/codecs/cs35l56-spi.c
+++ b/sound/soc/codecs/cs35l56-spi.c
@@ -70,7 +70,7 @@ MODULE_DEVICE_TABLE(acpi, cs35l56_asoc_acpi_match);
 static struct spi_driver cs35l56_spi_driver = {
        .driver = {
                .name           = "cs35l56",
-               .pm = &cs35l56_pm_ops_i2c_spi,
+               .pm = pm_ptr(&cs35l56_pm_ops_i2c_spi),
                .acpi_match_table = ACPI_PTR(cs35l56_asoc_acpi_match),
        },
        .id_table       = cs35l56_id_spi,