sparc: Use DT node full_name instead of name for resources

The device_node.name pointer is going to be removed. As the
device_node.full_name is now just the name+unit-address instead of the
full path, use the full_name pointer instead. This will add the
unit-address if there is one to the resource name.

Cc: "David S. Miller" <davem@davemloft.net>
Cc: sparclinux@vger.kernel.org
Signed-off-by: Rob Herring <robh@kernel.org>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/arch/sparc/kernel/ioport.c b/arch/sparc/kernel/ioport.c
index 6799c93c9f274ff0c9a60a68131ae61f74fba937..aeaad04fdd146318676bb1a7ec0978dfb31bbd2a 100644 (file)
--- a/arch/sparc/kernel/ioport.c
+++ b/arch/sparc/kernel/ioport.c
@@ -302,7 +302,7 @@ static void *sbus_alloc_coherent(struct device *dev, size_t len,
        if (sbus_map_dma_area(dev, dma_addrp, va, res->start, len_total) != 0)
                goto err_noiommu;
 
-       res->name = op->dev.of_node->name;
+       res->name = op->dev.of_node->full_name;
 
        return (void *)(unsigned long)res->start;
 

diff --git a/arch/sparc/kernel/of_device_32.c b/arch/sparc/kernel/of_device_32.c
index ee4841a96058308ba44b268ef225c088f947a560..4ebf51e6e78ec1a8d12f4cabbd3106b7cace359c 100644 (file)
--- a/arch/sparc/kernel/of_device_32.c
+++ b/arch/sparc/kernel/of_device_32.c
@@ -333,7 +333,7 @@ static void __init build_device_resources(struct platform_device *op,
                        r->end = result + size - 1;
                        r->flags = flags | ((result >> 32ULL) & 0xffUL);
                }
-               r->name = op->dev.of_node->name;
+               r->name = op->dev.of_node->full_name;
        }
 }
 

diff --git a/arch/sparc/kernel/of_device_64.c b/arch/sparc/kernel/of_device_64.c
index 4b5eabb20ac8eda64a08812ffea9152b4bbd375f..5a9f86b1d4e7e33cb7b60cca06b0c99e1f696dbf 100644 (file)
--- a/arch/sparc/kernel/of_device_64.c
+++ b/arch/sparc/kernel/of_device_64.c
@@ -413,7 +413,7 @@ static void __init build_device_resources(struct platform_device *op,
                        r->end = result + size - 1;
                        r->flags = flags;
                }
-               r->name = op->dev.of_node->name;
+               r->name = op->dev.of_node->full_name;
        }
 }