Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

ASoC: qcom: Convert to SYSTEM_SLEEP_PM_OPS()

Use the newer SYSTEM_SLEEP_PM_OPS() macro instead of
SET_SYSTEM_SLEEP_PM_OPS() together with pm_ptr(), which allows us to
drop ugly __maybe_unused attributes.

This optimizes slightly when CONFIG_PM is disabled, too.

Cc: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Reviewed-by: Charles Keepax <ckeepax@opensource.cirrus.com>
Link: https://patch.msgid.link/20250317095603.20073-74-tiwai@suse.de
Signed-off-by: Mark Brown <broonie@kernel.org>

authored by

Takashi Iwai and committed by
Mark Brown
23a6b07c bd854010

+8 -8
+4 -4
sound/soc/qcom/lpass-sc7180.c
··· 160 160 return 0; 161 161 } 162 162 163 - static int __maybe_unused sc7180_lpass_dev_resume(struct device *dev) 163 + static int sc7180_lpass_dev_resume(struct device *dev) 164 164 { 165 165 struct lpass_data *drvdata = dev_get_drvdata(dev); 166 166 167 167 return clk_bulk_prepare_enable(drvdata->num_clks, drvdata->clks); 168 168 } 169 169 170 - static int __maybe_unused sc7180_lpass_dev_suspend(struct device *dev) 170 + static int sc7180_lpass_dev_suspend(struct device *dev) 171 171 { 172 172 struct lpass_data *drvdata = dev_get_drvdata(dev); 173 173 ··· 176 176 } 177 177 178 178 static const struct dev_pm_ops sc7180_lpass_pm_ops = { 179 - SET_SYSTEM_SLEEP_PM_OPS(sc7180_lpass_dev_suspend, sc7180_lpass_dev_resume) 179 + SYSTEM_SLEEP_PM_OPS(sc7180_lpass_dev_suspend, sc7180_lpass_dev_resume) 180 180 }; 181 181 182 182 static const struct lpass_variant sc7180_data = { ··· 312 312 .driver = { 313 313 .name = "sc7180-lpass-cpu", 314 314 .of_match_table = of_match_ptr(sc7180_lpass_cpu_device_id), 315 - .pm = &sc7180_lpass_pm_ops, 315 + .pm = pm_ptr(&sc7180_lpass_pm_ops), 316 316 }, 317 317 .probe = asoc_qcom_lpass_cpu_platform_probe, 318 318 .remove = asoc_qcom_lpass_cpu_platform_remove,
+4 -4
sound/soc/qcom/lpass-sc7280.c
··· 233 233 return 0; 234 234 } 235 235 236 - static int __maybe_unused sc7280_lpass_dev_resume(struct device *dev) 236 + static int sc7280_lpass_dev_resume(struct device *dev) 237 237 { 238 238 struct lpass_data *drvdata = dev_get_drvdata(dev); 239 239 240 240 return clk_bulk_prepare_enable(drvdata->num_clks, drvdata->clks); 241 241 } 242 242 243 - static int __maybe_unused sc7280_lpass_dev_suspend(struct device *dev) 243 + static int sc7280_lpass_dev_suspend(struct device *dev) 244 244 { 245 245 struct lpass_data *drvdata = dev_get_drvdata(dev); 246 246 ··· 249 249 } 250 250 251 251 static const struct dev_pm_ops sc7280_lpass_pm_ops = { 252 - SET_SYSTEM_SLEEP_PM_OPS(sc7280_lpass_dev_suspend, sc7280_lpass_dev_resume) 252 + SYSTEM_SLEEP_PM_OPS(sc7280_lpass_dev_suspend, sc7280_lpass_dev_resume) 253 253 }; 254 254 255 255 static const struct lpass_variant sc7280_data = { ··· 442 442 .driver = { 443 443 .name = "sc7280-lpass-cpu", 444 444 .of_match_table = of_match_ptr(sc7280_lpass_cpu_device_id), 445 - .pm = &sc7280_lpass_pm_ops, 445 + .pm = pm_ptr(&sc7280_lpass_pm_ops), 446 446 }, 447 447 .probe = asoc_qcom_lpass_cpu_platform_probe, 448 448 .remove = asoc_qcom_lpass_cpu_platform_remove,