@@ -59,7 +59,7 @@ struct nicpf {
59
59
60
60
/* MSI-X */
61
61
u8 num_vec ;
62
- bool irq_allocated [NIC_PF_MSIX_VECTORS ];
62
+ unsigned int irq_allocated [NIC_PF_MSIX_VECTORS ];
63
63
char irq_name [NIC_PF_MSIX_VECTORS ][20 ];
64
64
};
65
65
@@ -1150,7 +1150,7 @@ static irqreturn_t nic_mbx_intr_handler(int irq, void *nic_irq)
1150
1150
u64 intr ;
1151
1151
u8 vf ;
1152
1152
1153
- if (irq == pci_irq_vector ( nic -> pdev , NIC_PF_INTR_ID_MBOX0 ) )
1153
+ if (irq == nic -> irq_allocated [ NIC_PF_INTR_ID_MBOX0 ] )
1154
1154
mbx = 0 ;
1155
1155
else
1156
1156
mbx = 1 ;
@@ -1176,14 +1176,14 @@ static void nic_free_all_interrupts(struct nicpf *nic)
1176
1176
1177
1177
for (irq = 0 ; irq < nic -> num_vec ; irq ++ ) {
1178
1178
if (nic -> irq_allocated [irq ])
1179
- free_irq (pci_irq_vector ( nic -> pdev , irq ) , nic );
1180
- nic -> irq_allocated [irq ] = false ;
1179
+ free_irq (nic -> irq_allocated [ irq ] , nic );
1180
+ nic -> irq_allocated [irq ] = 0 ;
1181
1181
}
1182
1182
}
1183
1183
1184
1184
static int nic_register_interrupts (struct nicpf * nic )
1185
1185
{
1186
- int i , ret ;
1186
+ int i , ret , irq ;
1187
1187
nic -> num_vec = pci_msix_vec_count (nic -> pdev );
1188
1188
1189
1189
/* Enable MSI-X */
@@ -1201,13 +1201,13 @@ static int nic_register_interrupts(struct nicpf *nic)
1201
1201
sprintf (nic -> irq_name [i ],
1202
1202
"NICPF Mbox%d" , (i - NIC_PF_INTR_ID_MBOX0 ));
1203
1203
1204
- ret = request_irq ( pci_irq_vector (nic -> pdev , i ),
1205
- nic_mbx_intr_handler , 0 ,
1204
+ irq = pci_irq_vector (nic -> pdev , i );
1205
+ ret = request_irq ( irq , nic_mbx_intr_handler , 0 ,
1206
1206
nic -> irq_name [i ], nic );
1207
1207
if (ret )
1208
1208
goto fail ;
1209
1209
1210
- nic -> irq_allocated [i ] = true ;
1210
+ nic -> irq_allocated [i ] = irq ;
1211
1211
}
1212
1212
1213
1213
/* Enable mailbox interrupt */
0 commit comments