package/kernel/mac80211/patches/327-v4.17-0010-brcmfmac-get-rid-of-brcmf_fw_map_chip_to_name.patch

   1 From 18c2b20e276e04476a3350b4a92c1dfad725d45d Mon Sep 17 00:00:00 2001
   2 From: Arend Van Spriel <arend.vanspriel@broadcom.com>
   3 Date: Thu, 22 Mar 2018 21:28:29 +0100
   4 Subject: [PATCH] brcmfmac: get rid of brcmf_fw_map_chip_to_name()
   5
   6 The function is no longer used so removing it.
   7
   8 Reviewed-by: Hante Meuleman <hante.meuleman@broadcom.com>
   9 Reviewed-by: Pieter-Paul Giesberts <pieter-paul.giesberts@broadcom.com>
  10 Reviewed-by: Franky Lin <franky.lin@broadcom.com>
  11 Signed-off-by: Arend van Spriel <arend.vanspriel@broadcom.com>
  12 Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
  13 ---
  14  .../broadcom/brcm80211/brcmfmac/firmware.c         | 53 ----------------------
  15  .../broadcom/brcm80211/brcmfmac/firmware.h         |  4 --
  16  2 files changed, 57 deletions(-)
  17
  18 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/firmware.c
  19 +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/firmware.c
  20 @@ -635,59 +635,6 @@ static void brcmf_fw_get_full_name(char
  21         strlcat(fw_name, extension, BRCMF_FW_NAME_LEN);
  22  }
  23
  24 -int brcmf_fw_map_chip_to_name(u32 chip, u32 chiprev,
  25 -                             struct brcmf_firmware_mapping mapping_table[],
  26 -                             u32 table_size, char fw_name[BRCMF_FW_NAME_LEN],
  27 -                             char nvram_name[BRCMF_FW_NAME_LEN])
  28 -{
  29 -       char chipname[12];
  30 -       u32 i;
  31 -       char end;
  32 -
  33 -       for (i = 0; i < table_size; i++) {
  34 -               if (mapping_table[i].chipid == chip &&
  35 -                   mapping_table[i].revmask & BIT(chiprev))
  36 -                       break;
  37 -       }
  38 -
  39 -       if (i == table_size) {
  40 -               brcmf_err("Unknown chipid %d [%d]\n", chip, chiprev);
  41 -               return -ENODEV;
  42 -       }
  43 -
  44 -       brcmf_chip_name(chip, chiprev, chipname, sizeof(chipname));
  45 -
  46 -       /* check if firmware path is provided by module parameter */
  47 -       if (brcmf_mp_global.firmware_path[0] != '\0') {
  48 -               if (fw_name)
  49 -                       strlcpy(fw_name, brcmf_mp_global.firmware_path,
  50 -                               BRCMF_FW_NAME_LEN);
  51 -               if (nvram_name)
  52 -                       strlcpy(nvram_name, brcmf_mp_global.firmware_path,
  53 -                               BRCMF_FW_NAME_LEN);
  54 -
  55 -               end = brcmf_mp_global.firmware_path[
  56 -                               strlen(brcmf_mp_global.firmware_path) - 1];
  57 -               if (end != '/') {
  58 -                       if (fw_name)
  59 -                               strlcat(fw_name, "/", BRCMF_FW_NAME_LEN);
  60 -                       if (nvram_name)
  61 -                               strlcat(nvram_name, "/", BRCMF_FW_NAME_LEN);
  62 -               }
  63 -       }
  64 -
  65 -       brcmf_info("using %s for chip %s\n",
  66 -                  mapping_table[i].fw_base, chipname);
  67 -       if (fw_name)
  68 -               brcmf_fw_get_full_name(fw_name,
  69 -                                      mapping_table[i].fw_base, ".bin");
  70 -       if (nvram_name)
  71 -               brcmf_fw_get_full_name(nvram_name,
  72 -                                      mapping_table[i].fw_base, ".txt");
  73 -
  74 -       return 0;
  75 -}
  76 -
  77  struct brcmf_fw_request *
  78  brcmf_fw_alloc_request(u32 chip, u32 chiprev,
  79                        struct brcmf_firmware_mapping mapping_table[],
  80 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/firmware.h
  81 +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/firmware.h
  82 @@ -46,10 +46,6 @@ MODULE_FIRMWARE(BRCMF_FW_DEFAULT_PATH fw
  83  #define BRCMF_FW_ENTRY(chipid, mask, name) \
  84         { chipid, mask, BRCM_ ## name ## _FIRMWARE_BASENAME }
  85
  86 -int brcmf_fw_map_chip_to_name(u32 chip, u32 chiprev,
  87 -                             struct brcmf_firmware_mapping mapping_table[],
  88 -                             u32 table_size, char fw_name[BRCMF_FW_NAME_LEN],
  89 -                             char nvram_name[BRCMF_FW_NAME_LEN]);
  90  void brcmf_fw_nvram_free(void *nvram);
  91
  92  enum brcmf_fw_type {