From: Thadeu Lima de Souza Cascardo <cascardo@linux.vnet.ibm.com>
To: linuxppc-dev@lists.ozlabs.org
Cc: bhelgaas@google.com, paulus@samba.org,
linux-kernel@vger.kernel.org,
Thadeu Lima de Souza Cascardo <cascardo@linux.vnet.ibm.com>,
shangw@linux.vnet.ibm.com
Subject: [PATCH 1/2] EEH/OF: checking for CONFIG_EEH is not needed
Date: Fri, 28 Dec 2012 17:13:18 -0200 [thread overview]
Message-ID: <1356721999-25159-1-git-send-email-cascardo@linux.vnet.ibm.com> (raw)
In-Reply-To: <20121228120616.GB21831@oc0268524204.ibm.com>
The functions used are already defined as empty inline functions for the
case where EEH is disabled.
Signed-off-by: Thadeu Lima de Souza Cascardo <cascardo@linux.vnet.ibm.com>
---
arch/powerpc/kernel/of_platform.c | 4 ----
1 files changed, 0 insertions(+), 4 deletions(-)
diff --git a/arch/powerpc/kernel/of_platform.c b/arch/powerpc/kernel/of_platform.c
index 2049f2d..c5fc6b2 100644
--- a/arch/powerpc/kernel/of_platform.c
+++ b/arch/powerpc/kernel/of_platform.c
@@ -71,10 +71,8 @@ static int __devinit of_pci_phb_probe(struct platform_device *dev)
eeh_dev_phb_init_dynamic(phb);
/* Register devices with EEH */
-#ifdef CONFIG_EEH
if (dev->dev.of_node->child)
eeh_add_device_tree_early(dev->dev.of_node);
-#endif /* CONFIG_EEH */
/* Scan the bus */
pcibios_scan_phb(phb);
@@ -88,9 +86,7 @@ static int __devinit of_pci_phb_probe(struct platform_device *dev)
pcibios_claim_one_bus(phb->bus);
/* Finish EEH setup */
-#ifdef CONFIG_EEH
eeh_add_device_tree_late(phb->bus);
-#endif
/* Add probed PCI devices to the device model */
pci_bus_add_devices(phb->bus);
--
1.7.1
next prev parent reply other threads:[~2012-12-28 19:13 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-12-27 16:34 [PATCH] ppc/EEH: fix crash when adding a device in a slot with DDW Thadeu Lima de Souza Cascardo
2012-12-28 5:18 ` Gavin Shan
2012-12-28 12:06 ` Thadeu Lima de Souza Cascardo
2012-12-28 19:13 ` Thadeu Lima de Souza Cascardo [this message]
2013-01-04 2:24 ` [PATCH 1/2] EEH/OF: checking for CONFIG_EEH is not needed Gavin Shan
2012-12-28 19:13 ` [PATCH 2/2] ppc/EEH: fix crash when adding a device in a slot with DDW Thadeu Lima de Souza Cascardo
2013-01-04 3:19 ` Gavin Shan
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=1356721999-25159-1-git-send-email-cascardo@linux.vnet.ibm.com \
--to=cascardo@linux.vnet.ibm.com \
--cc=bhelgaas@google.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linuxppc-dev@lists.ozlabs.org \
--cc=paulus@samba.org \
--cc=shangw@linux.vnet.ibm.com \
/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).