77 lines
3.6 KiB
Diff
77 lines
3.6 KiB
Diff
From ff68c9f9c06d1fd437c8f90fc05ca28c47f7d85e Mon Sep 17 00:00:00 2001
|
|
From: Arend Van Spriel <arend.vanspriel@broadcom.com>
|
|
Date: Thu, 26 Apr 2018 12:16:49 +0200
|
|
Subject: [PATCH] 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: Hante Meuleman <hante.meuleman@broadcom.com>
|
|
Reviewed-by: Pieter-Paul Giesberts <pieter-paul.giesberts@broadcom.com>
|
|
Reviewed-by: Franky Lin <franky.lin@broadcom.com>
|
|
Signed-off-by: Arend van Spriel <arend.vanspriel@broadcom.com>
|
|
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
|
|
---
|
|
drivers/net/wireless/broadcom/brcm80211/brcmfmac/firmware.c | 2 +-
|
|
drivers/net/wireless/broadcom/brcm80211/brcmfmac/firmware.h | 2 +-
|
|
drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c | 2 +-
|
|
drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c | 2 +-
|
|
drivers/net/wireless/broadcom/brcm80211/brcmfmac/usb.c | 2 +-
|
|
5 files changed, 5 insertions(+), 5 deletions(-)
|
|
|
|
--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/firmware.c
|
|
+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/firmware.c
|
|
@@ -634,7 +634,7 @@ int brcmf_fw_get_firmwares(struct device
|
|
|
|
struct brcmf_fw_request *
|
|
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 n_fwnames)
|
|
{
|
|
--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/firmware.h
|
|
+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/firmware.h
|
|
@@ -80,7 +80,7 @@ struct brcmf_fw_name {
|
|
|
|
struct brcmf_fw_request *
|
|
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 n_fwnames);
|
|
|
|
--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c
|
|
+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c
|
|
@@ -59,7 +59,7 @@ BRCMF_FW_DEF(4366B, "brcmfmac4366b-pcie"
|
|
BRCMF_FW_DEF(4366C, "brcmfmac4366c-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_43465_CHIP_ID, 0xFFFFFFF0, 4366C),
|
|
BRCMF_FW_ENTRY(BRCM_CC_4350_CHIP_ID, 0x000000FF, 4350C),
|
|
--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c
|
|
+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c
|
|
@@ -619,7 +619,7 @@ BRCMF_FW_DEF(4354, "brcmfmac4354-sdio");
|
|
BRCMF_FW_DEF(4356, "brcmfmac4356-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_43241_CHIP_ID, 0x0000001F, 43241B0),
|
|
BRCMF_FW_ENTRY(BRCM_CC_43241_CHIP_ID, 0x00000020, 43241B4),
|
|
--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/usb.c
|
|
+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/usb.c
|
|
@@ -52,7 +52,7 @@ BRCMF_FW_DEF(43242A, "brcmfmac43242a");
|
|
BRCMF_FW_DEF(43569, "brcmfmac43569");
|
|
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_43235_CHIP_ID, 0x00000008, 43236B),
|
|
BRCMF_FW_ENTRY(BRCM_CC_43236_CHIP_ID, 0x00000008, 43236B),
|