iwlwifi: pcie: Rename the CAUSE() macro
Subsystems (3)
PATCH 1/1 iwlwifi: pcie: Rename the CAUSE() macro
arch/mips/include/uapi/asm/ptrace.h already defines CAUSE, which causes a name clash:
drivers/net/wireless/intel/iwlwifi/pcie/trans.c:1093: warning: "CAUSE" redefined
Fix the problem by renaming it to IWLWIFI_CAUSE().
Reported-by kernel test robot <[email protected]>
Fixes c1918196427b ("iwlwifi: pcie: simplify MSI-X cause mapping")
Signed-off-by Fabio Estevam <[email protected]>
--- .../net/wireless/intel/iwlwifi/pcie/trans.c | 34 +++++++++---------- 1 file changed, 17 insertions(+), 17 deletions(-)
drivers/net/wireless/intel/iwlwifi/pcie/trans.c +17 -17
@@ -1090,7 +1090,7 @@ struct iwl_causes_list {u8 addr; }; -#define CAUSE (reg, mask) \ +#define IWLWIFI_CAUSE (reg, mask) \ { \ .mask_reg = reg, \ .bit = ilog2(mask), \
@@ -1101,28 +1101,28 @@ struct iwl_causes_list { }static const struct iwl_causes_list causes_list_common[] = { -CAUSE (CSR_MSIX_FH_INT_MASK_AD ,MSIX_FH_INT_CAUSES_D2S_CH0_NUM ), -CAUSE (CSR_MSIX_FH_INT_MASK_AD ,MSIX_FH_INT_CAUSES_D2S_CH1_NUM ), -CAUSE (CSR_MSIX_FH_INT_MASK_AD ,MSIX_FH_INT_CAUSES_S2D ), -CAUSE (CSR_MSIX_FH_INT_MASK_AD ,MSIX_FH_INT_CAUSES_FH_ERR ), -CAUSE (CSR_MSIX_HW_INT_MASK_AD ,MSIX_HW_INT_CAUSES_REG_ALIVE ), -CAUSE (CSR_MSIX_HW_INT_MASK_AD ,MSIX_HW_INT_CAUSES_REG_WAKEUP ), -CAUSE (CSR_MSIX_HW_INT_MASK_AD ,MSIX_HW_INT_CAUSES_REG_RESET_DONE ), -CAUSE (CSR_MSIX_HW_INT_MASK_AD ,MSIX_HW_INT_CAUSES_REG_CT_KILL ), -CAUSE (CSR_MSIX_HW_INT_MASK_AD ,MSIX_HW_INT_CAUSES_REG_RF_KILL ), -CAUSE (CSR_MSIX_HW_INT_MASK_AD ,MSIX_HW_INT_CAUSES_REG_PERIODIC ), -CAUSE (CSR_MSIX_HW_INT_MASK_AD ,MSIX_HW_INT_CAUSES_REG_SCD ), -CAUSE (CSR_MSIX_HW_INT_MASK_AD ,MSIX_HW_INT_CAUSES_REG_FH_TX ), -CAUSE (CSR_MSIX_HW_INT_MASK_AD ,MSIX_HW_INT_CAUSES_REG_HW_ERR ), -CAUSE (CSR_MSIX_HW_INT_MASK_AD ,MSIX_HW_INT_CAUSES_REG_HAP ), +IWLWIFI_CAUSE (CSR_MSIX_FH_INT_MASK_AD ,MSIX_FH_INT_CAUSES_D2S_CH0_NUM ), +IWLWIFI_CAUSE (CSR_MSIX_FH_INT_MASK_AD ,MSIX_FH_INT_CAUSES_D2S_CH1_NUM ), +IWLWIFI_CAUSE (CSR_MSIX_FH_INT_MASK_AD ,MSIX_FH_INT_CAUSES_S2D ), +IWLWIFI_CAUSE (CSR_MSIX_FH_INT_MASK_AD ,MSIX_FH_INT_CAUSES_FH_ERR ), +IWLWIFI_CAUSE (CSR_MSIX_HW_INT_MASK_AD ,MSIX_HW_INT_CAUSES_REG_ALIVE ), +IWLWIFI_CAUSE (CSR_MSIX_HW_INT_MASK_AD ,MSIX_HW_INT_CAUSES_REG_WAKEUP ), +IWLWIFI_CAUSE (CSR_MSIX_HW_INT_MASK_AD ,MSIX_HW_INT_CAUSES_REG_RESET_DONE ), +IWLWIFI_CAUSE (CSR_MSIX_HW_INT_MASK_AD ,MSIX_HW_INT_CAUSES_REG_CT_KILL ), +IWLWIFI_CAUSE (CSR_MSIX_HW_INT_MASK_AD ,MSIX_HW_INT_CAUSES_REG_RF_KILL ), +IWLWIFI_CAUSE (CSR_MSIX_HW_INT_MASK_AD ,MSIX_HW_INT_CAUSES_REG_PERIODIC ), +IWLWIFI_CAUSE (CSR_MSIX_HW_INT_MASK_AD ,MSIX_HW_INT_CAUSES_REG_SCD ), +IWLWIFI_CAUSE (CSR_MSIX_HW_INT_MASK_AD ,MSIX_HW_INT_CAUSES_REG_FH_TX ), +IWLWIFI_CAUSE (CSR_MSIX_HW_INT_MASK_AD ,MSIX_HW_INT_CAUSES_REG_HW_ERR ), +IWLWIFI_CAUSE (CSR_MSIX_HW_INT_MASK_AD ,MSIX_HW_INT_CAUSES_REG_HAP ), };static const struct iwl_causes_list causes_list_pre_bz[] = { -CAUSE (CSR_MSIX_HW_INT_MASK_AD ,MSIX_HW_INT_CAUSES_REG_SW_ERR ), +IWLWIFI_CAUSE (CSR_MSIX_HW_INT_MASK_AD ,MSIX_HW_INT_CAUSES_REG_SW_ERR ), };static const struct iwl_causes_list causes_list_bz[] = { -CAUSE (CSR_MSIX_HW_INT_MASK_AD ,MSIX_HW_INT_CAUSES_REG_SW_ERR_BZ ), +IWLWIFI_CAUSE (CSR_MSIX_HW_INT_MASK_AD ,MSIX_HW_INT_CAUSES_REG_SW_ERR_BZ ), }; static void iwl_pcie_map_list(struct iwl_trans *trans,
Signature · 1 line
2.25.1
Jakub Kicinski
maintainerQuoted 6 lines · On Wed, 25 May 2022 21:44:34 -0300 Fabio Estevam wrote:
arch/mips/include/uapi/asm/ptrace.halready defines CAUSE, which causes a name clash:
drivers/net/wireless/intel/iwlwifi/pcie/trans.c:1093: warning: "CAUSE" redefinedFix the problem by renaming it to
IWLWIFI_CAUSE().