From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 4DC39361DDE for ; Tue, 6 Jan 2026 18:10:26 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1767723026; cv=none; b=sXgwDqZhfecufXnbrEo4zwSdbnoTeHh0zb9NaLzENaxKljP5gDatPw4XBniOLQbyhMUaiZGpS+3j6Jlguo8TBl4hOAzlp62ItFI75Rx+jViU54X9/u8FzRJEiZkuZzcrsqmznvuDs1CYXRsVYcWFLv4egZ4ak+RTeQhGgNlMKBU= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1767723026; c=relaxed/simple; bh=ScnR7kmp71kInn2Lz5WiAbwDy7A+jUS94SckTeNq6l4=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=S0dMiN4M7dDVsr8x403sIHif7IosP4FKOu1IZaDORVPRZ4epZEXpUseBl01ghjmBGGCA67M8QiGq1ah9A9uH5FnJPvrAAScTP6b/inZdujhDV22qFhGGqpKAVcJuoaOI6gQt9ksMEddx6FY7kGp+dflBg5nndh7jYQQyAhiuf+E= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=gwE7vOpz; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="gwE7vOpz" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 7B833C19425; Tue, 6 Jan 2026 18:10:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1767723026; bh=ScnR7kmp71kInn2Lz5WiAbwDy7A+jUS94SckTeNq6l4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=gwE7vOpzFSDA58qojq2q5FKdvhntcKRRaNJlj6AWI3IX8a+/OtWskSCOybyw5sL86 ewC3qqSsBD1REmlX2BgCzQHZBqLesIqqX9rd1CLXI8no7+HAFT2UyCOb5p05LsdyWH Vwsc7wehgQVnKvbyq75K3ddQj7ENzRcNPeFwZSghlCaiwuFAYO2hZFF+FO1WY16JDC l7nvGMKPITeLF9W+ErnTAIZ1yx4xXzjVIVDcUt07VXe940H26wyMUMJEbXgi0k2gwp aDCZ/trY3Q4U7cQp3cySuVEbnF9BwT0rQ1tjiN4ViI34bmHADhqjc/c4n/+BcxcKgT TEDttzsHjOILQ== From: Sasha Levin To: stable@vger.kernel.org Cc: Rob Herring , Ulf Hansson , Sasha Levin Subject: [PATCH 5.15.y 2/3] pmdomain: Use device_get_match_data() Date: Tue, 6 Jan 2026 13:10:15 -0500 Message-ID: <20260106181021.3109327-2-sashal@kernel.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20260106181021.3109327-1-sashal@kernel.org> References: <2026010515-dragonish-pelican-5b3c@gregkh> <20260106181021.3109327-1-sashal@kernel.org> Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit From: Rob Herring [ Upstream commit 3ba9fdfaa550936837b50b73d6c27ac401fde875 ] Use preferred device_get_match_data() instead of of_match_device() to get the driver match data. With this, adjust the includes to explicitly include the correct headers. Signed-off-by: Rob Herring Link: https://lore.kernel.org/r/20231006224614.444488-1-robh@kernel.org Signed-off-by: Ulf Hansson Stable-dep-of: 73cb5f6eafb0 ("pmdomain: imx: Fix reference count leak in imx_gpc_probe()") Signed-off-by: Sasha Levin --- drivers/soc/actions/owl-sps.c | 16 +++++----------- drivers/soc/imx/gpc.c | 7 +++---- drivers/soc/rockchip/pm_domains.c | 13 ++++--------- 3 files changed, 12 insertions(+), 24 deletions(-) diff --git a/drivers/soc/actions/owl-sps.c b/drivers/soc/actions/owl-sps.c index 73a9e0bb7e8e..3a586d1f3256 100644 --- a/drivers/soc/actions/owl-sps.c +++ b/drivers/soc/actions/owl-sps.c @@ -8,8 +8,10 @@ * Copyright (c) 2017 Andreas Färber */ +#include #include -#include +#include +#include #include #include #include @@ -96,24 +98,16 @@ static int owl_sps_init_domain(struct owl_sps *sps, int index) static int owl_sps_probe(struct platform_device *pdev) { - const struct of_device_id *match; const struct owl_sps_info *sps_info; struct owl_sps *sps; int i, ret; - if (!pdev->dev.of_node) { - dev_err(&pdev->dev, "no device node\n"); - return -ENODEV; - } - - match = of_match_device(pdev->dev.driver->of_match_table, &pdev->dev); - if (!match || !match->data) { + sps_info = device_get_match_data(&pdev->dev); + if (!sps_info) { dev_err(&pdev->dev, "unknown compatible or missing data\n"); return -EINVAL; } - sps_info = match->data; - sps = devm_kzalloc(&pdev->dev, struct_size(sps, domains, sps_info->num_domains), GFP_KERNEL); diff --git a/drivers/soc/imx/gpc.c b/drivers/soc/imx/gpc.c index 8d0d05041be3..18f58e321ea8 100644 --- a/drivers/soc/imx/gpc.c +++ b/drivers/soc/imx/gpc.c @@ -7,9 +7,10 @@ #include #include #include -#include +#include #include #include +#include #include #include @@ -403,9 +404,7 @@ static int imx_gpc_old_dt_init(struct device *dev, struct regmap *regmap, static int imx_gpc_probe(struct platform_device *pdev) { - const struct of_device_id *of_id = - of_match_device(imx_gpc_dt_ids, &pdev->dev); - const struct imx_gpc_dt_data *of_id_data = of_id->data; + const struct imx_gpc_dt_data *of_id_data = device_get_match_data(&pdev->dev); struct device_node *pgc_node; struct regmap *regmap; void __iomem *base; diff --git a/drivers/soc/rockchip/pm_domains.c b/drivers/soc/rockchip/pm_domains.c index b1cf7d29dafd..8f77b4342362 100644 --- a/drivers/soc/rockchip/pm_domains.c +++ b/drivers/soc/rockchip/pm_domains.c @@ -9,11 +9,13 @@ #include #include #include +#include #include #include +#include +#include #include #include -#include #include #include #include @@ -739,7 +741,6 @@ static int rockchip_pm_domain_probe(struct platform_device *pdev) struct device_node *node; struct device *parent; struct rockchip_pmu *pmu; - const struct of_device_id *match; const struct rockchip_pmu_info *pmu_info; int error; @@ -748,13 +749,7 @@ static int rockchip_pm_domain_probe(struct platform_device *pdev) return -ENODEV; } - match = of_match_device(dev->driver->of_match_table, dev); - if (!match || !match->data) { - dev_err(dev, "missing pmu data\n"); - return -EINVAL; - } - - pmu_info = match->data; + pmu_info = device_get_match_data(dev); pmu = devm_kzalloc(dev, struct_size(pmu, domains, pmu_info->num_domains), -- 2.51.0