linuxppc-dev.lists.ozlabs.org archive mirror
 help / color / mirror / Atom feed
From: Sam Bobroff <sam.bobroff@au1.ibm.com>
To: linuxppc-dev@lists.ozlabs.org
Subject: [PATCH v2 5/9] powerpc/eeh: Rename frozen_bus to bus in eeh_handle_normal_event()
Date: Mon, 19 Mar 2018 13:47:02 +1100	[thread overview]
Message-ID: <a8d5f7792b761721852b68363c68519c6c8b62ff.1521427331.git.sam.bobroff@au1.ibm.com> (raw)
In-Reply-To: <cover.1521427331.git.sam.bobroff@au1.ibm.com>

The name "frozen_bus" is misleading: it's not necessarily frozen, it's
just the PE's PCI bus.

Signed-off-by: Sam Bobroff <sam.bobroff@au1.ibm.com>
---
 arch/powerpc/kernel/eeh_driver.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/arch/powerpc/kernel/eeh_driver.c b/arch/powerpc/kernel/eeh_driver.c
index 04a5d9db5499..cb584d72b0a5 100644
--- a/arch/powerpc/kernel/eeh_driver.c
+++ b/arch/powerpc/kernel/eeh_driver.c
@@ -754,14 +754,14 @@ static int eeh_reset_device(struct eeh_pe *pe, struct pci_bus *bus,
  */
 void eeh_handle_normal_event(struct eeh_pe *pe)
 {
-	struct pci_bus *frozen_bus;
+	struct pci_bus *bus;
 	struct eeh_dev *edev, *tmp;
 	int rc = 0;
 	enum pci_ers_result result = PCI_ERS_RESULT_NONE;
 	struct eeh_rmv_data rmv_data = {LIST_HEAD_INIT(rmv_data.edev_list), 0};
 
-	frozen_bus = eeh_pe_bus_get(pe);
-	if (!frozen_bus) {
+	bus = eeh_pe_bus_get(pe);
+	if (!bus) {
 		pr_err("%s: Cannot find PCI bus for PHB#%x-PE#%x\n",
 			__func__, pe->phb->global_number, pe->addr);
 		return;
@@ -820,7 +820,7 @@ void eeh_handle_normal_event(struct eeh_pe *pe)
 	 */
 	if (result == PCI_ERS_RESULT_NONE) {
 		pr_info("EEH: Reset with hotplug activity\n");
-		rc = eeh_reset_device(pe, frozen_bus, NULL);
+		rc = eeh_reset_device(pe, bus, NULL);
 		if (rc) {
 			pr_warn("%s: Unable to reset, err=%d\n",
 				__func__, rc);
@@ -938,7 +938,7 @@ void eeh_handle_normal_event(struct eeh_pe *pe)
 		eeh_pe_dev_mode_mark(pe, EEH_DEV_REMOVED);
 
 		pci_lock_rescan_remove();
-		pci_hp_remove_devices(frozen_bus);
+		pci_hp_remove_devices(bus);
 		pci_unlock_rescan_remove();
 		/* The passed PE should no longer be used */
 		return;
-- 
2.16.1.74.g9b0b1f47b

  parent reply	other threads:[~2018-03-19  2:47 UTC|newest]

Thread overview: 24+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-03-19  2:45 [PATCH v2 0/9] EEH refactoring 1 Sam Bobroff
2018-03-19  2:46 ` [PATCH v2 1/9] powerpc/eeh: Remove eeh_handle_event() Sam Bobroff
2018-03-21  5:17   ` Alexey Kardashevskiy
2018-03-28 14:13   ` [v2,1/9] " Michael Ellerman
2018-03-19  2:46 ` [PATCH v2 2/9] powerpc/eeh: Manage EEH_PE_RECOVERING inside eeh_handle_normal_event() Sam Bobroff
2018-03-21  5:17   ` Alexey Kardashevskiy
2018-03-19  2:46 ` [PATCH v2 3/9] powerpc/eeh: Fix misleading comment in __eeh_addr_cache_get_device() Sam Bobroff
2018-03-21  5:17   ` Alexey Kardashevskiy
2018-03-19  2:46 ` [PATCH v2 4/9] powerpc/eeh: Remove misleading test in eeh_handle_normal_event() Sam Bobroff
2018-03-21  5:18   ` Alexey Kardashevskiy
2018-03-19  2:47 ` Sam Bobroff [this message]
2018-03-21  5:18   ` [PATCH v2 5/9] powerpc/eeh: Rename frozen_bus to bus " Alexey Kardashevskiy
2018-03-19  2:48 ` [PATCH v2 6/9] powerpc/eeh: Clarify arguments to eeh_reset_device() Sam Bobroff
2018-03-21  5:18   ` Alexey Kardashevskiy
2018-03-19  2:49 ` [PATCH v2 7/9] powerpc/eeh: Remove always-true tests in eeh_reset_device() Sam Bobroff
2018-03-21  5:18   ` Alexey Kardashevskiy
2018-03-19  2:49 ` [PATCH v2 8/9] powerpc/eeh: Factor out common code eeh_reset_device() Sam Bobroff
2018-03-20  8:31   ` kbuild test robot
2018-03-21  2:06   ` [PATCH v3 " Sam Bobroff
2018-03-21  5:18     ` Alexey Kardashevskiy
2018-03-19  2:49 ` [PATCH v2 9/9] powerpc/eeh: Add eeh_state_active() helper Sam Bobroff
2018-03-20  4:05   ` kbuild test robot
2018-03-21  5:20   ` Alexey Kardashevskiy
2018-03-21  5:16 ` [PATCH v2 0/9] EEH refactoring 1 Alexey Kardashevskiy

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=a8d5f7792b761721852b68363c68519c6c8b62ff.1521427331.git.sam.bobroff@au1.ibm.com \
    --to=sam.bobroff@au1.ibm.com \
    --cc=linuxppc-dev@lists.ozlabs.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).