From: Sasha Levin <sasha.levin@oracle.com>
To: Bjorn Helgaas <bhelgaas@google.com>,
Sasha Levin <sasha.levin@oracle.com>,
Alan Cox <alan@linux.intel.com>,
linux-pci@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: [PATCH] PCI: cpqphp: minor cleanup and removal of unreachable paths
Date: Thu, 20 Dec 2012 14:11:23 -0500 [thread overview]
Message-ID: <1356030701-16284-15-git-send-email-sasha.levin@oracle.com> (raw)
In-Reply-To: <1356030701-16284-1-git-send-email-sasha.levin@oracle.com>
Remove cases of redundant checks and remote unreachable paths.
Signed-off-by: Sasha Levin <sasha.levin@oracle.com>
---
drivers/pci/hotplug/cpqphp_ctrl.c | 57 ++++++++++++++-------------------------
1 file changed, 20 insertions(+), 37 deletions(-)
diff --git a/drivers/pci/hotplug/cpqphp_ctrl.c b/drivers/pci/hotplug/cpqphp_ctrl.c
index 36112fe..d282019 100644
--- a/drivers/pci/hotplug/cpqphp_ctrl.c
+++ b/drivers/pci/hotplug/cpqphp_ctrl.c
@@ -1900,8 +1900,7 @@ static void interrupt_event_handler(struct controller *ctrl)
dbg("power fault\n");
} else {
/* refresh notification */
- if (p_slot)
- update_slot_info(ctrl, p_slot);
+ update_slot_info(ctrl, p_slot);
}
ctrl->event_queue[loop].event_type = 0;
@@ -2520,44 +2519,28 @@ static int configure_new_function(struct controller *ctrl, struct pci_func *func
/* If we have IO resources copy them and fill in the bridge's
* IO range registers */
- if (io_node) {
- memcpy(hold_IO_node, io_node, sizeof(struct pci_resource));
- io_node->next = NULL;
+ memcpy(hold_IO_node, io_node, sizeof(struct pci_resource));
+ io_node->next = NULL;
- /* set IO base and Limit registers */
- temp_byte = io_node->base >> 8;
- rc = pci_bus_write_config_byte(pci_bus, devfn, PCI_IO_BASE, temp_byte);
+ /* set IO base and Limit registers */
+ temp_byte = io_node->base >> 8;
+ rc = pci_bus_write_config_byte(pci_bus, devfn, PCI_IO_BASE, temp_byte);
- temp_byte = (io_node->base + io_node->length - 1) >> 8;
- rc = pci_bus_write_config_byte(pci_bus, devfn, PCI_IO_LIMIT, temp_byte);
- } else {
- kfree(hold_IO_node);
- hold_IO_node = NULL;
- }
-
- /* If we have memory resources copy them and fill in the
- * bridge's memory range registers. Otherwise, fill in the
- * range registers with values that disable them. */
- if (mem_node) {
- memcpy(hold_mem_node, mem_node, sizeof(struct pci_resource));
- mem_node->next = NULL;
-
- /* set Mem base and Limit registers */
- temp_word = mem_node->base >> 16;
- rc = pci_bus_write_config_word(pci_bus, devfn, PCI_MEMORY_BASE, temp_word);
+ temp_byte = (io_node->base + io_node->length - 1) >> 8;
+ rc = pci_bus_write_config_byte(pci_bus, devfn, PCI_IO_LIMIT, temp_byte);
- temp_word = (mem_node->base + mem_node->length - 1) >> 16;
- rc = pci_bus_write_config_word(pci_bus, devfn, PCI_MEMORY_LIMIT, temp_word);
- } else {
- temp_word = 0xFFFF;
- rc = pci_bus_write_config_word(pci_bus, devfn, PCI_MEMORY_BASE, temp_word);
+ /* Copy the memory resources and fill in the bridge's memory
+ * range registers.
+ */
+ memcpy(hold_mem_node, mem_node, sizeof(struct pci_resource));
+ mem_node->next = NULL;
- temp_word = 0x0000;
- rc = pci_bus_write_config_word(pci_bus, devfn, PCI_MEMORY_LIMIT, temp_word);
+ /* set Mem base and Limit registers */
+ temp_word = mem_node->base >> 16;
+ rc = pci_bus_write_config_word(pci_bus, devfn, PCI_MEMORY_BASE, temp_word);
- kfree(hold_mem_node);
- hold_mem_node = NULL;
- }
+ temp_word = (mem_node->base + mem_node->length - 1) >> 16;
+ rc = pci_bus_write_config_word(pci_bus, devfn, PCI_MEMORY_LIMIT, temp_word);
memcpy(hold_p_mem_node, p_mem_node, sizeof(struct pci_resource));
p_mem_node->next = NULL;
@@ -2627,7 +2610,7 @@ static int configure_new_function(struct controller *ctrl, struct pci_func *func
/* Return unused bus resources
* First use the temporary node to store information for
* the board */
- if (hold_bus_node && bus_node && temp_resources.bus_head) {
+ if (bus_node && temp_resources.bus_head) {
hold_bus_node->length = bus_node->base - hold_bus_node->base;
hold_bus_node->next = func->bus_head;
@@ -2751,7 +2734,7 @@ static int configure_new_function(struct controller *ctrl, struct pci_func *func
}
/* If we have prefetchable memory space available and there
* is some left at the end, return the unused portion */
- if (hold_p_mem_node && temp_resources.p_mem_head) {
+ if (temp_resources.p_mem_head) {
p_mem_node = do_pre_bridge_resource_split(&(temp_resources.p_mem_head),
&hold_p_mem_node, 0x100000);
--
1.8.0
next prev parent reply other threads:[~2012-12-20 19:14 UTC|newest]
Thread overview: 64+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-12-20 19:11 [PATCH] tools, power: correct precedence of operators in init_maxfreq_mode Sasha Levin
2012-12-20 19:11 ` [PATCH] kvm tools: remove unneeded checks in qcow code Sasha Levin
2012-12-21 22:03 ` Jesper Juhl
2012-12-20 19:11 ` [PATCH] kvm tools: remove unneeded check from disk code Sasha Levin
2012-12-20 19:11 ` [PATCH] kvm tools: correctly compare pointer with NULL instead of 0 Sasha Levin
2012-12-20 19:11 ` [PATCH] tools lib traceevent: remove redundant check from process_dynamic_array Sasha Levin
2012-12-21 12:58 ` Namhyung Kim
2012-12-20 19:11 ` [PATCH] epoll: stop comparing pointers with 0 in self-test app Sasha Levin
2012-12-21 2:55 ` Daniel Hazelton
2012-12-20 19:11 ` [PATCH] tools/usb: remove unneeded 'continue' and simplify condition Sasha Levin
2012-12-20 20:32 ` Felipe Balbi
2012-12-20 19:11 ` [PATCH] perf kmem: use ARRAY_SIZE instead of reinventing it Sasha Levin
2013-01-25 11:19 ` [tip:perf/core] " tip-bot for Sasha Levin
2012-12-20 19:11 ` [PATCH] cpupowerutils: don't compare pointers with 0 Sasha Levin
2012-12-21 21:41 ` Thomas Renninger
2012-12-20 19:11 ` [PATCH] m2m-deinterlace: use correct check for kzalloc failure Sasha Levin
2012-12-20 19:11 ` [PATCH] perf script: use ARRAY_SIZE instead of reinventing it Sasha Levin
2013-01-25 11:20 ` [tip:perf/core] " tip-bot for Sasha Levin
2012-12-20 19:11 ` [PATCH] perf tools: remove redundant checks from _sort__sym_cmp Sasha Levin
2012-12-21 12:55 ` Namhyung Kim
2013-01-25 11:17 ` [tip:perf/core] " tip-bot for Sasha Levin
2012-12-20 19:11 ` [PATCH] virtio_console: correct error message on failure of debugfs_create_dir Sasha Levin
2012-12-21 7:59 ` Amit Shah
2012-12-24 11:55 ` Arnd Bergmann
2012-12-24 17:39 ` Greg Kroah-Hartman
2012-12-24 18:24 ` Sasha Levin
2012-12-24 18:43 ` Greg Kroah-Hartman
2012-12-20 19:11 ` [PATCH] debugfs: remove redundant initialization of dentry Sasha Levin
2012-12-20 19:11 ` Sasha Levin [this message]
2013-01-07 18:48 ` [PATCH] PCI: cpqphp: minor cleanup and removal of unreachable paths Bjorn Helgaas
2012-12-20 19:11 ` [PATCH] bnx2x: use ARRAY_SIZE where possible Sasha Levin
2012-12-23 8:49 ` Eilon Greenstein
2012-12-28 4:30 ` David Miller
2012-12-20 19:11 ` [PATCH] wireless: mwifiex: remove unreachable paths Sasha Levin
2012-12-20 20:13 ` Bing Zhao
2012-12-20 19:11 ` [PATCH] mmc: omap_hsmmc: correct precedence of operators Sasha Levin
2012-12-20 20:30 ` Felipe Balbi
2012-12-20 23:04 ` Paul Walmsley
2012-12-20 19:11 ` [PATCH] kdb: use ARRAY_SIZE where possible Sasha Levin
2012-12-20 19:11 ` [PATCH] rcutorture: don't compare ptr with 0 Sasha Levin
2012-12-20 22:39 ` Josh Triplett
2013-01-04 17:27 ` Paul E. McKenney
2012-12-20 19:11 ` [PATCH] sched: fair: simplify can_migrate_task a bit Sasha Levin
2012-12-20 19:11 ` [PATCH] uprobes: remove redundant check Sasha Levin
2013-01-25 11:21 ` [tip:perf/core] " tip-bot for Sasha Levin
2012-12-20 19:11 ` [PATCH] cgroup: " Sasha Levin
2012-12-20 19:18 ` Tejun Heo
2012-12-20 19:24 ` Sasha Levin
2012-12-20 19:11 ` [PATCH] mm: memory_hotplug: no need to check res twice in add_memory Sasha Levin
2012-12-20 19:11 ` [PATCH] x86, efi: correct precedence of operators in setup_efi_pci Sasha Levin
2012-12-20 19:59 ` [tip:x86/urgent] " tip-bot for Sasha Levin
2012-12-20 19:11 ` [PATCH] arch/x86/platform/uv: use ARRAY_SIZE where possible Sasha Levin
2012-12-20 22:37 ` [tip:x86/cleanups] " tip-bot for Sasha Levin
2012-12-20 19:11 ` [PATCH] um: don't compare a pointer to 0 Sasha Levin
2012-12-20 22:39 ` [tip:x86/cleanups] " tip-bot for Sasha Levin
2012-12-20 19:11 ` [PATCH] x86, apb_timer: remove unused variable percpu_timer Sasha Levin
2012-12-20 22:40 ` [tip:x86/cleanups] " tip-bot for Sasha Levin
2012-12-20 19:11 ` [PATCH] kdb: use DIV_ROUND_UP where possible Sasha Levin
2012-12-20 19:11 ` [PATCH] mm/sparse: don't check return value of alloc_bootmem calls Sasha Levin
2012-12-20 20:23 ` David Rientjes
2012-12-20 20:36 ` Sasha Levin
2012-12-20 20:43 ` David Rientjes
2012-12-20 19:11 ` [PATCH] slob: use DIV_ROUND_UP where possible Sasha Levin
2012-12-20 19:40 ` Christoph Lameter
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=1356030701-16284-15-git-send-email-sasha.levin@oracle.com \
--to=sasha.levin@oracle.com \
--cc=alan@linux.intel.com \
--cc=bhelgaas@google.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pci@vger.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).