leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

pci_schizo: Use of_get_property() and delete spurious local vars.

Browse Source 
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
David S. Miller 2008-09-01 20:21:15 -07:00
parent 0f73d1bbe6
commit 463801b3ae
1 changed files with 8 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
arch/sparc64/kernel/pci_schizo.c
View File

@ -1152,24 +1152,17 @@ static void schizo_pbm_strbuf_init(struct pci_pbm_info *pbm)
static int schizo_pbm_iommu_init(struct pci_pbm_info *pbm) static int schizo_pbm_iommu_init(struct pci_pbm_info *pbm)
{ {
struct iommu *iommu = pbm->iommu; static const u32 vdma_default[] = { 0xc0000000, 0x40000000 };
unsigned long i, tagbase, database; unsigned long i, tagbase, database;
struct property *prop; struct iommu *iommu = pbm->iommu;
u32 vdma[2], dma_mask;
int tsbsize, err; int tsbsize, err;
const u32 *vdma;
u32 dma_mask;
u64 control; u64 control;
prop = of_find_property(pbm->prom_node, "virtual-dma", NULL); vdma = of_get_property(pbm->prom_node, "virtual-dma", NULL);
if (prop) { if (!vdma)
u32 *val = prop->value; vdma = vdma_default;
vdma[0] = val[0];
vdma[1] = val[1];
} else {
/* No property, use default values. */
vdma[0] = 0xc0000000;
vdma[1] = 0x40000000;
}
dma_mask = vdma[0]; dma_mask = vdma[0];
switch (vdma[1]) { switch (vdma[1]) {
@ -1284,7 +1277,6 @@ static int schizo_pbm_iommu_init(struct pci_pbm_info *pbm)
static void schizo_pbm_hw_init(struct pci_pbm_info *pbm) static void schizo_pbm_hw_init(struct pci_pbm_info *pbm)
{ {
struct property *prop;
u64 tmp; u64 tmp;
schizo_write(pbm->pbm_regs + SCHIZO_PCI_IRQ_RETRY, 5); schizo_write(pbm->pbm_regs + SCHIZO_PCI_IRQ_RETRY, 5);
@ -1298,8 +1290,7 @@ static void schizo_pbm_hw_init(struct pci_pbm_info *pbm)
pbm->chip_version >= 0x2) pbm->chip_version >= 0x2)
tmp |= 0x3UL << SCHIZO_PCICTRL_PTO_SHIFT; tmp |= 0x3UL << SCHIZO_PCICTRL_PTO_SHIFT;
prop = of_find_property(pbm->prom_node, "no-bus-parking", NULL); if (!of_find_property(pbm->prom_node, "no-bus-parking", NULL))
if (!prop)
tmp |= SCHIZO_PCICTRL_PARK; tmp |= SCHIZO_PCICTRL_PARK;
else else
tmp &= ~SCHIZO_PCICTRL_PARK; tmp &= ~SCHIZO_PCICTRL_PARK;