Skip to content

Commit 81ef202

Browse files
bijudasbroonie
authored andcommitted
spi: rpc-if: Drop deprecated SIMPLE_DEV_PM_OPS
Replace SIMPLE_DEV_PM_OPS->DEFINE_SIMPLE_DEV_PM_OPS macro and use pm_sleep_ptr(). This lets us drop the check for CONFIG_PM_SLEEP, and reduces kernel size in case CONFIG_PM or CONFIG_PM_SLEEP is disabled, while increasing build coverage. Also drop the __maybe_unused attribute from PM functions. Signed-off-by: Biju Das <biju.das.jz@bp.renesas.com> Link: https://patch.msgid.link/20250921112649.104516-2-biju.das.jz@bp.renesas.com Signed-off-by: Mark Brown <broonie@kernel.org>
1 parent 07e27ad commit 81ef202

File tree

1 file changed

+4
-6
lines changed

1 file changed

+4
-6
lines changed

drivers/spi/spi-rpc-if.c

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -196,21 +196,21 @@ static void rpcif_spi_remove(struct platform_device *pdev)
196196
pm_runtime_disable(rpc->dev);
197197
}
198198

199-
static int __maybe_unused rpcif_spi_suspend(struct device *dev)
199+
static int rpcif_spi_suspend(struct device *dev)
200200
{
201201
struct spi_controller *ctlr = dev_get_drvdata(dev);
202202

203203
return spi_controller_suspend(ctlr);
204204
}
205205

206-
static int __maybe_unused rpcif_spi_resume(struct device *dev)
206+
static int rpcif_spi_resume(struct device *dev)
207207
{
208208
struct spi_controller *ctlr = dev_get_drvdata(dev);
209209

210210
return spi_controller_resume(ctlr);
211211
}
212212

213-
static SIMPLE_DEV_PM_OPS(rpcif_spi_pm_ops, rpcif_spi_suspend, rpcif_spi_resume);
213+
static DEFINE_SIMPLE_DEV_PM_OPS(rpcif_spi_pm_ops, rpcif_spi_suspend, rpcif_spi_resume);
214214

215215
static const struct platform_device_id rpc_if_spi_id_table[] = {
216216
{ .name = "rpc-if-spi" },
@@ -224,9 +224,7 @@ static struct platform_driver rpcif_spi_driver = {
224224
.id_table = rpc_if_spi_id_table,
225225
.driver = {
226226
.name = "rpc-if-spi",
227-
#ifdef CONFIG_PM_SLEEP
228-
.pm = &rpcif_spi_pm_ops,
229-
#endif
227+
.pm = pm_sleep_ptr(&rpcif_spi_pm_ops),
230228
},
231229
};
232230
module_platform_driver(rpcif_spi_driver);

0 commit comments

Comments
 (0)