diff options
| author | Arend Van Spriel | 2018-03-22 21:28:30 +0100 |
|---|---|---|
| committer | Kalle Valo | 2018-03-27 11:04:38 +0200 |
| commit | bf291b7247e53f52a4236c0b55a5df046d6177df (patch) | |
| tree | b173264ce399d45f2ce2b968634e80411a9dae09 /drivers/net/wireless/broadcom | |
| parent | brcmfmac: get rid of brcmf_fw_map_chip_to_name() (diff) | |
| download | kernel-qcow2-linux-bf291b7247e53f52a4236c0b55a5df046d6177df.tar.gz kernel-qcow2-linux-bf291b7247e53f52a4236c0b55a5df046d6177df.tar.xz kernel-qcow2-linux-bf291b7247e53f52a4236c0b55a5df046d6177df.zip | |
brcmfmac: get rid of brcmf_fw_get_full_name()
The function was pretty minimal and now it is called only from one
place so just get rid of it.
Signed-off-by: Arend van Spriel <arend.vanspriel@broadcom.com>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
Diffstat (limited to 'drivers/net/wireless/broadcom')
| -rw-r--r-- | drivers/net/wireless/broadcom/brcm80211/brcmfmac/firmware.c | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/firmware.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/firmware.c index c14a02ae68cb..9277f4c2bfeb 100644 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/firmware.c +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/firmware.c @@ -628,13 +628,6 @@ int brcmf_fw_get_firmwares(struct device *dev, struct brcmf_fw_request *req, return 0; } -static void brcmf_fw_get_full_name(char fw_name[BRCMF_FW_NAME_LEN], - const char *fw_base, const char *extension) -{ - strlcat(fw_name, fw_base, BRCMF_FW_NAME_LEN); - strlcat(fw_name, extension, BRCMF_FW_NAME_LEN); -} - struct brcmf_fw_request * brcmf_fw_alloc_request(u32 chip, u32 chiprev, struct brcmf_firmware_mapping mapping_table[], @@ -685,9 +678,10 @@ brcmf_fw_alloc_request(u32 chip, u32 chiprev, BRCMF_FW_NAME_LEN); } } - brcmf_fw_get_full_name(fwnames[j].path, - mapping_table[i].fw_base, - fwnames[j].extension); + strlcat(fwnames[j].path, mapping_table[i].fw_base, + BRCMF_FW_NAME_LEN); + strlcat(fwnames[j].path, fwnames[j].extension, + BRCMF_FW_NAME_LEN); fwreq->items[j].path = fwnames[j].path; } |