From 3d739dc909703a264ca863aeb8e069c4be530835 Mon Sep 17 00:00:00 2001 From: ruppala Date: Thu, 11 Jul 2024 05:50:48 +0000 Subject: [PATCH] NVIDIA: SAUCE: brcmfmac: Resolve compilation errors of chip ID 0x4355 BugLink: https://bugs.launchpad.net/bugs/2072591 Fix the build issue when enabling the config CONFIG_BRCMFMAC_PCIE - Remove redefinition of fw name for chip ID 0x4355 - Add fw vendor name in macro BRCMF_PCIE_DEVICE for chip ID 0x4355 http://nvbugs/4742326 Signed-off-by: ruppala Signed-off-by: Laxman Dewangan Acked-by: Jacob Martin Acked-by: Noah Wager Signed-off-by: Noah Wager --- drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c index 4fd0df5cfd4d..842d084f751b 100644 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c @@ -52,7 +52,6 @@ enum brcmf_pcie_state { BRCMF_FW_DEF(43602, "brcmfmac43602-pcie"); BRCMF_FW_DEF(4350, "brcmfmac4350-pcie"); BRCMF_FW_DEF(4350C, "brcmfmac4350c2-pcie"); -CY_FW_DEF(4355, "cyfmac89459-pcie"); BRCMF_FW_CLM_DEF(4355C1, "brcmfmac4355c1-pcie"); CY_FW_DEF(4356, "cyfmac4356-pcie"); CY_FW_DEF(43570, "cyfmac43570-pcie"); @@ -2770,7 +2769,7 @@ static const struct pci_device_id brcmf_pcie_devid_table[] = { BRCMF_PCIE_DEVICE(BRCM_PCIE_4377_DEVICE_ID, WCC), BRCMF_PCIE_DEVICE(BRCM_PCIE_4378_DEVICE_ID, WCC), BRCMF_PCIE_DEVICE(BRCM_PCIE_4387_DEVICE_ID, WCC), - BRCMF_PCIE_DEVICE(CY_PCIE_54591_DEVICE_ID), + BRCMF_PCIE_DEVICE(CY_PCIE_54591_DEVICE_ID, CYW), { /* end: all zeroes */ } };