Commits
Vipul Kumar committed 2ce630c00f6
brcmfmac: pass struct in brcmf_fw_get_firmwares() As per 'commit d09ae51a4b67 ("brcmfmac: pass struct in brcmf_fw_get_firmwares()")', make changes in the brcmf_fw_get_firmwares() call to fix the compilation error. drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c: In function ‘brcmf_sdio_ulp_reinit_fw’: drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c:2597:45: error: ‘BRCMF_FW_REQUEST_NVRAM’ undeclared (first use in this function); did you mean ‘BRCMF_FW_TYPE_NVRAM’? err = brcmf_fw_get_firmwares(sdiodev->dev, BRCMF_FW_REQUEST_NVRAM, ^~~~~~~~~~~~~~~~~~~~~~ BRCMF_FW_TYPE_NVRAM drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c:2597:45: note: each undeclared identifier is reported only once for each function it appears in drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c:2598:17: error: passing argument 3 of ‘brcmf_fw_get_firmwares’ from incompatible pointer type [-Werror=incompatible-pointer-types] sdiodev->fw_name, sdiodev->nvram_name, ~~~~~~~^~~~~~~~~ In file included from drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.h:22, from drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c:42: drivers/net/wireless/broadcom/brcm80211/brcmfmac/firmware.h:93:14: note: expected ‘void (*)(struct device *, int, struct brcmf_fw_request *)’ but argument is of type ‘char *’ void (*fw_cb)(struct device *dev, int err, ~~~~~~~^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ struct brcmf_fw_request *req)); ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c:2597:8: error: too many arguments to function ‘brcmf_fw_get_firmwares’ err = brcmf_fw_get_firmwares(sdiodev->dev, BRCMF_FW_REQUEST_NVRAM, ^~~~~~~~~~~~~~~~~~~~~~ In file included from drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.h:22, from drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c:42: drivers/net/wireless/broadcom/brcm80211/brcmfmac/firmware.h:92:5: note: declared here int brcmf_fw_get_firmwares(struct device *dev, struct brcmf_fw_request *req, ^~~~~~~~~~~~~~~~~~~~~~ Signed-off-by: Vipul Kumar <vipul_kumar@mentor.com>