ARM: OMAP: display: change compat names to array
authorTomi Valkeinen <tomi.valkeinen@ti.com>
Thu, 11 Dec 2014 14:30:07 +0000 (16:30 +0200)
committerTomi Valkeinen <tomi.valkeinen@ti.com>
Thu, 4 Jun 2015 06:02:09 +0000 (09:02 +0300)
Simplify the DSS detection logic by creating a list of the omapdss
compat strings, instead of checking each separately with an 'if'.

Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
Acked-by: Tony Lindgren <tony@atomide.com>
arch/arm/mach-omap2/display.c

index f492ae147c6ac6752aaeb74b921c2861a1d8cd2a..9868d0bc780566e711eedec34a1953be2cd99246 100644 (file)
@@ -568,25 +568,24 @@ void __init omapdss_early_init_of(void)
 
 }
 
+static const char * const omapdss_compat_names[] __initconst = {
+       "ti,omap2-dss",
+       "ti,omap3-dss",
+       "ti,omap4-dss",
+       "ti,omap5-dss",
+};
+
 struct device_node * __init omapdss_find_dss_of_node(void)
 {
        struct device_node *node;
+       int i;
 
-       node = of_find_compatible_node(NULL, NULL, "ti,omap2-dss");
-       if (node)
-               return node;
-
-       node = of_find_compatible_node(NULL, NULL, "ti,omap3-dss");
-       if (node)
-               return node;
-
-       node = of_find_compatible_node(NULL, NULL, "ti,omap4-dss");
-       if (node)
-               return node;
-
-       node = of_find_compatible_node(NULL, NULL, "ti,omap5-dss");
-       if (node)
-               return node;
+       for (i = 0; i < ARRAY_SIZE(omapdss_compat_names); ++i) {
+               node = of_find_compatible_node(NULL, NULL,
+                       omapdss_compat_names[i]);
+               if (node)
+                       return node;
+       }
 
        return NULL;
 }