From: Rosen Penev <rosenp@gmail.com>
To: Damien Le Moal <dlemoal@kernel.org>,
Niklas Cassel <cassel@kernel.org>,
Thierry Reding <thierry.reding@kernel.org>,
Jonathan Hunter <jonathanh@nvidia.com>
Cc: linux-ide@vger.kernel.org, linux-tegra@vger.kernel.org,
linux-kernel@vger.kernel.org
Subject: [PATCHv3] ata: ahci_tegra: use devm_kzalloc_flex()
Date: Tue, 10 Nov 2026 18:39:39 -0800 [thread overview]
Message-ID: <20261111023939.75386-1-rosenp@gmail.com> (raw)
Combine allocations into one by using a flexible array member.
Signed-off-by: Rosen Penev <rosenp@gmail.com>
---
v3: use devm_kzalloc_flex()
v2: Rebase
drivers/ata/ahci_tegra.c | 14 ++++++--------
1 file changed, 6 insertions(+), 8 deletions(-)
diff --git a/drivers/ata/ahci_tegra.c b/drivers/ata/ahci_tegra.c
index 2b9b98643128..c6ec344c2e6c 100644
--- a/drivers/ata/ahci_tegra.c
+++ b/drivers/ata/ahci_tegra.c
@@ -176,8 +176,9 @@ struct tegra_ahci_priv {
/* Needs special handling, cannot use ahci_platform */
struct clk *sata_clk;
struct tegra_pmc *pmc;
- struct regulator_bulk_data *supplies;
const struct tegra_ahci_soc *soc;
+ /* this must be the last member */
+ struct regulator_bulk_data supplies[];
};
static void tegra_ahci_handle_quirks(struct ahci_host_priv *hpriv)
@@ -514,6 +515,7 @@ static const struct scsi_host_template ahci_platform_sht = {
static int tegra_ahci_probe(struct platform_device *pdev)
{
+ const struct tegra_ahci_soc *soc;
struct ahci_host_priv *hpriv;
struct tegra_ahci_priv *tegra;
struct resource *res;
@@ -523,14 +525,15 @@ static int tegra_ahci_probe(struct platform_device *pdev)
if (IS_ERR(hpriv))
return PTR_ERR(hpriv);
- tegra = devm_kzalloc_obj(&pdev->dev, *tegra);
+ soc = of_device_get_match_data(&pdev->dev);
+ tegra = devm_kzalloc_flex(&pdev->dev, *tegra, supplies, soc->num_supplies);
if (!tegra)
return -ENOMEM;
hpriv->plat_data = tegra;
tegra->pdev = pdev;
- tegra->soc = of_device_get_match_data(&pdev->dev);
+ tegra->soc = soc;
tegra->sata_regs = devm_platform_ioremap_resource(pdev, 1);
if (IS_ERR(tegra->sata_regs))
@@ -578,11 +581,6 @@ static int tegra_ahci_probe(struct platform_device *pdev)
return dev_err_probe(&pdev->dev, PTR_ERR(tegra->pmc),
"failed to get PMC\n");
- tegra->supplies = devm_kzalloc_objs(&pdev->dev, *tegra->supplies,
- tegra->soc->num_supplies);
- if (!tegra->supplies)
- return -ENOMEM;
-
regulator_bulk_set_supply_names(tegra->supplies,
tegra->soc->supply_names,
tegra->soc->num_supplies);
--
2.56.0
reply other threads:[~2026-11-11 2:39 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20261111023939.75386-1-rosenp@gmail.com \
--to=rosenp@gmail.com \
--cc=cassel@kernel.org \
--cc=dlemoal@kernel.org \
--cc=jonathanh@nvidia.com \
--cc=linux-ide@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tegra@vger.kernel.org \
--cc=thierry.reding@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®