diff options
| author | Linus Walleij <linusw@kernel.org> | 2026-05-18 01:01:20 +0200 |
|---|---|---|
| committer | Linus Walleij <linusw@kernel.org> | 2026-05-25 10:13:43 +0200 |
| commit | e0a17856f2c3cddcdc354b924cc1a03e93f625ae (patch) | |
| tree | b3c8206211a4e61877e30e3214806c7baeebcc52 | |
| parent | 50bb01954a457b573c0c574eb89249c776555568 (diff) | |
| download | linux-e0a17856f2c3cddcdc354b924cc1a03e93f625ae.tar.gz linux-e0a17856f2c3cddcdc354b924cc1a03e93f625ae.zip | |
pinctrl: starfive: jh7110: Avoid ifdeffery
Use IS_ENABLED() inline assigning a variable instead of ifdeffery.
Cc: Rosen Penev <rosenp@gmail.com>
Suggested-by: Geert Uytterhoeven <geert@linux-m68k.org>
Link: https://lore.kernel.org/linux-gpio/CAMuHMdX7t7VHTzybjYo3s8SU3XLEH9GKsxmLBbh7p4D1CT3H_Q@mail.gmail.com/
Signed-off-by: Linus Walleij <linusw@kernel.org>
| -rw-r--r-- | drivers/pinctrl/starfive/pinctrl-starfive-jh7110.c | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/drivers/pinctrl/starfive/pinctrl-starfive-jh7110.c b/drivers/pinctrl/starfive/pinctrl-starfive-jh7110.c index 3fb9aa8ddf07..ec359cb873c4 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)) |