@@ -1090,7 +1090,7 @@ struct iwl_causes_list {
10901090 u8 addr ;
10911091};
10921092
1093- #define CAUSE (reg , mask ) \
1093+ #define IWL_CAUSE (reg , mask ) \
10941094 { \
10951095 .mask_reg = reg, \
10961096 .bit = ilog2(mask), \
@@ -1101,28 +1101,28 @@ struct iwl_causes_list {
11011101 }
11021102
11031103static const struct iwl_causes_list causes_list_common [] = {
1104- CAUSE (CSR_MSIX_FH_INT_MASK_AD , MSIX_FH_INT_CAUSES_D2S_CH0_NUM ),
1105- CAUSE (CSR_MSIX_FH_INT_MASK_AD , MSIX_FH_INT_CAUSES_D2S_CH1_NUM ),
1106- CAUSE (CSR_MSIX_FH_INT_MASK_AD , MSIX_FH_INT_CAUSES_S2D ),
1107- CAUSE (CSR_MSIX_FH_INT_MASK_AD , MSIX_FH_INT_CAUSES_FH_ERR ),
1108- CAUSE (CSR_MSIX_HW_INT_MASK_AD , MSIX_HW_INT_CAUSES_REG_ALIVE ),
1109- CAUSE (CSR_MSIX_HW_INT_MASK_AD , MSIX_HW_INT_CAUSES_REG_WAKEUP ),
1110- CAUSE (CSR_MSIX_HW_INT_MASK_AD , MSIX_HW_INT_CAUSES_REG_RESET_DONE ),
1111- CAUSE (CSR_MSIX_HW_INT_MASK_AD , MSIX_HW_INT_CAUSES_REG_CT_KILL ),
1112- CAUSE (CSR_MSIX_HW_INT_MASK_AD , MSIX_HW_INT_CAUSES_REG_RF_KILL ),
1113- CAUSE (CSR_MSIX_HW_INT_MASK_AD , MSIX_HW_INT_CAUSES_REG_PERIODIC ),
1114- CAUSE (CSR_MSIX_HW_INT_MASK_AD , MSIX_HW_INT_CAUSES_REG_SCD ),
1115- CAUSE (CSR_MSIX_HW_INT_MASK_AD , MSIX_HW_INT_CAUSES_REG_FH_TX ),
1116- CAUSE (CSR_MSIX_HW_INT_MASK_AD , MSIX_HW_INT_CAUSES_REG_HW_ERR ),
1117- CAUSE (CSR_MSIX_HW_INT_MASK_AD , MSIX_HW_INT_CAUSES_REG_HAP ),
1104+ IWL_CAUSE (CSR_MSIX_FH_INT_MASK_AD , MSIX_FH_INT_CAUSES_D2S_CH0_NUM ),
1105+ IWL_CAUSE (CSR_MSIX_FH_INT_MASK_AD , MSIX_FH_INT_CAUSES_D2S_CH1_NUM ),
1106+ IWL_CAUSE (CSR_MSIX_FH_INT_MASK_AD , MSIX_FH_INT_CAUSES_S2D ),
1107+ IWL_CAUSE (CSR_MSIX_FH_INT_MASK_AD , MSIX_FH_INT_CAUSES_FH_ERR ),
1108+ IWL_CAUSE (CSR_MSIX_HW_INT_MASK_AD , MSIX_HW_INT_CAUSES_REG_ALIVE ),
1109+ IWL_CAUSE (CSR_MSIX_HW_INT_MASK_AD , MSIX_HW_INT_CAUSES_REG_WAKEUP ),
1110+ IWL_CAUSE (CSR_MSIX_HW_INT_MASK_AD , MSIX_HW_INT_CAUSES_REG_RESET_DONE ),
1111+ IWL_CAUSE (CSR_MSIX_HW_INT_MASK_AD , MSIX_HW_INT_CAUSES_REG_CT_KILL ),
1112+ IWL_CAUSE (CSR_MSIX_HW_INT_MASK_AD , MSIX_HW_INT_CAUSES_REG_RF_KILL ),
1113+ IWL_CAUSE (CSR_MSIX_HW_INT_MASK_AD , MSIX_HW_INT_CAUSES_REG_PERIODIC ),
1114+ IWL_CAUSE (CSR_MSIX_HW_INT_MASK_AD , MSIX_HW_INT_CAUSES_REG_SCD ),
1115+ IWL_CAUSE (CSR_MSIX_HW_INT_MASK_AD , MSIX_HW_INT_CAUSES_REG_FH_TX ),
1116+ IWL_CAUSE (CSR_MSIX_HW_INT_MASK_AD , MSIX_HW_INT_CAUSES_REG_HW_ERR ),
1117+ IWL_CAUSE (CSR_MSIX_HW_INT_MASK_AD , MSIX_HW_INT_CAUSES_REG_HAP ),
11181118};
11191119
11201120static const struct iwl_causes_list causes_list_pre_bz [] = {
1121- CAUSE (CSR_MSIX_HW_INT_MASK_AD , MSIX_HW_INT_CAUSES_REG_SW_ERR ),
1121+ IWL_CAUSE (CSR_MSIX_HW_INT_MASK_AD , MSIX_HW_INT_CAUSES_REG_SW_ERR ),
11221122};
11231123
11241124static const struct iwl_causes_list causes_list_bz [] = {
1125- CAUSE (CSR_MSIX_HW_INT_MASK_AD , MSIX_HW_INT_CAUSES_REG_SW_ERR_BZ ),
1125+ IWL_CAUSE (CSR_MSIX_HW_INT_MASK_AD , MSIX_HW_INT_CAUSES_REG_SW_ERR_BZ ),
11261126};
11271127
11281128static void iwl_pcie_map_list (struct iwl_trans * trans ,
0 commit comments