From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-qk1-f175.google.com (mail-qk1-f175.google.com [209.85.222.175]) (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 792DF4C6C for ; Wed, 8 Apr 2026 23:02:13 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.222.175 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775689334; cv=none; b=kq5iPORHMu2A5zamyVGzQPrurj2qQjsSSBAHKA8BIHjyXdKwMQ7toLwaIdKTk8fnpUhAqjaw0fYe9aUfnUzViUeMqS/hDcH1lZKsvnrYMo6rrmrt3OujsnQIZheVW+K4pic5NmU+JZqeeKCLvYYqrmB1g1khcS64aOzJ2+frm5k= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775689334; c=relaxed/simple; bh=zuQU39QAupp+rjxDcOTsY3tSd7EM7Ba5poz/87vf+7k=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=jtrZZfm/HJ2e3xw3TGTt2q16IwgcgB8qocKZRtTxsiJOx1cK22Tn0dabgfJ+PK29BoMyxAYp6jZKKRXXPNvDcaIUxZmNRqXB1V2hw+HjQigBJAslhc2OMWSnV6r1JbmM+X7pNRKugewx5GJeONR8FV37zkgvyTB9CV8ObdhICrY= 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=e0u0EKvW; arc=none smtp.client-ip=209.85.222.175 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="e0u0EKvW" Received: by mail-qk1-f175.google.com with SMTP id af79cd13be357-8cfc3ca1922so18610585a.1 for ; Wed, 08 Apr 2026 16:02:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1775689332; x=1776294132; 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=BvbCwq68/qWYU9XfnJUnTP1IOqn0jqRNVTQiaBiIGqE=; b=e0u0EKvWA7MbH8z94+MNj44Toan9Fqn2JPlbs3wepN3leqdctsf/RlCaFbG3B+pMsa GT7RFRr+KWZikzcT9cJPUffi2PKEm4JUGAJSElb/mSIZnCKvq0q8G2E22bkJCJYaKoRz n4IW3uG/yUIFpjlxHAwUqhlmCDRX2vq3jFaFDpnxyDwoKtE5WCZXBYyi2mqAzxM7V9TM zn+29GZF+iOjl3vUl21+tL+5YgEh0mLBOpY/5s03TYXA/tsbSThJR+Vn0c4JV8P1BTjj 1vGT1ccKWmthRjCjYOGVpzOZnkkwJRRqeBIjgelXbbpYUqaZbBfybbpuJ94KaF63IC2Q dNFg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1775689332; x=1776294132; 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=BvbCwq68/qWYU9XfnJUnTP1IOqn0jqRNVTQiaBiIGqE=; b=HOS024O9EC6PA/X4xAoHHUMdiWmyyyZiZGQ/5afnnb5cLH4O3BapjouDYqSkhEzsg4 NvGWDkDk2KF4fFgtoqWYQ34I1RPX02S0qLEfFifFmJWJqkvlMWOUtKEUohs1p8mkghmh DoL+CRrL/e7X/eNRXPx0Up2VUjy6+cg7adQP2U41OHwAz2TzWq7uSBWQfVlTUTxMd//V O3IUnXO65Z6xaD+XOWlNmAAfsPHeqTCKN0zN30I1ebWKUBt/lGvKlndwgbDH2j/5gt4r 2FhlfhG+EzukerN5klfsg2A8jt2KXfDo1OhTpl4HS0MzxeH0UgPZD+dJxm/sLCMPj5QN eELw== X-Forwarded-Encrypted: i=1; AJvYcCWhe5AwKpYWkvqJqXinlzjj7qtstERPKpD1lwlBhBDdSmxwiqVCJvswRVRq7o06SugItM6W4uUw4x7QdK4=@vger.kernel.org X-Gm-Message-State: AOJu0YzlgwgehykNRbbPfelZsQN3IOwpwjVt6Up/fR1MHKG/vXb4BMtB Ggv3cXQbPexqre8OU9wUQ3p5RPph2dpOIyN4RmlhfYCGpOfUmSAXcoWhBr4Z7g== X-Gm-Gg: AeBDievDOl6t1Z1vgxgKcuJo8z2Gs2rtbm488cimA5lVPfLVqAAcDxvahabrorwiKi4 f11ZpyLzINXQiPwHn+3avkMGmIYk1UjOM/+nT1JtpQDzYQ31ldYA+mKRjAwVwxY1mC3IyeXTgAW I1/K3XYWfkxa9PhNwqAvIhWoIkBoUNDDzYKFEYluYzCUFUa6teSaOVoAevQCcJXxbYXqkz3PTfY 3VR+5BJ65fc5IkI6o5C+7sK7dk9scNFJVh5dAWUWDg1O7NbX/daZmQfuWieuQxUVKjvBzAapOUH edhdtjddOOZvwjTLWCMYBr1Fs0rNrbCHSWLMMUbJJuDgWHRQr7/PTJ5BC8PeeqOD6LPfyAYHWUZ FFRo90DpouQB0bh5WUYQ0cgOHN1tPI4jwxDegaUWz3D+2Ok1EPKvxvTmOh1gDimKEgOPLR9ZCMi +UKyoFtR35Zngu2X3XljO153bt4AcFDqwwLB6dxJBnKW1z3vy+q7tSLKM= X-Received: by 2002:a05:620a:29c3:b0:8d8:13c9:55cb with SMTP id af79cd13be357-8dc439f3cbbmr205076785a.4.1775689332280; Wed, 08 Apr 2026 16:02:12 -0700 (PDT) Received: from ryzen ([2601:644:8000:5b5d::8bd]) by smtp.gmail.com with ESMTPSA id af79cd13be357-8d2a5392d35sm1611561585a.10.2026.04.08.16.02.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 08 Apr 2026 16:02:11 -0700 (PDT) From: Rosen Penev To: linux-rockchip@lists.infradead.org Cc: Srinivas Kandagatla , Heiko Stuebner , linux-arm-kernel@lists.infradead.org (moderated list:ARM/Rockchip SoC support), linux-kernel@vger.kernel.org (open list) Subject: [PATCH] nvmem: rockchip-otp: alloc clks with main struct Date: Wed, 8 Apr 2026 16:01:53 -0700 Message-ID: <20260408230153.20726-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: 8bit Use a flexible array member to simplify allocation slightly. No need for a separate calloc. Signed-off-by: Rosen Penev --- drivers/nvmem/rockchip-otp.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/drivers/nvmem/rockchip-otp.c b/drivers/nvmem/rockchip-otp.c index 0ec78b5e19e7..2c0feb036f3f 100644 --- a/drivers/nvmem/rockchip-otp.c +++ b/drivers/nvmem/rockchip-otp.c @@ -78,9 +78,9 @@ struct rockchip_data { struct rockchip_otp { struct device *dev; void __iomem *base; - struct clk_bulk_data *clks; struct reset_control *rst; const struct rockchip_data *data; + struct clk_bulk_data clks[]; }; static int rockchip_otp_reset(struct rockchip_otp *otp) @@ -424,7 +424,7 @@ static int rockchip_otp_probe(struct platform_device *pdev) if (!data) return dev_err_probe(dev, -EINVAL, "failed to get match data\n"); - otp = devm_kzalloc(&pdev->dev, sizeof(struct rockchip_otp), + otp = devm_kzalloc(&pdev->dev, struct_size(otp, clks, data->num_clks), GFP_KERNEL); if (!otp) return -ENOMEM; @@ -436,11 +436,6 @@ static int rockchip_otp_probe(struct platform_device *pdev) return dev_err_probe(dev, PTR_ERR(otp->base), "failed to ioremap resource\n"); - otp->clks = devm_kcalloc(dev, data->num_clks, sizeof(*otp->clks), - GFP_KERNEL); - if (!otp->clks) - return -ENOMEM; - for (i = 0; i < data->num_clks; ++i) otp->clks[i].id = data->clks[i]; -- 2.53.0