package/kernel/mac80211/patches/330-v4.18-0004-brcmfmac-constify-firmware-mapping-tables.patch

   1 From ff68c9f9c06d1fd437c8f90fc05ca28c47f7d85e Mon Sep 17 00:00:00 2001
   2 From: Arend Van Spriel <arend.vanspriel@broadcom.com>
   3 Date: Thu, 26 Apr 2018 12:16:49 +0200
   4 Subject: [PATCH] brcmfmac: constify firmware mapping tables
   5
   6 The information in the firmware mapping does not need to be modified
   7 so it can be static const.
   8
   9 Reviewed-by: Hante Meuleman <hante.meuleman@broadcom.com>
  10 Reviewed-by: Pieter-Paul Giesberts <pieter-paul.giesberts@broadcom.com>
  11 Reviewed-by: Franky Lin <franky.lin@broadcom.com>
  12 Signed-off-by: Arend van Spriel <arend.vanspriel@broadcom.com>
  13 Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
  14 ---
  15  drivers/net/wireless/broadcom/brcm80211/brcmfmac/firmware.c | 2 +-
  16  drivers/net/wireless/broadcom/brcm80211/brcmfmac/firmware.h | 2 +-
  17  drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c     | 2 +-
  18  drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c     | 2 +-
  19  drivers/net/wireless/broadcom/brcm80211/brcmfmac/usb.c      | 2 +-
  20  5 files changed, 5 insertions(+), 5 deletions(-)
  21
  22 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/firmware.c
  23 +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/firmware.c
  24 @@ -634,7 +634,7 @@ int brcmf_fw_get_firmwares(struct device
  25
  26  struct brcmf_fw_request *
  27  brcmf_fw_alloc_request(u32 chip, u32 chiprev,
  28 -                      struct brcmf_firmware_mapping mapping_table[],
  29 +                      const struct brcmf_firmware_mapping mapping_table[],
  30                        u32 table_size, struct brcmf_fw_name *fwnames,
  31                        u32 n_fwnames)
  32  {
  33 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/firmware.h
  34 +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/firmware.h
  35 @@ -80,7 +80,7 @@ struct brcmf_fw_name {
  36
  37  struct brcmf_fw_request *
  38  brcmf_fw_alloc_request(u32 chip, u32 chiprev,
  39 -                      struct brcmf_firmware_mapping mapping_table[],
  40 +                      const struct brcmf_firmware_mapping mapping_table[],
  41                        u32 table_size, struct brcmf_fw_name *fwnames,
  42                        u32 n_fwnames);
  43
  44 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c
  45 +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c
  46 @@ -59,7 +59,7 @@ BRCMF_FW_DEF(4366B, "brcmfmac4366b-pcie"
  47  BRCMF_FW_DEF(4366C, "brcmfmac4366c-pcie");
  48  BRCMF_FW_DEF(4371, "brcmfmac4371-pcie");
  49
  50 -static struct brcmf_firmware_mapping brcmf_pcie_fwnames[] = {
  51 +static const struct brcmf_firmware_mapping brcmf_pcie_fwnames[] = {
  52         BRCMF_FW_ENTRY(BRCM_CC_43602_CHIP_ID, 0xFFFFFFFF, 43602),
  53         BRCMF_FW_ENTRY(BRCM_CC_43465_CHIP_ID, 0xFFFFFFF0, 4366C),
  54         BRCMF_FW_ENTRY(BRCM_CC_4350_CHIP_ID, 0x000000FF, 4350C),
  55 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c
  56 +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c
  57 @@ -619,7 +619,7 @@ BRCMF_FW_DEF(4354, "brcmfmac4354-sdio");
  58  BRCMF_FW_DEF(4356, "brcmfmac4356-sdio");
  59  BRCMF_FW_DEF(4373, "brcmfmac4373-sdio");
  60
  61 -static struct brcmf_firmware_mapping brcmf_sdio_fwnames[] = {
  62 +static const struct brcmf_firmware_mapping brcmf_sdio_fwnames[] = {
  63         BRCMF_FW_ENTRY(BRCM_CC_43143_CHIP_ID, 0xFFFFFFFF, 43143),
  64         BRCMF_FW_ENTRY(BRCM_CC_43241_CHIP_ID, 0x0000001F, 43241B0),
  65         BRCMF_FW_ENTRY(BRCM_CC_43241_CHIP_ID, 0x00000020, 43241B4),
  66 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/usb.c
  67 +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/usb.c
  68 @@ -52,7 +52,7 @@ BRCMF_FW_DEF(43242A, "brcmfmac43242a");
  69  BRCMF_FW_DEF(43569, "brcmfmac43569");
  70  BRCMF_FW_DEF(4373, "brcmfmac4373");
  71
  72 -static struct brcmf_firmware_mapping brcmf_usb_fwnames[] = {
  73 +static const struct brcmf_firmware_mapping brcmf_usb_fwnames[] = {
  74         BRCMF_FW_ENTRY(BRCM_CC_43143_CHIP_ID, 0xFFFFFFFF, 43143),
  75         BRCMF_FW_ENTRY(BRCM_CC_43235_CHIP_ID, 0x00000008, 43236B),
  76         BRCMF_FW_ENTRY(BRCM_CC_43236_CHIP_ID, 0x00000008, 43236B),