summaryrefslogtreecommitdiffstats
path: root/arch/mips/pci
diff options
context:
space:
mode:
authorPaul Burton <paul.burton@imgtec.com>2015-07-13 17:14:21 +0100
committerRalf Baechle <ralf@linux-mips.org>2015-08-26 15:23:35 +0200
commit2dca88da835616c3c65d1e4167288346fd67f02f (patch)
tree537ce9a82b34f3513552f3d25a75e0ebef8a0ddd /arch/mips/pci
parente51395d2739d0bb4991b6b531e1066475aae9bfd (diff)
downloadlinux-stable-2dca88da835616c3c65d1e4167288346fd67f02f.tar.gz
linux-stable-2dca88da835616c3c65d1e4167288346fd67f02f.tar.bz2
linux-stable-2dca88da835616c3c65d1e4167288346fd67f02f.zip
MIPS: ops-emma2rh: Drop nonsensical db_assert
The db_assert call checks whether the bus_num pointer is non-NULL, but does so after said pointer has been dereferenced by the assignment on the previous line. Thus the check is pointless & likely to have been optimised out by the compiler anyway. The check_args function is static & only ever called from the local file with bus_num being a pointer to an on-stack variable, so the check seems somewhat overzealous anyway. Simply remove it. Signed-off-by: Paul Burton <paul.burton@imgtec.com> Cc: linux-mips@linux-mips.org Cc: linux-kernel@vger.kernel.org Patchwork: https://patchwork.linux-mips.org/patch/10692/ Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Diffstat (limited to 'arch/mips/pci')
-rw-r--r--arch/mips/pci/ops-emma2rh.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/arch/mips/pci/ops-emma2rh.c b/arch/mips/pci/ops-emma2rh.c
index 710aef5c070e..2dc97c45685e 100644
--- a/arch/mips/pci/ops-emma2rh.c
+++ b/arch/mips/pci/ops-emma2rh.c
@@ -25,7 +25,6 @@
#include <linux/types.h>
#include <asm/addrspace.h>
-#include <asm/debug.h>
#include <asm/emma/emma2rh.h>
@@ -40,10 +39,9 @@
static int check_args(struct pci_bus *bus, u32 devfn, u32 * bus_num)
{
/* check if the bus is top-level */
- if (bus->parent != NULL) {
+ if (bus->parent != NULL)
*bus_num = bus->number;
- db_assert(bus_num != NULL);
- } else
+ else
*bus_num = 0;
if (*bus_num == 0) {