From: Nishanth Aravamudan <nacc@us.ibm.com>
To: nacc@us.ibm.com
Cc: linux-kernel@vger.kernel.org, miltonm@bga.com,
"André Goddard Rosa" <andre.goddard@gmail.com>,
"Paul Mackerras" <paulus@samba.org>, "Tejun Heo" <tj@kernel.org>,
linuxppc-dev@lists.ozlabs.org
Subject: [PATCH 5/7] ppc/dart: iommu table cleanup
Date: Mon, 18 Oct 2010 10:27:02 -0700 [thread overview]
Message-ID: <1287422825-14999-6-git-send-email-nacc@us.ibm.com> (raw)
In-Reply-To: <1287422825-14999-1-git-send-email-nacc@us.ibm.com>
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>
---
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 17cf15e..8e9e06a 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;
}
--
1.7.1
next prev parent reply other threads:[~2010-10-18 17:27 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <1287422825-14999-1-git-send-email-nacc@us.ibm.com>
2010-10-18 17:26 ` [PATCH 1/7] microblaze: pci-common cleanup Nishanth Aravamudan
2010-10-20 5:31 ` Michal Simek
2010-11-01 6:29 ` Re: Michal Simek
2010-10-18 17:26 ` [PATCH 2/7] ppc/vio: use dma ops helpers Nishanth Aravamudan
2010-10-18 17:27 ` [PATCH 3/7] ppc/pasemi: clean up pasemi iommu table initializations Nishanth Aravamudan
2010-10-18 17:27 ` [PATCH 4/7] ppc/cell: beat dma ops cleanup Nishanth Aravamudan
2010-10-18 17:27 ` Nishanth Aravamudan [this message]
2010-10-18 17:27 ` [PATCH 6/7] ppc/pseries: iommu cleanup Nishanth Aravamudan
2010-10-18 17:27 ` [PATCH 7/7] ppc64 iommu: use coherent_dma_mask for alloc_coherent Nishanth Aravamudan
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1287422825-14999-6-git-send-email-nacc@us.ibm.com \
--to=nacc@us.ibm.com \
--cc=andre.goddard@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linuxppc-dev@lists.ozlabs.org \
--cc=miltonm@bga.com \
--cc=paulus@samba.org \
--cc=tj@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).