From: Claudiu Beznea <claudiu.bez...@microchip.com>

Instead of trying to match every possible compatible use
of_find_matching_node_and_match() and pass the compatible array.

Signed-off-by: Claudiu Beznea <claudiu.bez...@microchip.com>
---
 drivers/usb/gadget/udc/atmel_usba_udc.c | 25 ++++++++++++++++++-------
 1 file changed, 18 insertions(+), 7 deletions(-)

diff --git a/drivers/usb/gadget/udc/atmel_usba_udc.c 
b/drivers/usb/gadget/udc/atmel_usba_udc.c
index 22200341c8ec..2b154085dc6a 100644
--- a/drivers/usb/gadget/udc/atmel_usba_udc.c
+++ b/drivers/usb/gadget/udc/atmel_usba_udc.c
@@ -2052,6 +2052,13 @@ static const struct of_device_id atmel_udc_dt_ids[] = {
 
 MODULE_DEVICE_TABLE(of, atmel_udc_dt_ids);
 
+static const struct of_device_id atmel_pmc_dt_ids[] = {
+       { .compatible = "atmel,at91sam9g45-pmc" },
+       { .compatible = "atmel,at91sam9rl-pmc" },
+       { .compatible = "atmel,at91sam9x5-pmc" },
+       { /* sentinel */ }
+};
+
 static struct usba_ep * atmel_udc_of_init(struct platform_device *pdev,
                                                    struct usba_udc *udc)
 {
@@ -2067,13 +2074,17 @@ static struct usba_ep * atmel_udc_of_init(struct 
platform_device *pdev,
                return ERR_PTR(-EINVAL);
 
        udc->errata = match->data;
-       udc->pmc = syscon_regmap_lookup_by_compatible("atmel,at91sam9g45-pmc");
-       if (IS_ERR(udc->pmc))
-               udc->pmc = 
syscon_regmap_lookup_by_compatible("atmel,at91sam9rl-pmc");
-       if (IS_ERR(udc->pmc))
-               udc->pmc = 
syscon_regmap_lookup_by_compatible("atmel,at91sam9x5-pmc");
-       if (udc->errata && IS_ERR(udc->pmc))
-               return ERR_CAST(udc->pmc);
+       if (udc->errata) {
+               pp = of_find_matching_node_and_match(NULL, atmel_pmc_dt_ids,
+                                                    NULL);
+               if (!pp)
+                       return ERR_PTR(-ENODEV);
+
+               udc->pmc = syscon_node_to_regmap(pp);
+               of_node_put(pp);
+               if (IS_ERR(udc->pmc))
+                       return ERR_CAST(udc->pmc);
+       }
 
        udc->num_ep = 0;
 
-- 
2.17.1

Reply via email to