diff options
author | Nishanth Aravamudan <nacc@us.ibm.com> | 2010-10-18 03:27:02 -0400 |
---|---|---|
committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2010-11-28 23:48:20 -0500 |
commit | 34c4d012554ed8c99b3fb25baea9bab3507e9f76 (patch) | |
tree | 81b7ecd494e689dc29aaba5a6b08f28c5ea69ed3 /arch/powerpc/sysdev/dart_iommu.c | |
parent | 741d204cee6d62bbe0f74ab57ef31702b7d90f62 (diff) |
powerpc/dart: iommu table cleanup
No need to set the device tree device_node pci node iommu pointer, its
only used for dlpar remove.
Signed-off-by: Milton Miller <miltonm@bga.com>
Signed-off-by: Nishanth Aravamudan <nacc@us.ibm.com>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
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) | |||
312 | 312 | ||
313 | static void pci_dma_bus_setup_dart(struct pci_bus *bus) | 313 | static void pci_dma_bus_setup_dart(struct pci_bus *bus) |
314 | { | 314 | { |
315 | struct device_node *dn; | ||
316 | |||
317 | if (!iommu_table_dart_inited) { | 315 | if (!iommu_table_dart_inited) { |
318 | iommu_table_dart_inited = 1; | 316 | iommu_table_dart_inited = 1; |
319 | iommu_table_dart_setup(); | 317 | iommu_table_dart_setup(); |
320 | } | 318 | } |
321 | |||
322 | dn = pci_bus_to_OF_node(bus); | ||
323 | |||
324 | if (dn) | ||
325 | PCI_DN(dn)->iommu_table = &iommu_table_dart; | ||
326 | } | 319 | } |
327 | 320 | ||
328 | static bool dart_device_on_pcie(struct device *dev) | 321 | static bool dart_device_on_pcie(struct device *dev) |
@@ -373,7 +366,7 @@ void __init iommu_init_early_dart(void) | |||
373 | if (dn == NULL) { | 366 | if (dn == NULL) { |
374 | dn = of_find_compatible_node(NULL, "dart", "u4-dart"); | 367 | dn = of_find_compatible_node(NULL, "dart", "u4-dart"); |
375 | if (dn == NULL) | 368 | if (dn == NULL) |
376 | goto bail; | 369 | return; /* use default direct_dma_ops */ |
377 | dart_is_u4 = 1; | 370 | dart_is_u4 = 1; |
378 | } | 371 | } |
379 | 372 | ||