]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
can: rcar_can: Convert to DEFINE_SIMPLE_DEV_PM_OPS()
authorGeert Uytterhoeven <geert+renesas@glider.be>
Wed, 9 Jul 2025 18:36:21 +0000 (20:36 +0200)
committerMarc Kleine-Budde <mkl@pengutronix.de>
Fri, 11 Jul 2025 09:34:00 +0000 (11:34 +0200)
Convert the Renesas R-Car CAN driver from SIMPLE_DEV_PM_OPS() to
DEFINE_SIMPLE_DEV_PM_OPS() and pm_sleep_ptr().  This lets us drop the
__maybe_unused annotations from its suspend and resume callbacks, and
reduces kernel size in case CONFIG_PM or CONFIG_PM_SLEEP is disabled.

Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Link: https://patch.msgid.link/6ffe085f6e2548f53674dd11704b388cf4b303e9.1752086078.git.geert+renesas@glider.be
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
drivers/net/can/rcar/rcar_can.c

index 2b7dd359f27b7dd8b7015838e55379e8eee17ec5..64e664f5adcc4ac9126bd86ff77aa8322a1a8712 100644 (file)
@@ -834,7 +834,7 @@ static void rcar_can_remove(struct platform_device *pdev)
        free_candev(ndev);
 }
 
-static int __maybe_unused rcar_can_suspend(struct device *dev)
+static int rcar_can_suspend(struct device *dev)
 {
        struct net_device *ndev = dev_get_drvdata(dev);
        struct rcar_can_priv *priv = netdev_priv(ndev);
@@ -857,7 +857,7 @@ static int __maybe_unused rcar_can_suspend(struct device *dev)
        return 0;
 }
 
-static int __maybe_unused rcar_can_resume(struct device *dev)
+static int rcar_can_resume(struct device *dev)
 {
        struct net_device *ndev = dev_get_drvdata(dev);
        struct rcar_can_priv *priv = netdev_priv(ndev);
@@ -886,7 +886,8 @@ static int __maybe_unused rcar_can_resume(struct device *dev)
        return 0;
 }
 
-static SIMPLE_DEV_PM_OPS(rcar_can_pm_ops, rcar_can_suspend, rcar_can_resume);
+static DEFINE_SIMPLE_DEV_PM_OPS(rcar_can_pm_ops, rcar_can_suspend,
+                               rcar_can_resume);
 
 static const struct of_device_id rcar_can_of_table[] __maybe_unused = {
        { .compatible = "renesas,can-r8a7778" },
@@ -904,7 +905,7 @@ static struct platform_driver rcar_can_driver = {
        .driver = {
                .name = RCAR_CAN_DRV_NAME,
                .of_match_table = of_match_ptr(rcar_can_of_table),
-               .pm = &rcar_can_pm_ops,
+               .pm = pm_sleep_ptr(&rcar_can_pm_ops),
        },
        .probe = rcar_can_probe,
        .remove = rcar_can_remove,