]> git.karo-electronics.de Git - mv-sheeva.git/commitdiff
pci_sun4v: Use of_get_property().
authorDavid S. Miller <davem@davemloft.net>
Tue, 2 Sep 2008 03:23:18 +0000 (20:23 -0700)
committerDavid S. Miller <davem@davemloft.net>
Tue, 2 Sep 2008 07:52:56 +0000 (00:52 -0700)
Signed-off-by: David S. Miller <davem@davemloft.net>
arch/sparc64/kernel/pci_sun4v.c

index 4839c503c88d049cb6a0f1c866f8ef17931ad018..6bed2f6bf7cd3ceebef0731293469f3a07706e2e 100644 (file)
@@ -587,22 +587,15 @@ static unsigned long __init probe_existing_entries(struct pci_pbm_info *pbm,
 
 static int __init pci_sun4v_iommu_init(struct pci_pbm_info *pbm)
 {
+       static const u32 vdma_default[] = { 0x80000000, 0x80000000 };
        struct iommu *iommu = pbm->iommu;
-       struct property *prop;
        unsigned long num_tsb_entries, sz, tsbsize;
-       u32 vdma[2], dma_mask, dma_offset;
-
-       prop = of_find_property(pbm->prom_node, "virtual-dma", NULL);
-       if (prop) {
-               u32 *val = prop->value;
-
-               vdma[0] = val[0];
-               vdma[1] = val[1];
-       } else {
-               /* No property, use default values. */
-               vdma[0] = 0x80000000;
-               vdma[1] = 0x80000000;
-       }
+       u32 dma_mask, dma_offset;
+       const u32 *vdma;
+
+       vdma = of_get_property(pbm->prom_node, "virtual-dma", NULL);
+       if (!vdma)
+               vdma = vdma_default;
 
        if ((vdma[0] | vdma[1]) & ~IO_PAGE_MASK) {
                printk(KERN_ERR PFX "Strange virtual-dma[%08x:%08x].\n",