diff options
| author | Rob Herring <robh@kernel.org> | 2018-12-05 14:50:30 -0500 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2018-12-11 11:30:29 -0500 |
| commit | c2ade654dbf7d02f09ad491f5621fc321d4af96b (patch) | |
| tree | ea5f5d2216d960d68910a0ef6b49ebbe537b0fe8 /drivers/memory | |
| parent | 04491ab0c4f03061f2b402e8b74f101abc8a8a15 (diff) | |
memory: omap-gpmc: Use of_node_name_eq for node name comparisons
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>
Diffstat (limited to 'drivers/memory')
| -rw-r--r-- | drivers/memory/omap-gpmc.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/memory/omap-gpmc.c b/drivers/memory/omap-gpmc.c index c215287e80cf..a66dea4f1ed2 100644 --- a/drivers/memory/omap-gpmc.c +++ b/drivers/memory/omap-gpmc.c | |||
| @@ -2060,7 +2060,7 @@ static int gpmc_probe_generic_child(struct platform_device *pdev, | |||
| 2060 | * timings. | 2060 | * timings. |
| 2061 | */ | 2061 | */ |
| 2062 | name = gpmc_cs_get_name(cs); | 2062 | name = gpmc_cs_get_name(cs); |
| 2063 | if (name && of_node_cmp(child->name, name) == 0) | 2063 | if (name && of_node_name_eq(child, name)) |
| 2064 | goto no_timings; | 2064 | goto no_timings; |
| 2065 | 2065 | ||
| 2066 | ret = gpmc_cs_request(cs, resource_size(&res), &base); | 2066 | ret = gpmc_cs_request(cs, resource_size(&res), &base); |
| @@ -2068,7 +2068,7 @@ static int gpmc_probe_generic_child(struct platform_device *pdev, | |||
| 2068 | dev_err(&pdev->dev, "cannot request GPMC CS %d\n", cs); | 2068 | dev_err(&pdev->dev, "cannot request GPMC CS %d\n", cs); |
| 2069 | return ret; | 2069 | return ret; |
| 2070 | } | 2070 | } |
| 2071 | gpmc_cs_set_name(cs, child->name); | 2071 | gpmc_cs_set_name(cs, child->full_name); |
| 2072 | 2072 | ||
| 2073 | gpmc_read_settings_dt(child, &gpmc_s); | 2073 | gpmc_read_settings_dt(child, &gpmc_s); |
| 2074 | gpmc_read_timings_dt(child, &gpmc_t); | 2074 | gpmc_read_timings_dt(child, &gpmc_t); |
| @@ -2113,7 +2113,7 @@ static int gpmc_probe_generic_child(struct platform_device *pdev, | |||
| 2113 | goto err; | 2113 | goto err; |
| 2114 | } | 2114 | } |
| 2115 | 2115 | ||
| 2116 | if (of_node_cmp(child->name, "nand") == 0) { | 2116 | if (of_node_name_eq(child, "nand")) { |
| 2117 | /* Warn about older DT blobs with no compatible property */ | 2117 | /* Warn about older DT blobs with no compatible property */ |
| 2118 | if (!of_property_read_bool(child, "compatible")) { | 2118 | if (!of_property_read_bool(child, "compatible")) { |
| 2119 | dev_warn(&pdev->dev, | 2119 | dev_warn(&pdev->dev, |
| @@ -2123,7 +2123,7 @@ static int gpmc_probe_generic_child(struct platform_device *pdev, | |||
| 2123 | } | 2123 | } |
| 2124 | } | 2124 | } |
| 2125 | 2125 | ||
| 2126 | if (of_node_cmp(child->name, "onenand") == 0) { | 2126 | if (of_node_name_eq(child, "onenand")) { |
| 2127 | /* Warn about older DT blobs with no compatible property */ | 2127 | /* Warn about older DT blobs with no compatible property */ |
| 2128 | if (!of_property_read_bool(child, "compatible")) { | 2128 | if (!of_property_read_bool(child, "compatible")) { |
| 2129 | dev_warn(&pdev->dev, | 2129 | dev_warn(&pdev->dev, |
