diff options
Diffstat (limited to 'arch/powerpc/kernel/vio.c')
-rw-r--r-- | arch/powerpc/kernel/vio.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/arch/powerpc/kernel/vio.c b/arch/powerpc/kernel/vio.c index 7a421e8fe7ca..3052a931f2b5 100644 --- a/arch/powerpc/kernel/vio.c +++ b/arch/powerpc/kernel/vio.c | |||
@@ -1294,8 +1294,7 @@ static void __devinit vio_dev_release(struct device *dev) | |||
1294 | struct iommu_table *tbl = get_iommu_table_base(dev); | 1294 | struct iommu_table *tbl = get_iommu_table_base(dev); |
1295 | 1295 | ||
1296 | if (tbl) | 1296 | if (tbl) |
1297 | iommu_free_table(tbl, dev->of_node ? | 1297 | iommu_free_table(tbl, of_node_full_name(dev->of_node)); |
1298 | dev->of_node->full_name : dev_name(dev)); | ||
1299 | of_node_put(dev->of_node); | 1298 | of_node_put(dev->of_node); |
1300 | kfree(to_vio_dev(dev)); | 1299 | kfree(to_vio_dev(dev)); |
1301 | } | 1300 | } |
@@ -1519,7 +1518,7 @@ static ssize_t devspec_show(struct device *dev, | |||
1519 | { | 1518 | { |
1520 | struct device_node *of_node = dev->of_node; | 1519 | struct device_node *of_node = dev->of_node; |
1521 | 1520 | ||
1522 | return sprintf(buf, "%s\n", of_node ? of_node->full_name : "none"); | 1521 | return sprintf(buf, "%s\n", of_node_full_name(of_node)); |
1523 | } | 1522 | } |
1524 | 1523 | ||
1525 | static ssize_t modalias_show(struct device *dev, struct device_attribute *attr, | 1524 | static ssize_t modalias_show(struct device *dev, struct device_attribute *attr, |