MLK-17443 wireless: bcmdhd: fix build warning

case1: statement "if (bustype != BUSTYPE(bustype))"
equals "if (bustype != bustype)" when BCMBUSTYPE is
not defined. Some compilers treat it as a build warning.

case2: fix misleadingly indented of dhd_os_sdunlock(dhdp)

Signed-off-by: Gao Pan <pandy.gao@nxp.com>
Tested-by: Peng Fan <peng.fan@nxp.com>

diff --git a/drivers/net/wireless/bcmdhd/dhd_sdio.c b/drivers/net/wireless/bcmdhd/dhd_sdio.c
index 425fbba..61a2d9a 100644 (file)
--- a/drivers/net/wireless/bcmdhd/dhd_sdio.c
+++ b/drivers/net/wireless/bcmdhd/dhd_sdio.c
@@ -8146,7 +8146,7 @@ dhd_bus_devreset(dhd_pub_t *dhdp, uint8 flag)
                        } else
                                bcmerror = BCME_SDIO_ERROR;
 
-                               dhd_os_sdunlock(dhdp);
+                       dhd_os_sdunlock(dhdp);
                } else {
                        bcmerror = BCME_SDIO_ERROR;
                        DHD_INFO(("%s called when dongle is not in reset\n",

diff --git a/drivers/net/wireless/bcmdhd/siutils.c b/drivers/net/wireless/bcmdhd/siutils.c
index edcd1c1..d6ff576 100644 (file)
--- a/drivers/net/wireless/bcmdhd/siutils.c
+++ b/drivers/net/wireless/bcmdhd/siutils.c
@@ -400,11 +400,6 @@ si_doattach(si_info_t *sii, uint devid, osl_t *osh, void *regs,
        }
 
        sih->bustype = bustype;
-       if (bustype != BUSTYPE(bustype)) {
-               SI_ERROR(("si_doattach: bus type %d does not match configured bus type %d\n",
-                       bustype, BUSTYPE(bustype)));
-               return NULL;
-       }
 
        /* bus/core/clk setup for register access */
        if (!si_buscore_prep(sii, bustype, devid, sdh)) {