From aca283a438833ee1525e1a1569be6e004bbe8c10 Mon Sep 17 00:00:00 2001 From: Naveen Date: Tue, 6 Feb 2018 11:52:58 +0530 Subject: MLK-18675-16 brcmfmac: do not print ulp_sdioctrl get error Don't print ulp_sdioctrl get error as errors are expected for non ulp cases. Signed-off-by: Naveen Gupta Signed-off-by: Fugang Duan Signed-off-by: Vipul Kumar --- drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) (limited to 'drivers/net') diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c index 79569158ca65..978b42ddf33e 100644 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c @@ -2557,23 +2557,15 @@ brcmf_sdio_ulp_preinit(struct device *dev) struct brcmf_bus *bus_if = dev_get_drvdata(dev); struct brcmf_sdio_dev *sdiodev = bus_if->bus_priv.sdio; struct brcmf_if *ifp = bus_if->drvr->iflist[0]; - int err = 0; - char iovbuf[BRCMF_DCMD_SMLEN]; brcmf_dbg(TRACE, "Enter\n"); - memset(iovbuf, 0, sizeof(iovbuf)); /* Query ulp_sdioctrl iovar to get the ULP related SHM offsets */ - err = brcmf_fil_iovar_data_get(ifp, "ulp_sdioctrl", iovbuf, - sizeof(iovbuf)); - if (err) - brcmf_err("fail to get ulp_sdioctrl err:%d\n", err); + brcmf_fil_iovar_data_get(ifp, "ulp_sdioctrl", &sdiodev->shm_ulp, + sizeof(sdiodev->shm_ulp)); sdiodev->ulp = false; - /* Copy the data shared by dongle to FMAC structure */ - memcpy(&sdiodev->shm_ulp, iovbuf, sizeof(struct ulp_shm_info)); - brcmf_dbg(TRACE, "m_ulp_ctrl_sdio[%x] m_ulp_wakeevt_ind [%x]\n", M_DS1_CTRL_SDIO(sdiodev->shm_ulp), M_WAKEEVENT_IND(sdiodev->shm_ulp)); -- cgit v1.2.3