From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pl1-f171.google.com (mail-pl1-f171.google.com [209.85.214.171]) (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 84B482771B for ; Mon, 8 Jun 2026 04:56:58 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.171 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780894619; cv=none; b=ITowywGKSKbcikZthOaCHhMGelWF7vkXS8gdbqYu664DVHJNi+UMLYMBILOKlPKWztOdsW9R4jyXuPiuW/s59FxuRa0C3kocilg2XUfMc3D5eQhtEMEOsjsQbyMZkdQ1N2QLc+nA7RVcak8FiKBzgpYJVPgFt+u3T2WvostkSP8= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780894619; c=relaxed/simple; bh=UxPfLkXqVlLOC48avJUerJTK76kgWBRfei3wU2Rv2Fs=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=f1VTE7yAz03UhNmpuBxUCa7Kw3qi5CiyNVr8gfy0haLHR9b/V1KvFsXG4KGCQ8z+8NOJvIwHjJRg1ThtylRC6VERNwq2HCXr4hP6mX5eD9HrK/6jeAy/CAf6zGYytLFnG2e5pY2yuLDoK8B1p3TA+p2vh3XSkaclwPg4UUxauG0= 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=j65H1irC; arc=none smtp.client-ip=209.85.214.171 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="j65H1irC" Received: by mail-pl1-f171.google.com with SMTP id d9443c01a7336-2bf237e1433so44482555ad.1 for ; Sun, 07 Jun 2026 21:56:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1780894618; x=1781499418; 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=hcfRELKVzsufQjiMAtIWYOk3+MKhEkU5OXgP88O0/Jk=; b=j65H1irCEeE9O2ulER8wfz+16eFsdHdQW/P+ojCSW70KaJstqG2wxpT/z+qHQYOFzQ 6dkUqUUkBQFyHg/62rUFxDpWhcLQPouYEW5tsHDR5L+5k/qZE++lW8Qhf66u1v2xPMkx 4ydAM1en3UWOyRJhC3m7VRCgMyrIuZFiMngXmAZ4ep5npUloKkNmD5JBWHyleA4sNsgJ l2nEF3x++jCNEBT/xdtT6jGK0kwjA2SgjXgvVWsefk1FpN2qs0GOn/t7dP6mKM43Po5K dHDzCs95PeCWgSV+89MmGqQ6upDunJ5VvyB0+QP6Z2ya0+KFQjUMFn7jwq9FKdDoI08F 0AtA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1780894618; x=1781499418; 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=hcfRELKVzsufQjiMAtIWYOk3+MKhEkU5OXgP88O0/Jk=; b=TZjwO0ndTJ6c+l6aVqIe1DAEX9bWp9BE/jkGNl+eihQ25wb4yNjCGLLbaxyPBcydPj MIqL+Q7GYEpcAGpcQIdqvA5I8FyZz+DFZG9GT1RziqblxdL8Kze9RYGEnYtdFWhJjltp yfLDws0sYurgJC2hlyGGqzPq9/fMUJREcy80vQaqsHz7j7yhJF1JKhScCWHVOMhfdeuv A/SobjlcCgJ4+kJbXUS1y0eReiZBDOzF1jYg26qYXCsqlAWBlAtEZ0l/LHqUgGeLCedh uiFFxWnn4pn71ptf5LMTp3kjJ3P2c1KWpftgNM/bjIqRTj28r0kiMHnE3EF9ppoC0JlZ dsKQ== X-Gm-Message-State: AOJu0Yz/ckNdplnilyep7g9hjAXYLmPYDvuGLRncx4ijZq8kDfQ+vtkE Ko/3Gg5UzfSxW/i3hILw8Dbl4+PqJmqZkhi3yOZJEYQeGEOuRs1jAkm/U3g/Vg== X-Gm-Gg: Acq92OEN7l/xFMdi0qqYJNTjCk15hiouc+ggRMRduyDFaY7JOOh2vblYbgv5X8q9Zrw WFkWhjc5l9Stnv8iuSLiF1XrGwatMNsFZX8nl8nWCezp8DmPPwC0mR+0fg9BjlqGASbejJF9qsF 6e1gVMF7FDu7NoXp1B7FDkH6YfLlgZUvNY2BtS9Emapvdm2REyUly58mA+Iz2N8GXKV84V0z1TG ua131WKuE78Glpbm81QljWBjhQZUlIYwbIIElM9bLjbDxeKTWiGGMCNT0K3R3LVBzyo3bD18VQ3 rDjIVmOYgAi/fnZ6VdrWidUG/IxT1w9QIN7d94NljdJ6hh0ucWrWMNiYxpq2a4BV1Rk9diaIiCN GvwGQL7J3l6BkA18c7yyTjXQUi67c360EG8wohVIyEdvryCiEHjI2nImRT9ZDyxkVUlW1acbVG8 YjzAALEaRwsZKm86POpVt3GddhIbNxcRiQNUxE75ckrgCRjoZwUd0bNUUA1z/ue8Vj9mP80304G cPZbcm2VskxkVsBUNOR7GmTMOGsd/gwHtgFz8lACqgL4w== X-Received: by 2002:a17:903:faf:b0:2c0:db23:4c4 with SMTP id d9443c01a7336-2c1e82191bamr152609735ad.16.1780894617827; Sun, 07 Jun 2026 21:56:57 -0700 (PDT) Received: from ryzen ([2601:644:8000:5b5d:7285:c2ff:fe45:8a32]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2c164fa0236sm173041715ad.33.2026.06.07.21.56.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 07 Jun 2026 21:56:57 -0700 (PDT) From: Rosen Penev To: netdev@vger.kernel.org Cc: Kurt Kanzenbach , Andrew Lunn , Vladimir Oltean , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , linux-kernel@vger.kernel.org (open list) Subject: [PATCH] net: dsa: hellcreek: replace kcalloc with struct_size Date: Sun, 7 Jun 2026 21:56:40 -0700 Message-ID: <20260608045640.5172-1-rosenp@gmail.com> X-Mailer: git-send-email 2.54.0 Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit One fewer allocation for the priv struct. Signed-off-by: Rosen Penev --- drivers/net/dsa/hirschmann/hellcreek.c | 14 +++++--------- drivers/net/dsa/hirschmann/hellcreek.h | 2 +- 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/drivers/net/dsa/hirschmann/hellcreek.c b/drivers/net/dsa/hirschmann/hellcreek.c index b369c1cc89e8..2c6cabf61143 100644 --- a/drivers/net/dsa/hirschmann/hellcreek.c +++ b/drivers/net/dsa/hirschmann/hellcreek.c @@ -1932,29 +1932,25 @@ static const struct dsa_switch_ops hellcreek_ds_ops = { static int hellcreek_probe(struct platform_device *pdev) { + const struct hellcreek_platform_data *data; struct device *dev = &pdev->dev; struct hellcreek *hellcreek; struct resource *res; int ret, i; - hellcreek = devm_kzalloc(dev, sizeof(*hellcreek), GFP_KERNEL); + data = of_device_get_match_data(dev); + hellcreek = devm_kzalloc(dev, struct_size(hellcreek, ports, data->num_ports), GFP_KERNEL); if (!hellcreek) return -ENOMEM; + hellcreek->pdata = data; + hellcreek->vidmbrcfg = devm_kcalloc(dev, VLAN_N_VID, sizeof(*hellcreek->vidmbrcfg), GFP_KERNEL); if (!hellcreek->vidmbrcfg) return -ENOMEM; - hellcreek->pdata = of_device_get_match_data(dev); - - hellcreek->ports = devm_kcalloc(dev, hellcreek->pdata->num_ports, - sizeof(*hellcreek->ports), - GFP_KERNEL); - if (!hellcreek->ports) - return -ENOMEM; - for (i = 0; i < hellcreek->pdata->num_ports; ++i) { struct hellcreek_port *port = &hellcreek->ports[i]; diff --git a/drivers/net/dsa/hirschmann/hellcreek.h b/drivers/net/dsa/hirschmann/hellcreek.h index bebf0d3ff330..851822adb09e 100644 --- a/drivers/net/dsa/hirschmann/hellcreek.h +++ b/drivers/net/dsa/hirschmann/hellcreek.h @@ -280,7 +280,6 @@ struct hellcreek { struct dsa_switch *ds; struct ptp_clock *ptp_clock; struct ptp_clock_info ptp_clock_info; - struct hellcreek_port *ports; struct delayed_work overflow_work; struct led_classdev led_is_gm; struct led_classdev led_sync_good; @@ -297,6 +296,7 @@ struct hellcreek { u64 last_ts; /* Used for overflow detection */ u16 status_out; /* ptp.status_out shadow */ size_t fdb_entries; + struct hellcreek_port ports[]; }; /* A Qbv schedule can only started up to 8 seconds in the future. If the delta -- 2.54.0