From nobody Wed Apr 1 08:37:51 2026 Received: from mail-pf1-f174.google.com (mail-pf1-f174.google.com [209.85.210.174]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id C80D335CB67 for ; Wed, 1 Apr 2026 02:36:10 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.174 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775010982; cv=none; b=gMF9BV52KvyL5/2zeEVlCLvI8YpxmZvpyzY3iPjDjs023GDZ04xj1Cl/7RCUlJRt2J+yF0ineXaxng37wI3mJvwHs/Ieada0Pw4tH64FfuGJMLV5hDWC4i+w8fkorizzFAXZiJG9m+UC4XW/MnwF9rAlNJe8FoSfrolat5m+4Dc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775010982; c=relaxed/simple; bh=8Fh+swXdgNwto24U4ynkYJm3tITn/I2du8tk6ICetRg=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=Ae+Enej/5CSYjKBvPK/0ijF32THu+RKbPbbNySNNouvc9FGbkKQdUB017JguFc9CIiJGzGif0dwm6aKyGXSLXWDNm9ZbMVBL/oO37EBbl3YAcOICHNUgVv98Pvfr4hDTGTLJe+xeWdYQT/2otrhOOrEj+38XPxC0pzy98tXRPCM= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=ktEACD0t; arc=none smtp.client-ip=209.85.210.174 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="ktEACD0t" Received: by mail-pf1-f174.google.com with SMTP id d2e1a72fcca58-8296d553142so2889025b3a.3 for ; Tue, 31 Mar 2026 19:36:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1775010970; x=1775615770; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=/u3bAkQFELGFd8riivJpGH4laGns+1/mgHgCySVCkuc=; b=ktEACD0tE6GaAz/XGaySkpIRKVu97AhXJdD0f8+EPScWX0auFxQbQF7HPLM8OQBWin Dm4BuG9LFWgjb1r3Nql5N2/gitAp/B/fnW/CDq9RqmXfq7I7zIp8LpeyhHPw1msI+bfd 78rngWocSPr54sQ85QA12VpElIkCAuLBZhH3IW5+gn4b6LJTbpxPTeyYkvuo/r4mFGUL TJ4FrcyDrKzR0g0n2YO9ggBLZXVDDurr/YZRiul4npe7ikvFlREmaLlQ/9bF2BBYX1ZM Qi2Rcqcx8G9uYimdgNSoYLDEa84u5gKsJtAmCc7GQ8hKTbyYpEIZK39386R8Y3rlgalf KxHg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1775010970; x=1775615770; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-gg:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=/u3bAkQFELGFd8riivJpGH4laGns+1/mgHgCySVCkuc=; b=p6V/Rfs1rDJTCdJQCcmuDuskH2GXOSSy1ONPh+tlhcEhK2oyHvK7izdSA3GdEsZWJL K72Eow9/0Impy/RtQwrRW8JNNmw4+KclM4f5AbUsDGZwQF39LmCuqtyaCwAcO9uudPFw 1mWblAu4a9TWL1ZgznZIMRqMgeS4pKwGuY2wsJOzpnP3FfAcitAGRTHaLTw4HHJxZNeQ Z1zGaChTAkWhEXuLGGfsaf2pkRGeuu3VLsU1i1SZiaamS+FeYkYh/FFaNbNLXov5qbzz CJyENAcuJIzdpvThosMbWTMKwTTh04CgGgKt/7j1ZNsGxOuzzHuzF927mBN+3u4LCVN1 Fsuw== X-Forwarded-Encrypted: i=1; AJvYcCWrzUotEb88TC3soN8clAF2Evzn2S1B7rkfYCqiM2LcKqmXh5SeWsgKOnmMLyPi+FUsngMfo31iP7gMyrU=@vger.kernel.org X-Gm-Message-State: AOJu0YwIpyeaXMBmlPK3hkXlGGx9dKYT+NPrtufQ+LZCQHZTIAWCBgb0 27mHBKXi0CQ+c92gR0bjL0zikBX+2t82aan0piINNraDP+MVuoNB0s7s X-Gm-Gg: ATEYQzwK1c1TzOGw3UeOtMl+5r8kD0aRFHWizyvyHGuAX2c8n7qJT1pUW+X27seEGDy R1yNQXjB4Xa0Jainm1GEim0BVIonUC/qKANrDG3b9mZuz8674WZ9YWcDnH84lnjjXWbuLFm1IPW XjwDZsQF5rTcqvKQ582KpW8UKDMfolbrm3znnUm/yF41J/6lCw0sk+JrW45swujpgmSZGlr262N UPk13W7iga2NNqKDdhZNG07xPVGHhrgE1Vd+ILoB5auNKT2ZhJXd7QSMbdCxZifzjw4Fultn2SZ mGPbYi3iDDHNmBq78Sce3LfuNRX0FOcOQCfxbkXZuQN9z0sVpO1LZhW4BfGyeVWDjs6CS/ncHlY p8yNwmZIYN/VZZZLWrM6sCo26mdx6kRJ++dkXbeFLjqV0QFaUpNcIsJJYE+gcAwpybwmSY5R9fj SUGuYxNPWjWpvShgEi+XmUv23LDKuaUaz683oM8Z/5FxaiJGnKbHeulP162dFwPJYw7w== X-Received: by 2002:a05:6a00:600d:b0:827:2c79:fa84 with SMTP id d2e1a72fcca58-82ce88c2bb7mr2026767b3a.12.1775010969552; Tue, 31 Mar 2026 19:36:09 -0700 (PDT) Received: from ryzen ([2601:644:8000:5b5d::8bd]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-82ca863063bsm11169941b3a.59.2026.03.31.19.36.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 31 Mar 2026 19:36:08 -0700 (PDT) From: Rosen Penev To: linux-clk@vger.kernel.org Cc: Michael Turquette , Stephen Boyd , linux-kernel@vger.kernel.org (open list) Subject: [PATCHv3] clk: hisilicon: clkdivider-hi6220: use kzalloc_flex Date: Tue, 31 Mar 2026 19:35:51 -0700 Message-ID: <20260401023551.27978-1-rosenp@gmail.com> X-Mailer: git-send-email 2.53.0 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Combine allocations using kzalloc_flex and a flexible array member. Signed-off-by: Rosen Penev --- v3: fix wrongly added -> in table comment. v2: add missing transformation. drivers/clk/hisilicon/clkdivider-hi6220.c | 26 ++++++++--------------- 1 file changed, 9 insertions(+), 17 deletions(-) diff --git a/drivers/clk/hisilicon/clkdivider-hi6220.c b/drivers/clk/hisili= con/clkdivider-hi6220.c index 1787ecefe601..b35c02d3bc05 100644 --- a/drivers/clk/hisilicon/clkdivider-hi6220.c +++ b/drivers/clk/hisilicon/clkdivider-hi6220.c @@ -26,8 +26,8 @@ * @shift: shift to the divider bit field * @width: width of the divider bit field * @mask: mask for setting divider rate - * @table: the div table that the divider supports * @lock: register lock + * @table: the div table that the divider supports */ struct hi6220_clk_divider { struct clk_hw hw; @@ -35,8 +35,8 @@ struct hi6220_clk_divider { u8 shift; u8 width; u32 mask; - const struct clk_div_table *table; spinlock_t *lock; + struct clk_div_table table[]; }; =20 #define to_hi6220_clk_divider(_hw) \ @@ -108,24 +108,19 @@ struct clk *hi6220_register_clkdiv(struct device *dev= , const char *name, u32 max_div, min_div; int i; =20 - /* allocate the divider */ - div =3D kzalloc_obj(*div); - if (!div) - return ERR_PTR(-ENOMEM); - /* Init the divider table */ max_div =3D div_mask(width) + 1; min_div =3D 1; =20 - table =3D kzalloc_objs(*table, max_div + 1); - if (!table) { - kfree(div); + /* allocate the divider */ + div =3D kzalloc_flex(*div, table, max_div + 1); + if (!div) return ERR_PTR(-ENOMEM); - } =20 for (i =3D 0; i < max_div; i++) { - table[i].div =3D min_div + i; - table[i].val =3D table[i].div - 1; + table =3D &div->table[i]; + table->div =3D min_div + i; + table->val =3D table->div - 1; } =20 init.name =3D name; @@ -141,14 +136,11 @@ struct clk *hi6220_register_clkdiv(struct device *dev= , const char *name, div->mask =3D mask_bit ? BIT(mask_bit) : 0; div->lock =3D lock; div->hw.init =3D &init; - div->table =3D table; =20 /* register the clock */ clk =3D clk_register(dev, &div->hw); - if (IS_ERR(clk)) { - kfree(table); + if (IS_ERR(clk)) kfree(div); - } =20 return clk; } --=20 2.53.0