From d8dc4af9d9d4c332695005c77e2091c51e4bdc73 Mon Sep 17 00:00:00 2001 From: Tao Huang Date: Fri, 31 Jan 2025 13:11:01 +0800 Subject: [PATCH] soc: rockchip: pvtm: Use device_get_match_data() Use preferred device_get_match_data() instead of of_match_device() to get the driver match data in a single step. Change-Id: I1db708801f98f00e92f30b690ec0f222d14420d7 Signed-off-by: Tao Huang --- drivers/soc/rockchip/rockchip_pvtm.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/drivers/soc/rockchip/rockchip_pvtm.c b/drivers/soc/rockchip/rockchip_pvtm.c index e8d5ddcf4192..846cc69c8ed5 100644 --- a/drivers/soc/rockchip/rockchip_pvtm.c +++ b/drivers/soc/rockchip/rockchip_pvtm.c @@ -17,6 +17,7 @@ #include #include #include +#include #include #include #include @@ -983,13 +984,13 @@ static int rockchip_pvtm_probe(struct platform_device *pdev) struct device *dev = &pdev->dev; struct device_node *np = pdev->dev.of_node; struct device_node *node; - const struct of_device_id *match; + const struct rockchip_pvtm_data *data; struct rockchip_pvtm *pvtm; struct regmap *grf = NULL; void __iomem *base = NULL; - match = of_match_device(dev->driver->of_match_table, dev); - if (!match || !match->data) { + data = device_get_match_data(dev); + if (!data) { dev_err(dev, "missing pvtm data\n"); return -EINVAL; } @@ -1005,7 +1006,7 @@ static int rockchip_pvtm_probe(struct platform_device *pdev) } for_each_available_child_of_node(np, node) { - pvtm = rockchip_pvtm_init(dev, node, match->data, grf, base); + pvtm = rockchip_pvtm_init(dev, node, data, grf, base); if (!pvtm) { dev_err(dev, "failed to handle node %s\n", node->full_name);