Skip to content

Commit 23a6b07

Browse files
tiwaibroonie
authored andcommitted
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>
1 parent bd85401 commit 23a6b07

2 files changed

Lines changed: 8 additions & 8 deletions

File tree

sound/soc/qcom/lpass-sc7180.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -160,14 +160,14 @@ static int sc7180_lpass_exit(struct platform_device *pdev)
160160
return 0;
161161
}
162162

163-
static int __maybe_unused sc7180_lpass_dev_resume(struct device *dev)
163+
static int sc7180_lpass_dev_resume(struct device *dev)
164164
{
165165
struct lpass_data *drvdata = dev_get_drvdata(dev);
166166

167167
return clk_bulk_prepare_enable(drvdata->num_clks, drvdata->clks);
168168
}
169169

170-
static int __maybe_unused sc7180_lpass_dev_suspend(struct device *dev)
170+
static int sc7180_lpass_dev_suspend(struct device *dev)
171171
{
172172
struct lpass_data *drvdata = dev_get_drvdata(dev);
173173

@@ -176,7 +176,7 @@ static int __maybe_unused sc7180_lpass_dev_suspend(struct device *dev)
176176
}
177177

178178
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)
180180
};
181181

182182
static const struct lpass_variant sc7180_data = {
@@ -312,7 +312,7 @@ static struct platform_driver sc7180_lpass_cpu_platform_driver = {
312312
.driver = {
313313
.name = "sc7180-lpass-cpu",
314314
.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),
316316
},
317317
.probe = asoc_qcom_lpass_cpu_platform_probe,
318318
.remove = asoc_qcom_lpass_cpu_platform_remove,

sound/soc/qcom/lpass-sc7280.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -233,14 +233,14 @@ static int sc7280_lpass_exit(struct platform_device *pdev)
233233
return 0;
234234
}
235235

236-
static int __maybe_unused sc7280_lpass_dev_resume(struct device *dev)
236+
static int sc7280_lpass_dev_resume(struct device *dev)
237237
{
238238
struct lpass_data *drvdata = dev_get_drvdata(dev);
239239

240240
return clk_bulk_prepare_enable(drvdata->num_clks, drvdata->clks);
241241
}
242242

243-
static int __maybe_unused sc7280_lpass_dev_suspend(struct device *dev)
243+
static int sc7280_lpass_dev_suspend(struct device *dev)
244244
{
245245
struct lpass_data *drvdata = dev_get_drvdata(dev);
246246

@@ -249,7 +249,7 @@ static int __maybe_unused sc7280_lpass_dev_suspend(struct device *dev)
249249
}
250250

251251
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)
253253
};
254254

255255
static const struct lpass_variant sc7280_data = {
@@ -442,7 +442,7 @@ static struct platform_driver sc7280_lpass_cpu_platform_driver = {
442442
.driver = {
443443
.name = "sc7280-lpass-cpu",
444444
.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),
446446
},
447447
.probe = asoc_qcom_lpass_cpu_platform_probe,
448448
.remove = asoc_qcom_lpass_cpu_platform_remove,

0 commit comments

Comments
 (0)