From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-ot1-f45.google.com (mail-ot1-f45.google.com [209.85.210.45]) (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 E156A449B01 for ; Wed, 12 Aug 2026 18:19:01 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.45 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1786558743; cv=none; b=Xy8yXq0K6S7Qhb8G0mbKYy8jiae0F/7BV0JlBTYfN7IJjGnHgHhKbqaEusZiLCk2SrqCvVHb91coqJel1qnp4EBA4yzbuIAq1PvYiXXOjm+w7pXgIPju5faV3CSyr8Ptv4CBr4WG2krsdhmhvXn208iGFmMGRawuIrNT6JEivf8= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1786558743; c=relaxed/simple; bh=rTLBDaSga+MQBJLhrQNgK67Sf/HknFOfOekcNXvWzNs=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=FbWluVWmBvooElAk4ZVLHwPZ0rvj+lZw6i+InMGG9iyF5XjWAT1Bj+z7+d2+HLubv7d4occkgPycfCICyu5P0Px74UDi50MIXdHNU03h+a6TLvJpK2A3AVE4ncgH2t+3oAx6LdCsPMw95mrN9iLDNuwiRyfMvfNhGpHuwZDAvZo= 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=XRm3bNsj; arc=none smtp.client-ip=209.85.210.45 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="XRm3bNsj" Received: by mail-ot1-f45.google.com with SMTP id 46e09a7af769-7eb787dec99so812809a34.0 for ; Wed, 12 Aug 2026 11:19:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1786558741; x=1787163541; 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:content-type; bh=m0TVCaE8Q+34m7ChzAdVqyf9wcVW6q1366258ZKAIuQ=; b=XRm3bNsjW/RHLy4Il0NavMm5ANzSaLd7PrXKY/dYKV1VHmPOJpG0ZbeDOjWtlzwKxd 9nZy1W8Qlzth0gJnTwKa20uSKzmxpIJud5CH1eVDBx1DEJVMfZhgzNxXeT2KJsq+XSVz japXVjMTLr4GTef+9P/c7AjBjVIJfwCUaLeHl1ZX0DFjAyLPiZOl7OxPo/AHxafbIj2a o5sOi/iO1Wjfwo8dD0oezEXWQ+haGf4GskLk3L6vULM40T0LwrlKbIAPxCj4dbZoxDJj vcUVc+7l29ZTfr580oMSnfcoHg7cd2C/bvGoDsNihIOCeTj2g+bm2Wx24+wKCX9S1VTw sZQQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1786558741; x=1787163541; 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:content-type; bh=m0TVCaE8Q+34m7ChzAdVqyf9wcVW6q1366258ZKAIuQ=; b=qqJdUc0bZ2rEn437Nz3O8AAlu9OhcC7+gl0sJsSRwhJx7N1nDN8sp4sKa/AqQ6Auwo FCED7nx3UGkSQMJ412cylguH4BeJ0T1oTeNxuxXRCmFHYMvdmaG+ekrlO5lKqkYvaKAw WnziPI+4H5nK5OJN7kGMLmLaWjduCZuU8t9C5Vh1rfpnubU/kGkluok+I91CXjV2p6Im sf2o9ot05J/jGYYIdssPBwivjjFinTQYylVm+A99ID4UbcpveubLOClcnyo201dlzKT9 s/jEjdeJoY9Aaxdzb8Mw1ZKDpiWNt7bzvCJY0vEvUCRHAG2BYzPnDNUwq9amloEwsG/3 qNAA== X-Forwarded-Encrypted: i=1; AHgh+RpNfHvQK4C2YNlk4Ccrqc4U1vOY6hOnbEY54ACvmJa1PuibOOjPZMbUAFUrnWSMacaDcxaGggsbuT29Owk=@vger.kernel.org X-Gm-Message-State: AOJu0Ywr2QxZ+lZwnL4C7G5HtXK4Aq5F+kLeTY0FsDXPWBQBvn9EA8wb Ti9pZJ3E8rLbT3GHOjs8ls0kkcDMM4l+ZUUTYLAa/DbKsiQPJWFf7xzX X-Gm-Gg: AR+sD13+aj1qL0GnWwzCq57tLaB4Q0cKoBv8G6hOc6CL+0eyiagB4m1vpcUgqaYG+PJ c38QSrw3Rhx+SnifA9m81qcqjhOx0ttTEsMoPegXedyd5NQHaFPl81tI6fivfqXB22IzeRD2jEm Z0s1oiPIXoCLeauZCHdtNhk9FlqeWIOiKniEpS6BfmEhkDAl4gYwjXXzEck1XcWs7hN/lToiOCS WZN6+Tmh2qMQ/7wiWLueY1eaza3Flvs39CswLYEE56nzoyW7CqG3KIJpBO6F+Xd5kwfdL5kl9co rtLpjQp8Fx67ZLRC/s7TmASkBXTAuJwgeZVw+a5TowCsxHO4h+R3OdS+48JEOyqHgfqWTxO7xCT FwqqLl1Wk7UeKMa1cIIWmwLrqIeHnTZGcc5zkLYJgbftZuN05k14mkzfwdLKXbJSuBvRAfvbMBm IDYgbUqImb5ngnyi/F4dg2smFtB0DifWFRTG1mugd2iLJrdNPfK0psv6n2zczDVN50D0hK+0i5u P3n9BUt9GNLvmyhlSAoGP7z+rOG2a6Zj0uMRG46d0j7+8Y8I6cGztDgt0gYiqltOKR7DHLQb6Ab 4kHOqILoznKtMRnuFxhw4R14nY3+CdqqGdTFEw== X-Received: by 2002:a05:6830:828d:b0:7e6:f582:955e with SMTP id 46e09a7af769-7f3b79a016dmr6963465a34.10.1786558740714; Wed, 12 Aug 2026 11:19:00 -0700 (PDT) Received: from ryzen.lan ([2601:644:8000:7a86::e35]) by smtp.gmail.com with ESMTPSA id 46e09a7af769-7f3b3420373sm3589768a34.19.2026.08.12.11.18.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 12 Aug 2026 11:19:00 -0700 (PDT) From: Rosen Penev To: linux-phy@lists.infradead.org Cc: Chunfeng Yun , Vinod Koul , Neil Armstrong , Manivannan Sadhasivam , Matthias Brugger , AngeloGioacchino Del Regno , Kees Cook , "Gustavo A. R. Silva" , linux-arm-kernel@lists.infradead.org (moderated list:ARM/Mediatek USB3 PHY DRIVER), linux-mediatek@lists.infradead.org (moderated list:ARM/Mediatek USB3 PHY DRIVER), linux-kernel@vger.kernel.org (open list:ARM/Mediatek SoC support), linux-hardening@vger.kernel.org (open list:KERNEL HARDENING (not covered by other areas):Keyword:\b__counted_by(_le|_be|_ptr)?\b) Subject: [PATCHv2] phy: mediatek: tphy: simplify main allocation Date: Wed, 12 Aug 2026 11:18:57 -0700 Message-ID: <20260812181857.64544-1-rosenp@gmail.com> X-Mailer: git-send-email 2.55.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 replace kzalloc + kcalloc with a single kzalloc. Shuffled some code around as __counted_by requires the counting variable to be assigned first. Removed NULL check from of_get_match_data as it's never NULL per the device table. Signed-off-by: Rosen Penev --- v2: add back NULL check drivers/phy/mediatek/phy-mtk-tphy.c | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/drivers/phy/mediatek/phy-mtk-tphy.c b/drivers/phy/mediatek/phy-mtk-tphy.c index acf506529507..e9b9e667b319 100644 --- a/drivers/phy/mediatek/phy-mtk-tphy.c +++ b/drivers/phy/mediatek/phy-mtk-tphy.c @@ -340,10 +340,10 @@ struct mtk_tphy { struct device *dev; void __iomem *sif_base; /* only shared sif */ const struct mtk_phy_pdata *pdata; - struct mtk_phy_instance **phys; - int nphys; int src_ref_clk; /* MHZ, reference clock for slew rate calibrate */ int src_coef; /* coefficient for slew rate calibrate */ + int nphys; + struct mtk_phy_instance *phys[] __counted_by(nphys); }; #if IS_ENABLED(CONFIG_DEBUG_FS) @@ -1572,22 +1572,19 @@ static int mtk_tphy_probe(struct platform_device *pdev) struct mtk_tphy *tphy; struct resource res; int port, ret; + size_t nphys; - tphy = devm_kzalloc(dev, sizeof(*tphy), GFP_KERNEL); + nphys = of_get_child_count(np); + tphy = devm_kzalloc(dev, struct_size(tphy, phys, nphys), GFP_KERNEL); if (!tphy) return -ENOMEM; + tphy->nphys = nphys; + tphy->dev = dev; tphy->pdata = of_device_get_match_data(dev); if (!tphy->pdata) return -EINVAL; - tphy->nphys = of_get_child_count(np); - tphy->phys = devm_kcalloc(dev, tphy->nphys, - sizeof(*tphy->phys), GFP_KERNEL); - if (!tphy->phys) - return -ENOMEM; - - tphy->dev = dev; platform_set_drvdata(pdev, tphy); sif_res = platform_get_resource(pdev, IORESOURCE_MEM, 0); -- 2.55.0