diff options
| author | David S. Miller <davem@sunset.davemloft.net> | 2006-06-22 20:21:22 -0700 |
|---|---|---|
| committer | David S. Miller <davem@sunset.davemloft.net> | 2006-06-23 23:15:36 -0700 |
| commit | 25c7581bcdd11cf9b82a8ef062a10bea310cc9e9 (patch) | |
| tree | c88f4ee5e91fa7921ff13627f373e1bfbcec8b81 /arch/sparc64/kernel/sbus.c | |
| parent | 44bdef5e8f2e64ba5974b587989a829d57126bad (diff) | |
[SPARC64]: Kill off some more prom_getproperty() remnants.
The remaining ones occur before we have imported the
device tree.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'arch/sparc64/kernel/sbus.c')
| -rw-r--r-- | arch/sparc64/kernel/sbus.c | 29 |
1 files changed, 15 insertions, 14 deletions
diff --git a/arch/sparc64/kernel/sbus.c b/arch/sparc64/kernel/sbus.c index 8f7877ac858..a72bba39880 100644 --- a/arch/sparc64/kernel/sbus.c +++ b/arch/sparc64/kernel/sbus.c @@ -19,6 +19,7 @@ #include <asm/cache.h> #include <asm/dma.h> #include <asm/irq.h> +#include <asm/prom.h> #include <asm/starfire.h> #include "iommu_common.h" @@ -1098,24 +1099,25 @@ static void __init sysio_register_error_handlers(struct sbus_bus *sbus) } /* Boot time initialization. */ -void __init sbus_iommu_init(int prom_node, struct sbus_bus *sbus) +void __init sbus_iommu_init(int __node, struct sbus_bus *sbus) { - struct linux_prom64_registers rprop; + struct linux_prom64_registers *pr; + struct device_node *dp; struct sbus_iommu *iommu; unsigned long regs, tsb_base; u64 control; - int err, i; + int i; + + dp = of_find_node_by_phandle(__node); - sbus->portid = prom_getintdefault(sbus->prom_node, - "upa-portid", -1); + sbus->portid = of_getintprop_default(dp, "upa-portid", -1); - err = prom_getproperty(prom_node, "reg", - (char *)&rprop, sizeof(rprop)); - if (err < 0) { + pr = of_get_property(dp, "reg", NULL); + if (!pr) { prom_printf("sbus_iommu_init: Cannot map SYSIO control registers.\n"); prom_halt(); } - regs = rprop.phys_addr; + regs = pr->phys_addr; iommu = kmalloc(sizeof(*iommu) + SMP_CACHE_BYTES, GFP_ATOMIC); if (iommu == NULL) { @@ -1228,12 +1230,11 @@ void __init sbus_iommu_init(int prom_node, struct sbus_bus *sbus) void sbus_fill_device_irq(struct sbus_dev *sdev) { - struct linux_prom_irqs irqs[PROMINTR_MAX]; - int len; + struct device_node *dp = of_find_node_by_phandle(sdev->prom_node); + struct linux_prom_irqs *irqs; - len = prom_getproperty(sdev->prom_node, "interrupts", - (char *) irqs, sizeof(irqs)); - if (len == -1 || len == 0) { + irqs = of_get_property(dp, "interrupts", NULL); + if (!irqs) { sdev->irqs[0] = 0; sdev->num_irqs = 0; } else { |