@@ -59,7 +59,7 @@ struct nicpf {
5959
6060 /* MSI-X */
6161 u8 num_vec ;
62- bool irq_allocated [NIC_PF_MSIX_VECTORS ];
62+ unsigned int irq_allocated [NIC_PF_MSIX_VECTORS ];
6363 char irq_name [NIC_PF_MSIX_VECTORS ][20 ];
6464};
6565
@@ -1150,7 +1150,7 @@ static irqreturn_t nic_mbx_intr_handler(int irq, void *nic_irq)
11501150 u64 intr ;
11511151 u8 vf ;
11521152
1153- if (irq == pci_irq_vector ( nic -> pdev , NIC_PF_INTR_ID_MBOX0 ) )
1153+ if (irq == nic -> irq_allocated [ NIC_PF_INTR_ID_MBOX0 ] )
11541154 mbx = 0 ;
11551155 else
11561156 mbx = 1 ;
@@ -1176,14 +1176,14 @@ static void nic_free_all_interrupts(struct nicpf *nic)
11761176
11771177 for (irq = 0 ; irq < nic -> num_vec ; irq ++ ) {
11781178 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 ;
11811181 }
11821182}
11831183
11841184static int nic_register_interrupts (struct nicpf * nic )
11851185{
1186- int i , ret ;
1186+ int i , ret , irq ;
11871187 nic -> num_vec = pci_msix_vec_count (nic -> pdev );
11881188
11891189 /* Enable MSI-X */
@@ -1201,13 +1201,13 @@ static int nic_register_interrupts(struct nicpf *nic)
12011201 sprintf (nic -> irq_name [i ],
12021202 "NICPF Mbox%d" , (i - NIC_PF_INTR_ID_MBOX0 ));
12031203
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 ,
12061206 nic -> irq_name [i ], nic );
12071207 if (ret )
12081208 goto fail ;
12091209
1210- nic -> irq_allocated [i ] = true ;
1210+ nic -> irq_allocated [i ] = irq ;
12111211 }
12121212
12131213 /* Enable mailbox interrupt */
0 commit comments