diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2011-01-12 14:47:21 +0900 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2011-01-12 14:47:21 +0900 |
| commit | 53582c4c508a95ece9f7c907edef9911c7eb79eb (patch) | |
| tree | c099e9880f7bf7d60e87dfa6a19cb4e8780ec860 /arch/powerpc/sysdev/dart_iommu.c | |
| parent | 6ae1e19dbb43ff0d429a9f45087c513212686836 (diff) | |
| parent | da97da73d418533187a8390cf6541f48bed653e8 (diff) | |
Merge branch 'rmobile/sdio' into rmobile-latest
Diffstat (limited to 'arch/powerpc/sysdev/dart_iommu.c')
| -rw-r--r-- | arch/powerpc/sysdev/dart_iommu.c | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/arch/powerpc/sysdev/dart_iommu.c b/arch/powerpc/sysdev/dart_iommu.c index 17cf15ec38be..8e9e06a7ca59 100644 --- a/arch/powerpc/sysdev/dart_iommu.c +++ b/arch/powerpc/sysdev/dart_iommu.c @@ -312,17 +312,10 @@ static void pci_dma_dev_setup_dart(struct pci_dev *dev) static void pci_dma_bus_setup_dart(struct pci_bus *bus) { - struct device_node *dn; - if (!iommu_table_dart_inited) { iommu_table_dart_inited = 1; iommu_table_dart_setup(); } - - dn = pci_bus_to_OF_node(bus); - - if (dn) - PCI_DN(dn)->iommu_table = &iommu_table_dart; } static bool dart_device_on_pcie(struct device *dev) @@ -373,7 +366,7 @@ void __init iommu_init_early_dart(void) if (dn == NULL) { dn = of_find_compatible_node(NULL, "dart", "u4-dart"); if (dn == NULL) - goto bail; + return; /* use default direct_dma_ops */ dart_is_u4 = 1; } |