Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ff68c9f9 authored by Arend Van Spriel's avatar Arend Van Spriel Committed by Kalle Valo
Browse files

brcmfmac: constify firmware mapping tables 



The information in the firmware mapping does not need to be modified
so it can be static const.

Reviewed-by: default avatarHante Meuleman <hante.meuleman@broadcom.com>
Reviewed-by: default avatarPieter-Paul Giesberts <pieter-paul.giesberts@broadcom.com>
Reviewed-by: default avatarFranky Lin <franky.lin@broadcom.com>
Signed-off-by: default avatarArend van Spriel <arend.vanspriel@broadcom.com>
Signed-off-by: default avatarKalle Valo <kvalo@codeaurora.org>
parent aed14219

drivers/net/wireless/broadcom/brcm80211/brcmfmac/firmware.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -634,7 +634,7 @@ int brcmf_fw_get_firmwares(struct device *dev, struct brcmf_fw_request *req, 




struct brcmf_fw_request *

struct brcmf_fw_request *

brcmf_fw_alloc_request(u32 chip, u32 chiprev,

brcmf_fw_alloc_request(u32 chip, u32 chiprev,

		       struct brcmf_firmware_mapping mapping_table[],

		       const struct brcmf_firmware_mapping mapping_table[],

		       u32 table_size, struct brcmf_fw_name *fwnames,

		       u32 table_size, struct brcmf_fw_name *fwnames,

		       u32 n_fwnames)

		       u32 n_fwnames)

{

{

drivers/net/wireless/broadcom/brcm80211/brcmfmac/firmware.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -80,7 +80,7 @@ struct brcmf_fw_name { 




struct brcmf_fw_request *

struct brcmf_fw_request *

brcmf_fw_alloc_request(u32 chip, u32 chiprev,

brcmf_fw_alloc_request(u32 chip, u32 chiprev,

		       struct brcmf_firmware_mapping mapping_table[],

		       const struct brcmf_firmware_mapping mapping_table[],

		       u32 table_size, struct brcmf_fw_name *fwnames,

		       u32 table_size, struct brcmf_fw_name *fwnames,

		       u32 n_fwnames);

		       u32 n_fwnames);

drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -59,7 +59,7 @@ BRCMF_FW_DEF(4366B, "brcmfmac4366b-pcie"); 
BRCMF_FW_DEF(4366C, "brcmfmac4366c-pcie");

BRCMF_FW_DEF(4366C, "brcmfmac4366c-pcie");

BRCMF_FW_DEF(4371, "brcmfmac4371-pcie");

BRCMF_FW_DEF(4371, "brcmfmac4371-pcie");





static struct brcmf_firmware_mapping brcmf_pcie_fwnames[] = {

static const struct brcmf_firmware_mapping brcmf_pcie_fwnames[] = {

	BRCMF_FW_ENTRY(BRCM_CC_43602_CHIP_ID, 0xFFFFFFFF, 43602),

	BRCMF_FW_ENTRY(BRCM_CC_43602_CHIP_ID, 0xFFFFFFFF, 43602),

	BRCMF_FW_ENTRY(BRCM_CC_43465_CHIP_ID, 0xFFFFFFF0, 4366C),

	BRCMF_FW_ENTRY(BRCM_CC_43465_CHIP_ID, 0xFFFFFFF0, 4366C),

	BRCMF_FW_ENTRY(BRCM_CC_4350_CHIP_ID, 0x000000FF, 4350C),

	BRCMF_FW_ENTRY(BRCM_CC_4350_CHIP_ID, 0x000000FF, 4350C),

drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -619,7 +619,7 @@ BRCMF_FW_DEF(4354, "brcmfmac4354-sdio"); 
BRCMF_FW_DEF(4356, "brcmfmac4356-sdio");

BRCMF_FW_DEF(4356, "brcmfmac4356-sdio");

BRCMF_FW_DEF(4373, "brcmfmac4373-sdio");

BRCMF_FW_DEF(4373, "brcmfmac4373-sdio");





static struct brcmf_firmware_mapping brcmf_sdio_fwnames[] = {

static const struct brcmf_firmware_mapping brcmf_sdio_fwnames[] = {

	BRCMF_FW_ENTRY(BRCM_CC_43143_CHIP_ID, 0xFFFFFFFF, 43143),

	BRCMF_FW_ENTRY(BRCM_CC_43143_CHIP_ID, 0xFFFFFFFF, 43143),

	BRCMF_FW_ENTRY(BRCM_CC_43241_CHIP_ID, 0x0000001F, 43241B0),

	BRCMF_FW_ENTRY(BRCM_CC_43241_CHIP_ID, 0x0000001F, 43241B0),

	BRCMF_FW_ENTRY(BRCM_CC_43241_CHIP_ID, 0x00000020, 43241B4),

	BRCMF_FW_ENTRY(BRCM_CC_43241_CHIP_ID, 0x00000020, 43241B4),

drivers/net/wireless/broadcom/brcm80211/brcmfmac/usb.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -52,7 +52,7 @@ BRCMF_FW_DEF(43242A, "brcmfmac43242a"); 
BRCMF_FW_DEF(43569, "brcmfmac43569");

BRCMF_FW_DEF(43569, "brcmfmac43569");

BRCMF_FW_DEF(4373, "brcmfmac4373");

BRCMF_FW_DEF(4373, "brcmfmac4373");





static struct brcmf_firmware_mapping brcmf_usb_fwnames[] = {

static const struct brcmf_firmware_mapping brcmf_usb_fwnames[] = {

	BRCMF_FW_ENTRY(BRCM_CC_43143_CHIP_ID, 0xFFFFFFFF, 43143),

	BRCMF_FW_ENTRY(BRCM_CC_43143_CHIP_ID, 0xFFFFFFFF, 43143),

	BRCMF_FW_ENTRY(BRCM_CC_43235_CHIP_ID, 0x00000008, 43236B),

	BRCMF_FW_ENTRY(BRCM_CC_43235_CHIP_ID, 0x00000008, 43236B),

	BRCMF_FW_ENTRY(BRCM_CC_43236_CHIP_ID, 0x00000008, 43236B),

	BRCMF_FW_ENTRY(BRCM_CC_43236_CHIP_ID, 0x00000008, 43236B),