package/kernel/mac80211/patches/327-v4.17-0011-brcmfmac-get-rid-of-brcmf_fw_get_full_name.patch

   1 From bf291b7247e53f52a4236c0b55a5df046d6177df Mon Sep 17 00:00:00 2001
   2 From: Arend Van Spriel <arend.vanspriel@broadcom.com>
   3 Date: Thu, 22 Mar 2018 21:28:30 +0100
   4 Subject: [PATCH] brcmfmac: get rid of brcmf_fw_get_full_name()
   5
   6 The function was pretty minimal and now it is called only from one
   7 place so just get rid of it.
   8
   9 Signed-off-by: Arend van Spriel <arend.vanspriel@broadcom.com>
  10 Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
  11 ---
  12  .../net/wireless/broadcom/brcm80211/brcmfmac/firmware.c    | 14 ++++----------
  13  1 file changed, 4 insertions(+), 10 deletions(-)
  14
  15 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/firmware.c
  16 +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/firmware.c
  17 @@ -628,13 +628,6 @@ int brcmf_fw_get_firmwares(struct device
  18         return 0;
  19  }
  20
  21 -static void brcmf_fw_get_full_name(char fw_name[BRCMF_FW_NAME_LEN],
  22 -                                  const char *fw_base, const char *extension)
  23 -{
  24 -       strlcat(fw_name, fw_base, BRCMF_FW_NAME_LEN);
  25 -       strlcat(fw_name, extension, BRCMF_FW_NAME_LEN);
  26 -}
  27 -
  28  struct brcmf_fw_request *
  29  brcmf_fw_alloc_request(u32 chip, u32 chiprev,
  30                        struct brcmf_firmware_mapping mapping_table[],
  31 @@ -685,9 +678,10 @@ brcmf_fw_alloc_request(u32 chip, u32 chi
  32                                         BRCMF_FW_NAME_LEN);
  33                         }
  34                 }
  35 -               brcmf_fw_get_full_name(fwnames[j].path,
  36 -                                      mapping_table[i].fw_base,
  37 -                                      fwnames[j].extension);
  38 +               strlcat(fwnames[j].path, mapping_table[i].fw_base,
  39 +                       BRCMF_FW_NAME_LEN);
  40 +               strlcat(fwnames[j].path, fwnames[j].extension,
  41 +                       BRCMF_FW_NAME_LEN);
  42                 fwreq->items[j].path = fwnames[j].path;
  43         }
  44