Merge tag 'v4.4.8' into linux-linaro-lsk-v4.4

[firefly-linux-kernel-4.4.55.git] / arch / mips / pci / ops-emma2rh.c

diff --git a/arch/mips/pci/ops-emma2rh.c b/arch/mips/pci/ops-emma2rh.c
index 710aef5c070e839539a309b88fab97735316c501..2dc97c45685e8b2889b15814032a3e8b6b6f7cc0 100644 (file)
--- 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) {