patch-2.4.1 linux/arch/sparc64/kernel/pci_iommu.c

• Lines: 87
• Date: Mon Jan 22 13:30:20 2001
• Orig file: v2.4.0/linux/arch/sparc64/kernel/pci_iommu.c
• Orig date: Fri Mar 10 09:43:04 2000

diff -u --recursive --new-file v2.4.0/linux/arch/sparc64/kernel/pci_iommu.c linux/arch/sparc64/kernel/pci_iommu.c
@@ -1,4 +1,4 @@
-/* $Id: pci_iommu.c,v 1.11 2000/03/10 02:42:15 davem Exp $
+/* $Id: pci_iommu.c,v 1.12 2001/01/11 16:26:45 davem Exp $
  * pci_iommu.c: UltraSparc PCI controller IOM/STC support.
  *
  * Copyright (C) 1999 David S. Miller (davem@redhat.com)
@@ -187,7 +187,7 @@
 	memset((char *)first_page, 0, PAGE_SIZE << order);
 
 	pcp = pdev->sysdata;
-	iommu = &pcp->pbm->parent->iommu;
+	iommu = pcp->pbm->iommu;
 
 	spin_lock_irqsave(&iommu->lock, flags);
 	iopte = alloc_consistent_cluster(iommu, size >> PAGE_SHIFT);
@@ -241,7 +241,7 @@
 
 	npages = PAGE_ALIGN(size) >> PAGE_SHIFT;
 	pcp = pdev->sysdata;
-	iommu = &pcp->pbm->parent->iommu;
+	iommu = pcp->pbm->iommu;
 	iopte = iommu->page_table +
 		((dvma - iommu->page_table_map_base) >> PAGE_SHIFT);
 
@@ -308,7 +308,7 @@
 	unsigned long iopte_protection;
 
 	pcp = pdev->sysdata;
-	iommu = &pcp->pbm->parent->iommu;
+	iommu = pcp->pbm->iommu;
 	strbuf = &pcp->pbm->stc;
 
 	if (direction == PCI_DMA_NONE)
@@ -356,7 +356,7 @@
 		BUG();
 
 	pcp = pdev->sysdata;
-	iommu = &pcp->pbm->parent->iommu;
+	iommu = pcp->pbm->iommu;
 	strbuf = &pcp->pbm->stc;
 
 	npages = PAGE_ALIGN(bus_addr + sz) - (bus_addr & PAGE_MASK);
@@ -504,7 +504,7 @@
 	}
 
 	pcp = pdev->sysdata;
-	iommu = &pcp->pbm->parent->iommu;
+	iommu = pcp->pbm->iommu;
 	strbuf = &pcp->pbm->stc;
 	
 	if (direction == PCI_DMA_NONE)
@@ -568,7 +568,7 @@
 		BUG();
 
 	pcp = pdev->sysdata;
-	iommu = &pcp->pbm->parent->iommu;
+	iommu = pcp->pbm->iommu;
 	strbuf = &pcp->pbm->stc;
 	
 	bus_addr = sglist->dvma_address & PAGE_MASK;
@@ -639,7 +639,7 @@
 	unsigned long flags, ctx, npages;
 
 	pcp = pdev->sysdata;
-	iommu = &pcp->pbm->parent->iommu;
+	iommu = pcp->pbm->iommu;
 	strbuf = &pcp->pbm->stc;
 
 	if (!strbuf->strbuf_enabled)
@@ -700,7 +700,7 @@
 	unsigned long flags, ctx;
 
 	pcp = pdev->sysdata;
-	iommu = &pcp->pbm->parent->iommu;
+	iommu = pcp->pbm->iommu;
 	strbuf = &pcp->pbm->stc;
 
 	if (!strbuf->strbuf_enabled)
@@ -762,7 +762,7 @@
 	if (pdev == NULL) {
 		dma_addr_mask = 0xffffffff;
 	} else {
-		struct pci_iommu *iommu = &pcp->pbm->parent->iommu;
+		struct pci_iommu *iommu = pcp->pbm->iommu;
 
 		dma_addr_mask = iommu->dma_addr_mask;
 	}