]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
memory: omap-gpmc: Use of_node_name_eq for node name comparisons
authorRob Herring <robh@kernel.org>
Wed, 5 Dec 2018 19:50:30 +0000 (13:50 -0600)
committerTony Lindgren <tony@atomide.com>
Tue, 11 Dec 2018 16:30:29 +0000 (08:30 -0800)
Convert string compares of DT node names to use of_node_name_eq helper
instead. This removes direct access to the node name pointer.

For instances using of_node_cmp, this has the side effect of now using
case sensitive comparisons. This should not matter for any FDT based
system which this is.

Cc: Roger Quadros <rogerq@ti.com>
Cc: Tony Lindgren <tony@atomide.com>
Cc: linux-omap@vger.kernel.org
Signed-off-by: Rob Herring <robh@kernel.org>
Signed-off-by: Tony Lindgren <tony@atomide.com>
drivers/memory/omap-gpmc.c

index c215287e80cf3bbff8d452f53bf097fba39148dd..a66dea4f1ed2500bd0b7dfed1e84428c2b1c9ae2 100644 (file)
@@ -2060,7 +2060,7 @@ static int gpmc_probe_generic_child(struct platform_device *pdev,
         * timings.
         */
        name = gpmc_cs_get_name(cs);
-       if (name && of_node_cmp(child->name, name) == 0)
+       if (name && of_node_name_eq(child, name))
                goto no_timings;
 
        ret = gpmc_cs_request(cs, resource_size(&res), &base);
@@ -2068,7 +2068,7 @@ static int gpmc_probe_generic_child(struct platform_device *pdev,
                dev_err(&pdev->dev, "cannot request GPMC CS %d\n", cs);
                return ret;
        }
-       gpmc_cs_set_name(cs, child->name);
+       gpmc_cs_set_name(cs, child->full_name);
 
        gpmc_read_settings_dt(child, &gpmc_s);
        gpmc_read_timings_dt(child, &gpmc_t);
@@ -2113,7 +2113,7 @@ static int gpmc_probe_generic_child(struct platform_device *pdev,
                goto err;
        }
 
-       if (of_node_cmp(child->name, "nand") == 0) {
+       if (of_node_name_eq(child, "nand")) {
                /* Warn about older DT blobs with no compatible property */
                if (!of_property_read_bool(child, "compatible")) {
                        dev_warn(&pdev->dev,
@@ -2123,7 +2123,7 @@ static int gpmc_probe_generic_child(struct platform_device *pdev,
                }
        }
 
-       if (of_node_cmp(child->name, "onenand") == 0) {
+       if (of_node_name_eq(child, "onenand")) {
                /* Warn about older DT blobs with no compatible property */
                if (!of_property_read_bool(child, "compatible")) {
                        dev_warn(&pdev->dev,