diff options
author | Stephen Rothwell <sfr@canb.auug.org.au> | 2007-04-03 08:26:41 -0400 |
---|---|---|
committer | Paul Mackerras <paulus@samba.org> | 2007-04-12 13:55:19 -0400 |
commit | e2eb63927bfcb54232163bfec32440246fd44457 (patch) | |
tree | 596656edeb2332b5134d8236fa50b87f2c0ece29 /arch/powerpc/kernel/vio.c | |
parent | ceef87782a9452eeeca774e65d7f4e06455780a3 (diff) |
[POWERPC] Rename get_property to of_get_property: arch/powerpc
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Acked-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'arch/powerpc/kernel/vio.c')
-rw-r--r-- | arch/powerpc/kernel/vio.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/arch/powerpc/kernel/vio.c b/arch/powerpc/kernel/vio.c index 2968ffeafdb6..a09277a8639f 100644 --- a/arch/powerpc/kernel/vio.c +++ b/arch/powerpc/kernel/vio.c | |||
@@ -81,7 +81,7 @@ static struct iommu_table *vio_build_iommu_table(struct vio_dev *dev) | |||
81 | struct iommu_table *tbl; | 81 | struct iommu_table *tbl; |
82 | unsigned long offset, size; | 82 | unsigned long offset, size; |
83 | 83 | ||
84 | dma_window = get_property(dev->dev.archdata.of_node, | 84 | dma_window = of_get_property(dev->dev.archdata.of_node, |
85 | "ibm,my-dma-window", NULL); | 85 | "ibm,my-dma-window", NULL); |
86 | if (!dma_window) | 86 | if (!dma_window) |
87 | return NULL; | 87 | return NULL; |
@@ -226,7 +226,7 @@ struct vio_dev * __devinit vio_register_device_node(struct device_node *of_node) | |||
226 | return NULL; | 226 | return NULL; |
227 | } | 227 | } |
228 | 228 | ||
229 | unit_address = get_property(of_node, "reg", NULL); | 229 | unit_address = of_get_property(of_node, "reg", NULL); |
230 | if (unit_address == NULL) { | 230 | if (unit_address == NULL) { |
231 | printk(KERN_WARNING "%s: node %s missing 'reg'\n", | 231 | printk(KERN_WARNING "%s: node %s missing 'reg'\n", |
232 | __FUNCTION__, | 232 | __FUNCTION__, |
@@ -246,7 +246,7 @@ struct vio_dev * __devinit vio_register_device_node(struct device_node *of_node) | |||
246 | viodev->type = of_node->type; | 246 | viodev->type = of_node->type; |
247 | viodev->unit_address = *unit_address; | 247 | viodev->unit_address = *unit_address; |
248 | if (firmware_has_feature(FW_FEATURE_ISERIES)) { | 248 | if (firmware_has_feature(FW_FEATURE_ISERIES)) { |
249 | unit_address = get_property(of_node, | 249 | unit_address = of_get_property(of_node, |
250 | "linux,unit_address", NULL); | 250 | "linux,unit_address", NULL); |
251 | if (unit_address != NULL) | 251 | if (unit_address != NULL) |
252 | viodev->unit_address = *unit_address; | 252 | viodev->unit_address = *unit_address; |
@@ -377,7 +377,7 @@ static int vio_hotplug(struct device *dev, char **envp, int num_envp, | |||
377 | dn = dev->archdata.of_node; | 377 | dn = dev->archdata.of_node; |
378 | if (!dn) | 378 | if (!dn) |
379 | return -ENODEV; | 379 | return -ENODEV; |
380 | cp = get_property(dn, "compatible", &length); | 380 | cp = of_get_property(dn, "compatible", &length); |
381 | if (!cp) | 381 | if (!cp) |
382 | return -ENODEV; | 382 | return -ENODEV; |
383 | 383 | ||
@@ -406,12 +406,12 @@ struct bus_type vio_bus_type = { | |||
406 | * @which: The property/attribute to be extracted. | 406 | * @which: The property/attribute to be extracted. |
407 | * @length: Pointer to length of returned data size (unused if NULL). | 407 | * @length: Pointer to length of returned data size (unused if NULL). |
408 | * | 408 | * |
409 | * Calls prom.c's get_property() to return the value of the | 409 | * Calls prom.c's of_get_property() to return the value of the |
410 | * attribute specified by @which | 410 | * attribute specified by @which |
411 | */ | 411 | */ |
412 | const void *vio_get_attribute(struct vio_dev *vdev, char *which, int *length) | 412 | const void *vio_get_attribute(struct vio_dev *vdev, char *which, int *length) |
413 | { | 413 | { |
414 | return get_property(vdev->dev.archdata.of_node, which, length); | 414 | return of_get_property(vdev->dev.archdata.of_node, which, length); |
415 | } | 415 | } |
416 | EXPORT_SYMBOL(vio_get_attribute); | 416 | EXPORT_SYMBOL(vio_get_attribute); |
417 | 417 | ||
@@ -443,7 +443,7 @@ struct vio_dev *vio_find_node(struct device_node *vnode) | |||
443 | char kobj_name[BUS_ID_SIZE]; | 443 | char kobj_name[BUS_ID_SIZE]; |
444 | 444 | ||
445 | /* construct the kobject name from the device node */ | 445 | /* construct the kobject name from the device node */ |
446 | unit_address = get_property(vnode, "reg", NULL); | 446 | unit_address = of_get_property(vnode, "reg", NULL); |
447 | if (!unit_address) | 447 | if (!unit_address) |
448 | return NULL; | 448 | return NULL; |
449 | snprintf(kobj_name, BUS_ID_SIZE, "%x", *unit_address); | 449 | snprintf(kobj_name, BUS_ID_SIZE, "%x", *unit_address); |