Skip to content

Commit 25883e2

Browse files
geertumarckleinebudde
authored andcommitted
can: rcar_can: Convert to DEFINE_SIMPLE_DEV_PM_OPS()
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>
1 parent 0f26870 commit 25883e2

File tree

1 file changed

+5
-4
lines changed

1 file changed

+5
-4
lines changed

drivers/net/can/rcar/rcar_can.c

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -834,7 +834,7 @@ static void rcar_can_remove(struct platform_device *pdev)
834834
free_candev(ndev);
835835
}
836836

837-
static int __maybe_unused rcar_can_suspend(struct device *dev)
837+
static int rcar_can_suspend(struct device *dev)
838838
{
839839
struct net_device *ndev = dev_get_drvdata(dev);
840840
struct rcar_can_priv *priv = netdev_priv(ndev);
@@ -857,7 +857,7 @@ static int __maybe_unused rcar_can_suspend(struct device *dev)
857857
return 0;
858858
}
859859

860-
static int __maybe_unused rcar_can_resume(struct device *dev)
860+
static int rcar_can_resume(struct device *dev)
861861
{
862862
struct net_device *ndev = dev_get_drvdata(dev);
863863
struct rcar_can_priv *priv = netdev_priv(ndev);
@@ -886,7 +886,8 @@ static int __maybe_unused rcar_can_resume(struct device *dev)
886886
return 0;
887887
}
888888

889-
static SIMPLE_DEV_PM_OPS(rcar_can_pm_ops, rcar_can_suspend, rcar_can_resume);
889+
static DEFINE_SIMPLE_DEV_PM_OPS(rcar_can_pm_ops, rcar_can_suspend,
890+
rcar_can_resume);
890891

891892
static const struct of_device_id rcar_can_of_table[] __maybe_unused = {
892893
{ .compatible = "renesas,can-r8a7778" },
@@ -904,7 +905,7 @@ static struct platform_driver rcar_can_driver = {
904905
.driver = {
905906
.name = RCAR_CAN_DRV_NAME,
906907
.of_match_table = of_match_ptr(rcar_can_of_table),
907-
.pm = &rcar_can_pm_ops,
908+
.pm = pm_sleep_ptr(&rcar_can_pm_ops),
908909
},
909910
.probe = rcar_can_probe,
910911
.remove = rcar_can_remove,

0 commit comments

Comments
 (0)