From: Sam Bobroff <sam.bobroff@au1.ibm.com>
To: linuxppc-dev@lists.ozlabs.org
Subject: [PATCH v2 7/9] powerpc/eeh: Remove always-true tests in eeh_reset_device()
Date: Mon, 19 Mar 2018 13:49:04 +1100 [thread overview]
Message-ID: <5a636a21f3352efa7a41bf4032f3a57973c4c18b.1521427331.git.sam.bobroff@au1.ibm.com> (raw)
In-Reply-To: <cover.1521427331.git.sam.bobroff@au1.ibm.com>
eeh_reset_device() tests the value of 'bus' more than once but the
only caller, eeh_handle_normal_device() does this test itself and will
never pass NULL.
So, remove the dead tests.
This should not change behaviour.
Signed-off-by: Sam Bobroff <sam.bobroff@au1.ibm.com>
---
arch/powerpc/kernel/eeh_driver.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/powerpc/kernel/eeh_driver.c b/arch/powerpc/kernel/eeh_driver.c
index 07437d765434..93fc22e791fa 100644
--- a/arch/powerpc/kernel/eeh_driver.c
+++ b/arch/powerpc/kernel/eeh_driver.c
@@ -655,7 +655,7 @@ static int eeh_reset_device(struct eeh_pe *pe, struct pci_bus *bus,
pci_hp_remove_devices(bus);
pci_unlock_rescan_remove();
}
- } else if (bus) {
+ } else {
eeh_pe_dev_traverse(pe, eeh_rmv_device, rmv_data);
}
@@ -708,7 +708,7 @@ static int eeh_reset_device(struct eeh_pe *pe, struct pci_bus *bus,
eeh_pe_state_clear(pe, EEH_PE_PRI_BUS);
pci_hp_add_devices(bus);
}
- } else if (bus && rmv_data->removed) {
+ } else if (rmv_data->removed) {
pr_info("EEH: Sleep 5s ahead of partial hotplug\n");
ssleep(5);
--
2.16.1.74.g9b0b1f47b
next prev parent reply other threads:[~2018-03-19 2:49 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 ` [PATCH v2 5/9] powerpc/eeh: Rename frozen_bus to bus " Sam Bobroff
2018-03-21 5:18 ` 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 ` Sam Bobroff [this message]
2018-03-21 5:18 ` [PATCH v2 7/9] powerpc/eeh: Remove always-true tests in eeh_reset_device() 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=5a636a21f3352efa7a41bf4032f3a57973c4c18b.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).