From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pl1-f182.google.com (mail-pl1-f182.google.com [209.85.214.182]) (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 88812223328 for ; Mon, 8 Jun 2026 04:56:58 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.182 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780894620; cv=none; b=qYlUuywFxrkHdiKpxw2nHHg1NVHmFXN1PSlX5/mm7hXcitTB5krSVf2MNSALXDnbRy/0jpyY877IXdw7ksjSaK/jfjCwnJXVTzpR6xsuFwER9azwbjmdo3bXwRZ1hreZLhnACUW5Qchn2G9izEQtamkPVOwvy4DptoOW9+jTZQw= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780894620; c=relaxed/simple; bh=UxPfLkXqVlLOC48avJUerJTK76kgWBRfei3wU2Rv2Fs=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=Z7jhw0HFIvs6mGeFlCWs+0qm6LtEeZLVI+ZbdTdFiVS8ydBZEEfeoHQ91SSP0JpZ2Oi8i5CK3py/dvXjUiYLW1NTdetZjQZrIF2NG6ovJZwVgv8Nj8sx+GOAjLhp8DHb9H9szlw5xhYDLvny8NBgWfVOsmLMs835WCueMbXt6ik= 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.182 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-f182.google.com with SMTP id d9443c01a7336-2c0c1e0d00bso38209945ad.0 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=RO3POrTGmHPhE28Np4VVONNL/GmhYPsk1qQlChorxCOrvo0I2QS3jiTV0hAmTkIgqT oSIRAnFEDnB8q5ACgbNvjqVQij+PqPRseKc57LJKFKOJp6+0sPc/ggPA09FUOx4stv2q r95awnF18we1XDeRk7T2oPsP/aMbu4hDl7LH47z67QDc8WzvipxmwELqBiUH7hTK9mj1 tTpinJwbWBDitteXszzhbXhfd6nkO/IanQ1SMsooLuJXmYQ9EQw5coraEjJ2iea+1xrR +7x0/SdWsa+GEW8AQALFJk1beSc5eSxmeUfVjcDccl1eDyMG/8vOew2VyB2UNGE6+lM9 UASA== X-Forwarded-Encrypted: i=1; AFNElJ/nKdayqwx+WUebhoP6F8X1ga9XCG1DStHanfWV8LJrVhpQi4NH+y10JINiP952y5Q74eZI2kWa6ooSMqI=@vger.kernel.org X-Gm-Message-State: AOJu0Yz+AwKt5Old1zZr9cWjCtsPgTA/WWGxHZ4MNDIf2Wn4Ju47ZlFF VWlLEGMUojeXuerlBDMz3vM+VJWKDK72bBhceheRwcWWuZrFZ793sZ80 X-Gm-Gg: Acq92OHiWi8Bun5X2a9Wtvy+rLg7ingBphZNR+tf3RjqWLrsYeYMsszr2oMkrSLXKVB /V+Yexv2kVVINux8fwJTZ4p4u+WiTsUHdFNHrrXZ/reCbwfumFth2ruwgCwS+Gitshs/x+cMPep xoN52/2HksDXY5NNlCgDtGvn+y1l7XlUiBFzx/hGUAdyVrvDIagM/R7OheaPqH3QUO6n0SGjx6n uyu61PdfYRBQPinTqCD0xXvYTt+5ETjxKwonCv4xCsD/DDz61QOjkIdNlviD9TIlzpoDh8T22qC 1kU90YrEP+edBqwKd49bAR2UVxBkWxeupDovVBtdv2tIhO8IC0oaaaY6khXu2A+mVoOo/+xH3px IzcXUxLEbN+Yzgacn3geInzjR4s6jdszROJiWtHko2w5Cb7xUM+u3OP8d622VxgKn+SF62OUa2b VJ0zZvCw/Zx2ifT3zV4huh5Vdsn0m/XkTWshwu+Je/YYGZfCOO6QjukBWc3Uq07o7Gch0eJwWqm 25zgSTFPdVirqEMNZHmOw/AGK3e8ow2VQhY3xSTuIqaMQ== 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: linux-kernel@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