From nobody Wed Jun 17 01:32:57 2026 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 CF9A937BE89 for ; Tue, 28 Apr 2026 20:47:46 +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=1777409268; cv=none; b=eux1U00DKm7Kji75kK+NfUYcH4m/zneJHfr3pW8Fg8EsgrjCiw+yKnNauh3NuT5t0hfMKUmAc236v/mNsp0AZ4htCkYrrCjJz14Sx5iVG1G2P6TvOznJfxj3smZC59Mb8eDtWp3XAaUnDSfTlZyzqRCISEyTmq1risRobXT4j5I= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777409268; c=relaxed/simple; bh=Ee6csCFuJ7OyP4zRXUsk4xv4MxFegFSbv4TGQOLft70=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=kEQEfFQDdstSrnIALRvLsad6dafgdQdev/ijsEMlrEsXcK2qh4rPh+qik+/isNGMBp+csMXEpjaZswbZFGhGTAGvVMXQ5aQv9J31N21uODDLz924C+7foKR8xY2C6wNITzGHUOt2oZhKSCy6lTABx4YEMYeIZEQj3dzkF6qmM+o= 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=XojILrPC; 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="XojILrPC" Received: by mail-pl1-f182.google.com with SMTP id d9443c01a7336-2b461310af5so1067005ad.1 for ; Tue, 28 Apr 2026 13:47:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1777409266; x=1778014066; 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=VAa2PNw2MA0LtCcMxB82x0dNjRxhDcqLLkFOsUniKRQ=; b=XojILrPCE71A8+57gtpmVhPcmrMrX0L8n17xNOpp1N+4dLhx0PGEyU+/tcVlsN63B+ 7IP5FFBfPtJAsroEGBeOh6G//RCIZOdNStufjbmJVxf/HXVkI+o21WZJITcZGWKC7HHM QC8YxVbat2tSwm9E/VLgBUPkVfGFcoVwWN5O/75i4mQIifTUpqRGR7oZ9pVO7mI7L7DL rDxCaxqjB/uf7mP2dBrmW8BfsBTburJnnQcxzlbEUgzKEj+0MMVGTkxN8128hJntin// U9EwEFz02wDrxJEup9LpEU0XKpOS6l9UmCg6hm6oOmrYJyhiIIVRi3HDg+eV7yiXTJG8 BEQA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1777409266; x=1778014066; 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=VAa2PNw2MA0LtCcMxB82x0dNjRxhDcqLLkFOsUniKRQ=; b=nLxQB46uOJm4pqLcP0Y4UXlYV3NxEQhfB4JveBYSTO02wm28CHogMIKUHKxNckwyzu tx4Yvobsccc1Y60EsDbqq/Mt1juDfFEMlm09ZIY3bnjOV8Hwo9FRZY+HNFOgKfIpZzhB B1TIeWG2+RMM9CwdKgGew64OfWJxIv+UTDRhb1SLBuE/dUbIBpacedu0wpGH3lMoDtKS Sd/zcrM017CEu34EeE1Yyu0tFRkd9Wbvfv6YXvtisXOe8sGOOAgtDNAkw2zfbeuz4Uh+ lvmJkYy+RM4mlRnUJEf1GaIwu9DENiTrhOJ48e4hV20BVlkKh48bDDsVKhb8qgIN4W1X gL3Q== X-Forwarded-Encrypted: i=1; AFNElJ+weEld1kUoksv6Oau2MKZzh66pBMJ9Nx4d+fFUZQ/eC5IQuRn+ViWSLcEJ+QNDTxQ9T53HXgnLUMSmbBU=@vger.kernel.org X-Gm-Message-State: AOJu0YyGuNpcFolGbFOahj57aq+qkjX9QsG3pEQQMVjXlJujbiO0YYgN otfOnbCdTfGUScETa/3itfwhu0CWyq1pbfDCCrohGAQ7nudzqauo3Tn1 X-Gm-Gg: AeBDiet5gPsD5CwCvlMrtSzo6zXR7TZBKO9+Hkdn1h0zwyQMzChvRL1NMyQk5ZBmzaJ 8BXF5v4bBgVaVa3OzW2C40SewnvS1hodGsadH63omy6zKH8TL0KVg3k/SmM9brwwL1mvJswEREX 8QQV/P/zJE4stqeHsk4vWv3h4DsucRSLplGVyBYNE9CZlO1soqPI6wmBxYSegVOXkhU2f34NkmE L0nU7xOi+EK6aDmf8Nzq9vncPtbJFlOyVZN1PaG/iKrfUtl6u/ZFe7eJ5GpxvIqtX12KJ/WnJI4 R6727LzUvAemwAIVoYfDykLyNSTNwVuvaO5IYYDRiGdVU/AQXLyPjUAio196CTxNPDLBTG4ulKW Je8xNpVeGkFLrQbDS/KCwvl76FmwZv30bOlAW/UzOgGScukz8vuQA6i/NkwPANFgeuuBCErMuGp 9IZkfNBgnRLQ/kgnDJtpzowDGF8zuu/t/3KWjdscJH3/CPjwD1UOqTQBXlq6h0tiFRc24T9Jnfy /nIv/P+IGd2zEG+UvX+aHHArQ== X-Received: by 2002:a17:903:2410:b0:2b4:68c9:302a with SMTP id d9443c01a7336-2b9882388cdmr4242925ad.17.1777409266098; Tue, 28 Apr 2026 13:47:46 -0700 (PDT) Received: from ryzen ([2601:644:8000:5b5d::8bd]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2b98893f7easm1107525ad.42.2026.04.28.13.47.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 28 Apr 2026 13:47:45 -0700 (PDT) From: Rosen Penev To: linux-sound@vger.kernel.org Cc: Peter Ujfalusi , Liam Girdwood , Mark Brown , Jaroslav Kysela , Takashi Iwai , linux-kernel@vger.kernel.org (open list) Subject: [PATCHv2] ASoC: ti: j721e-evm: allocate dai_links with priv Date: Tue, 28 Apr 2026 13:47:28 -0700 Message-ID: <20260428204728.24103-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: quoted-printable Content-Type: text/plain; charset="utf-8" Use a flexible array member to combine allocations. Simplifies the code slightly. Remove open coding of of_device_get_match_data as well as unnecessary NULL checks. of_device_get_match_data cannot fail. All compatible entries have a corresponding data section. Signed-off-by: Rosen Penev --- v2: bring back of_device_get_match_data NULL check. sound/soc/ti/j721e-evm.c | 22 ++++++---------------- 1 file changed, 6 insertions(+), 16 deletions(-) diff --git a/sound/soc/ti/j721e-evm.c b/sound/soc/ti/j721e-evm.c index faa62c1a9b8e..be9c363df361 100644 --- a/sound/soc/ti/j721e-evm.c +++ b/sound/soc/ti/j721e-evm.c @@ -74,7 +74,6 @@ struct j721e_audio_domain { struct j721e_priv { struct device *dev; struct snd_soc_card card; - struct snd_soc_dai_link *dai_links; struct snd_soc_codec_conf codec_conf[J721E_CODEC_CONF_COUNT]; struct snd_interval rate_range; const struct j721e_audio_match_data *match_data; @@ -84,6 +83,7 @@ struct j721e_priv { struct j721e_audio_domain audio_domains[J721E_AUDIO_DOMAIN_LAST]; =20 struct mutex mutex; + struct snd_soc_dai_link dai_links[]; }; =20 static const struct snd_soc_dapm_widget j721e_cpb_dapm_widgets[] =3D { @@ -844,33 +844,23 @@ static int j721e_soc_probe_ivi(struct j721e_priv *pri= v, int *link_idx, =20 static int j721e_soc_probe(struct platform_device *pdev) { - struct device_node *node =3D pdev->dev.of_node; + const struct j721e_audio_match_data *match; struct snd_soc_card *card; - const struct of_device_id *match; struct j721e_priv *priv; int link_cnt, conf_cnt, ret, i; =20 - if (!node) { - dev_err(&pdev->dev, "of node is missing.\n"); - return -ENODEV; - } - - match =3D of_match_node(j721e_audio_of_match, node); + match =3D of_device_get_match_data(&pdev->dev); if (!match) { dev_err(&pdev->dev, "No compatible match found\n"); return -ENODEV; } =20 - priv =3D devm_kzalloc(&pdev->dev, sizeof(*priv), GFP_KERNEL); + priv =3D devm_kzalloc(&pdev->dev, + struct_size(priv, dai_links, match->num_links), GFP_KERNEL); if (!priv) return -ENOMEM; =20 - priv->match_data =3D match->data; - - priv->dai_links =3D devm_kcalloc(&pdev->dev, priv->match_data->num_links, - sizeof(*priv->dai_links), GFP_KERNEL); - if (!priv->dai_links) - return -ENOMEM; + priv->match_data =3D match; =20 for (i =3D 0; i < J721E_AUDIO_DOMAIN_LAST; i++) priv->audio_domains[i].parent_clk_id =3D -1; --=20 2.54.0