From: Linus Walleij Date: Sun, 17 May 2026 23:01:20 +0000 (+0200) Subject: pinctrl: starfive: jh7110: Avoid ifdeffery X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e0a17856f2c3cddcdc354b924cc1a03e93f625ae;p=thirdparty%2Fkernel%2Flinux.git pinctrl: starfive: jh7110: Avoid ifdeffery Use IS_ENABLED() inline assigning a variable instead of ifdeffery. Cc: Rosen Penev Suggested-by: Geert Uytterhoeven Link: https://lore.kernel.org/linux-gpio/CAMuHMdX7t7VHTzybjYo3s8SU3XLEH9GKsxmLBbh7p4D1CT3H_Q@mail.gmail.com/ Signed-off-by: Linus Walleij --- diff --git a/drivers/pinctrl/starfive/pinctrl-starfive-jh7110.c b/drivers/pinctrl/starfive/pinctrl-starfive-jh7110.c index 3fb9aa8ddf074..ec359cb873c4f 100644 --- a/drivers/pinctrl/starfive/pinctrl-starfive-jh7110.c +++ b/drivers/pinctrl/starfive/pinctrl-starfive-jh7110.c @@ -845,6 +845,7 @@ int jh7110_pinctrl_probe(struct platform_device *pdev) struct jh7110_pinctrl *sfp; struct pinctrl_desc *jh7110_pinctrl_desc; struct reset_control *rst; + unsigned int num_saved_regs; struct clk *clk; int ret; @@ -857,15 +858,12 @@ int jh7110_pinctrl_probe(struct platform_device *pdev) return -EINVAL; } -#if IS_ENABLED(CONFIG_PM_SLEEP) - sfp = devm_kzalloc(dev, struct_size(sfp, saved_regs, info->nsaved_regs), - GFP_KERNEL); -#else - sfp = devm_kzalloc(dev, sizeof(*sfp), GFP_KERNEL); -#endif + num_saved_regs = IS_ENABLED(CONFIG_PM_SLEEP) ? info->nsaved_regs : 0; + sfp = devm_kzalloc(dev, struct_size(sfp, saved_regs, num_saved_regs), + GFP_KERNEL); if (!sfp) return -ENOMEM; - sfp->num_saved_regs = info->nsaved_regs; + sfp->num_saved_regs = num_saved_regs; sfp->base = devm_platform_ioremap_resource(pdev, 0); if (IS_ERR(sfp->base))