]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
power: reset: brcmstb: Use device_get_match_data() for matching
authorAndrew Davis <afd@ti.com>
Mon, 10 Jun 2024 14:28:33 +0000 (09:28 -0500)
committerSebastian Reichel <sebastian.reichel@collabora.com>
Tue, 27 Aug 2024 17:34:01 +0000 (19:34 +0200)
Use device_get_match_data() for finding the matching node and fetching
the match data all in one.

Signed-off-by: Andrew Davis <afd@ti.com>
Acked-by: Florian Fainelli <florian.fainelli@broadcom.com>
Link: https://lore.kernel.org/r/20240610142836.168603-2-afd@ti.com
Signed-off-by: Sebastian Reichel <sebastian.reichel@collabora.com>
drivers/power/reset/brcmstb-reboot.c

index 797f0079bb590ce156284ffb26c6169acdfed15e..db5b7120eadd0d992e33fa5a4cde693cbd0248ca 100644 (file)
@@ -83,24 +83,16 @@ static const struct reset_reg_mask reset_bits_65nm = {
        .sw_mstr_rst_mask = BIT(31),
 };
 
-static const struct of_device_id of_match[] = {
-       { .compatible = "brcm,brcmstb-reboot", .data = &reset_bits_40nm },
-       { .compatible = "brcm,bcm7038-reboot", .data = &reset_bits_65nm },
-       {},
-};
-
 static int brcmstb_reboot_probe(struct platform_device *pdev)
 {
        int rc;
        struct device_node *np = pdev->dev.of_node;
-       const struct of_device_id *of_id;
 
-       of_id = of_match_node(of_match, np);
-       if (!of_id) {
-               pr_err("failed to look up compatible string\n");
+       reset_masks = device_get_match_data(&pdev->dev);
+       if (!reset_masks) {
+               pr_err("failed to get match data\n");
                return -EINVAL;
        }
-       reset_masks = of_id->data;
 
        regmap = syscon_regmap_lookup_by_phandle(np, "syscon");
        if (IS_ERR(regmap)) {
@@ -130,6 +122,12 @@ static int brcmstb_reboot_probe(struct platform_device *pdev)
        return rc;
 }
 
+static const struct of_device_id of_match[] = {
+       { .compatible = "brcm,brcmstb-reboot", .data = &reset_bits_40nm },
+       { .compatible = "brcm,bcm7038-reboot", .data = &reset_bits_65nm },
+       {},
+};
+
 static struct platform_driver brcmstb_reboot_driver = {
        .probe = brcmstb_reboot_probe,
        .driver = {