Commit 86ef771e authored by Rob Herring's avatar Rob Herring Committed by David S. Miller

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: default avatarRob Herring <robh@kernel.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 8119f042
...@@ -302,7 +302,7 @@ static void *sbus_alloc_coherent(struct device *dev, size_t len, ...@@ -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) if (sbus_map_dma_area(dev, dma_addrp, va, res->start, len_total) != 0)
goto err_noiommu; goto err_noiommu;
res->name = op->dev.of_node->name; res->name = op->dev.of_node->full_name;
return (void *)(unsigned long)res->start; return (void *)(unsigned long)res->start;
......
...@@ -333,7 +333,7 @@ static void __init build_device_resources(struct platform_device *op, ...@@ -333,7 +333,7 @@ static void __init build_device_resources(struct platform_device *op,
r->end = result + size - 1; r->end = result + size - 1;
r->flags = flags | ((result >> 32ULL) & 0xffUL); r->flags = flags | ((result >> 32ULL) & 0xffUL);
} }
r->name = op->dev.of_node->name; r->name = op->dev.of_node->full_name;
} }
} }
......
...@@ -413,7 +413,7 @@ static void __init build_device_resources(struct platform_device *op, ...@@ -413,7 +413,7 @@ static void __init build_device_resources(struct platform_device *op,
r->end = result + size - 1; r->end = result + size - 1;
r->flags = flags; r->flags = flags;
} }
r->name = op->dev.of_node->name; r->name = op->dev.of_node->full_name;
} }
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment