clk: samsung: use kzalloc_flex

Simplify allocation by using kzalloc_flex with a flexible array member
to combine allocations. samsung_clk_alloc_reg_dump is no longer needed
for this struct but is needed elsewhere.

Add __counted_by for extra runtime analysis. Move counting variable
assignment after kzalloc_flex which does the same with GCC 15 and above.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
Link: https://patch.msgid.link/20260629032540.2331559-2-rosenp@gmail.com
Signed-off-by: Krzysztof Kozlowski <krzk@kernel.org>
This commit is contained in:
Rosen Penev 2026-06-28 20:25:38 -07:00 committed by Krzysztof Kozlowski
parent a016e89781
commit 7b2a8eb5c7
2 changed files with 8 additions and 7 deletions

View File

@ -430,21 +430,22 @@ void samsung_clk_extended_sleep_init(void __iomem *reg_base,
unsigned long nr_rsuspend)
{
struct samsung_clock_reg_cache *reg_cache;
int i;
reg_cache = kzalloc_obj(struct samsung_clock_reg_cache);
reg_cache = kzalloc_flex(*reg_cache, rdump, nr_rdump);
if (!reg_cache)
panic("could not allocate register reg_cache.\n");
reg_cache->rdump = samsung_clk_alloc_reg_dump(rdump, nr_rdump);
if (!reg_cache->rdump)
panic("could not allocate register dump storage.\n");
reg_cache->rd_num = nr_rdump;
for (i = 0; i < nr_rdump; ++i)
reg_cache->rdump[i].offset = rdump[i];
if (list_empty(&clock_reg_cache_list))
register_syscore(&samsung_clk_syscore);
reg_cache->reg_base = reg_base;
reg_cache->sysreg = sysreg;
reg_cache->rd_num = nr_rdump;
reg_cache->rsuspend = rsuspend;
reg_cache->rsuspend_num = nr_rsuspend;
list_add_tail(&reg_cache->node, &clock_reg_cache_list);

View File

@ -324,10 +324,10 @@ struct samsung_clock_reg_cache {
struct list_head node;
void __iomem *reg_base;
struct regmap *sysreg;
struct samsung_clk_reg_dump *rdump;
unsigned int rd_num;
const struct samsung_clk_reg_dump *rsuspend;
unsigned int rsuspend_num;
unsigned int rd_num;
struct samsung_clk_reg_dump rdump[] __counted_by(rd_num);
};
/**