clk: mvebu: use kzalloc_flex

Use a flexible array member to combine kzalloc and kcalloc in one
allocation so they can be freed together.

Add __counted_by for extra runtime analysis. Move counting variable
assignment right after allocation as done by kzalloc_flex with GCC >=
15.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
Reviewed-by: Brian Masney <bmasney@redhat.com>
Signed-off-by: Stephen Boyd <sboyd@kernel.org>

diff --git a/drivers/clk/mvebu/common.c b/drivers/clk/mvebu/common.c
index 28f2e1b2a9323de16fab4522e4b6a6058ea5677a..0f9ae5f5cefd2cc62180b2beca64483c43f04f67 100644 (file)
--- a/drivers/clk/mvebu/common.c
+++ b/drivers/clk/mvebu/common.c
@@ -189,10 +189,10 @@ DEFINE_SPINLOCK(ctrl_gating_lock);
 
 struct clk_gating_ctrl {
        spinlock_t *lock;
-       struct clk **gates;
        int num_gates;
        void __iomem *base;
        u32 saved_reg;
+       struct clk *gates[] __counted_by(num_gates);
 };
 
 static struct clk_gating_ctrl *ctrl;
@@ -257,24 +257,21 @@ void __init mvebu_clk_gating_setup(struct device_node *np,
                clk_put(clk);
        }
 
-       ctrl = kzalloc_obj(*ctrl);
+       /* Count, allocate, and register clock gates */
+       for (n = 0; desc[n].name;)
+               n++;
+
+       ctrl = kzalloc_flex(*ctrl, gates, n);
        if (WARN_ON(!ctrl))
                goto ctrl_out;
 
+       ctrl->num_gates = n;
+
        /* lock must already be initialized */
        ctrl->lock = &ctrl_gating_lock;
 
        ctrl->base = base;
 
-       /* Count, allocate, and register clock gates */
-       for (n = 0; desc[n].name;)
-               n++;
-
-       ctrl->num_gates = n;
-       ctrl->gates = kzalloc_objs(*ctrl->gates, ctrl->num_gates);
-       if (WARN_ON(!ctrl->gates))
-               goto gates_out;
-
        for (n = 0; n < ctrl->num_gates; n++) {
                const char *parent =
                        (desc[n].parent) ? desc[n].parent : default_parent;
@@ -289,8 +286,6 @@ void __init mvebu_clk_gating_setup(struct device_node *np,
        register_syscore(&clk_gate_syscore);
 
        return;
-gates_out:
-       kfree(ctrl);
 ctrl_out:
        iounmap(base);
 }