Return-path: Received: from rnd-relay.smtp.broadcom.com ([192.19.229.170]:46110 "EHLO rnd-relay.smtp.broadcom.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753155AbeCPKMJ (ORCPT ); Fri, 16 Mar 2018 06:12:09 -0400 From: Arend van Spriel To: Kalle Valo Cc: linux-wireless@vger.kernel.org, Arend van Spriel Subject: [PATCH 11/12] brcmfmac: get rid of brcmf_fw_get_full_name() Date: Fri, 16 Mar 2018 11:11:24 +0100 Message-Id: <1521195085-439-12-git-send-email-arend.vanspriel@broadcom.com> (sfid-20180316_111220_747651_B7EAA578) In-Reply-To: <1521195085-439-1-git-send-email-arend.vanspriel@broadcom.com> References: <1521195085-439-1-git-send-email-arend.vanspriel@broadcom.com> Sender: linux-wireless-owner@vger.kernel.org List-ID: 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 --- .../net/wireless/broadcom/brcm80211/brcmfmac/firmware.c | 14 ++++---------- 1 file 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 1ea9451..486d771 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 @@ struct brcmf_fw_request * 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; } -- 1.9.1