From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 536A7352C35 for ; Sat, 30 May 2026 20:53:53 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780174434; cv=none; b=RsAAk+OK3YYV4T7DY0rgZqA5Vfs+io6SSd4bWkYkyCeMSauBd6wzs7xDn+MvxiTriYLlAzcAfSDAYSrk+JyRKHO/flnvze96vxq/jneE9ZDEqgHekaT7S3uY2Kf7fiwbVV6P/RXJDhB0/rE6hoVTyo4TF5b3JJ4a/Y7ZMCFZBpY= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780174434; c=relaxed/simple; bh=NAXM/ENBjBlMDfCsGL4XOiYr+Yn2WElhtz1lJt0pkuc=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=KO0yTnov/D/dmO4xVqUinf0TnY41ckjy69YQ4vx7DSezjx8gnb6M1NYNLv1icvaOWBdRzkBIrvDJILBlvyE3vI3lEf5OgCbXePnTnMKlRMCcjwDHzbLRuVxYxxJZchCkUAaVdrXMwA+xXSL6xgrxxkiMXPpJM8ciQpnyyFAq8eE= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=Y5sVPBf9; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="Y5sVPBf9" Received: by smtp.kernel.org (Postfix) with ESMTPSA id C1CC71F00893; Sat, 30 May 2026 20:53:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1780174433; bh=wguM9rEJimUZv/LEYeVPJqOc6RVYrt97nWgccdxM6/U=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=Y5sVPBf9d6fazy2ic5oCjVYPtTup+7IiGAVo0u22dOjytCO4GKxA5BZD27UvAO8R0 HsBtfORoa4GFCykwKC+Onje71quWDwoHsuEg2f1VN4F0Cz4rF7Wi39wNI8JL2j+DKP x9VEBUOB3F52NSCjn7aoJWhixujySIBvDNdmJu1XrSVf5LBkd6PGmCbtMa3xg0t5R6 w5ZZI2lbzdYcdZ2dwaSVt8LDnqkIvNIVCX9P0oiCSnbyTSy0JhXeocsG0x4UqwF1Vj +9mfTXN93HmC794+pU0bnKKycQ2h+VtgKQzHeJ2/zhL7S1uk4U0IEmqtsgj/E916Lp yH1BvtG4i6Q1g== From: srini@kernel.org To: gregkh@linuxfoundation.org Cc: linux-kernel@vger.kernel.org, Rosen Penev , Srinivas Kandagatla Subject: [PATCH 02/14] nvmem: rockchip-otp: alloc clks with main struct Date: Sat, 30 May 2026 21:53:21 +0100 Message-ID: <20260530205333.117458-3-srini@kernel.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260530205333.117458-1-srini@kernel.org> References: <20260530205333.117458-1-srini@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: Rosen Penev Use a flexible array member to simplify allocation slightly. No need for a separate calloc. Signed-off-by: Rosen Penev Signed-off-by: Srinivas Kandagatla --- 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