]> Gentwo Git Trees - linux/.git/commitdiff
powercap: dtpm: Simplify with of_machine_get_match_data()
authorKrzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Wed, 12 Nov 2025 10:28:54 +0000 (11:28 +0100)
committerRob Herring (Arm) <robh@kernel.org>
Thu, 27 Nov 2025 01:43:02 +0000 (19:43 -0600)
Replace open-coded getting root OF node, matching against it and getting
the match data with new of_machine_get_match_data() helper.

Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Reviewed-by: Lukasz Luba <lukasz.luba@arm.com>
Reviewed-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>
Tested-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>
Link: https://patch.msgid.link/20251112-b4-of-match-matchine-data-v2-9-d46b72003fd6@linaro.org
Signed-off-by: Rob Herring (Arm) <robh@kernel.org>
drivers/powercap/dtpm.c

index f390665743c439dedabb3d441ef4ecacdc2fbe4e..129d55bc705c630e9e7d7d4579fc02607c3b80ad 100644 (file)
@@ -548,9 +548,7 @@ static int dtpm_for_each_child(const struct dtpm_node *hierarchy,
  */
 int dtpm_create_hierarchy(struct of_device_id *dtpm_match_table)
 {
-       const struct of_device_id *match;
        const struct dtpm_node *hierarchy;
-       struct device_node *np;
        int i, ret;
 
        mutex_lock(&dtpm_lock);
@@ -567,19 +565,7 @@ int dtpm_create_hierarchy(struct of_device_id *dtpm_match_table)
                goto out_pct;
        }
 
-       ret = -ENODEV;
-       np = of_find_node_by_path("/");
-       if (!np)
-               goto out_err;
-
-       match = of_match_node(dtpm_match_table, np);
-
-       of_node_put(np);
-
-       if (!match)
-               goto out_err;
-
-       hierarchy = match->data;
+       hierarchy = of_machine_get_match_data(dtpm_match_table);
        if (!hierarchy) {
                ret = -EFAULT;
                goto out_err;