summaryrefslogtreecommitdiff
path: root/drivers/net/wireless/broadcom/brcm80211
diff options
context:
space:
mode:
authorNaveen <nagu@cypress.com>2018-02-06 11:52:58 +0530
committerDong Aisheng <aisheng.dong@nxp.com>2019-11-25 15:44:41 +0800
commitaca283a438833ee1525e1a1569be6e004bbe8c10 (patch)
tree3c1ec413ed0726455460fd846b420341fcff38bd /drivers/net/wireless/broadcom/brcm80211
parentdd38337defbd9e3114c02811ec144632110ca986 (diff)
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 <nagu@cypress.com> Signed-off-by: Fugang Duan <fugang.duan@nxp.com> Signed-off-by: Vipul Kumar <vipul_kumar@mentor.com>
Diffstat (limited to 'drivers/net/wireless/broadcom/brcm80211')
-rw-r--r--drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c12
1 files changed, 2 insertions, 10 deletions
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));