summaryrefslogtreecommitdiff
path: root/sound/soc/xtensa
diff options
context:
space:
mode:
Diffstat (limited to 'sound/soc/xtensa')
-rw-r--r--sound/soc/xtensa/Makefile2
-rw-r--r--sound/soc/xtensa/xtfpga-i2s.c8
2 files changed, 5 insertions, 5 deletions
diff --git a/sound/soc/xtensa/Makefile b/sound/soc/xtensa/Makefile
index b8707f63c4ae..be4e847d1b20 100644
--- a/sound/soc/xtensa/Makefile
+++ b/sound/soc/xtensa/Makefile
@@ -1,4 +1,4 @@
# SPDX-License-Identifier: GPL-2.0-only
-snd-soc-xtfpga-i2s-objs := xtfpga-i2s.o
+snd-soc-xtfpga-i2s-y := xtfpga-i2s.o
obj-$(CONFIG_SND_SOC_XTFPGA_I2S) += snd-soc-xtfpga-i2s.o
diff --git a/sound/soc/xtensa/xtfpga-i2s.c b/sound/soc/xtensa/xtfpga-i2s.c
index 6e2b72d7a65d..678ded059b95 100644
--- a/sound/soc/xtensa/xtfpga-i2s.c
+++ b/sound/soc/xtensa/xtfpga-i2s.c
@@ -629,17 +629,17 @@ MODULE_DEVICE_TABLE(of, xtfpga_i2s_of_match);
#endif
static const struct dev_pm_ops xtfpga_i2s_pm_ops = {
- SET_RUNTIME_PM_OPS(xtfpga_i2s_runtime_suspend,
- xtfpga_i2s_runtime_resume, NULL)
+ RUNTIME_PM_OPS(xtfpga_i2s_runtime_suspend,
+ xtfpga_i2s_runtime_resume, NULL)
};
static struct platform_driver xtfpga_i2s_driver = {
.probe = xtfpga_i2s_probe,
- .remove_new = xtfpga_i2s_remove,
+ .remove = xtfpga_i2s_remove,
.driver = {
.name = "xtfpga-i2s",
.of_match_table = of_match_ptr(xtfpga_i2s_of_match),
- .pm = &xtfpga_i2s_pm_ops,
+ .pm = pm_ptr(&xtfpga_i2s_pm_ops),
},
};