OSDN Git Service

ice: use irq_num var in ice_vsi_req_irq_msix
authorAlan Brady <alan.brady@intel.com>
Wed, 27 Feb 2019 00:35:22 +0000 (16:35 -0800)
committerJeff Kirsher <jeffrey.t.kirsher@intel.com>
Mon, 25 Mar 2019 14:52:51 +0000 (07:52 -0700)
Someone went through the effort of making this a variable so let's use
it instead of recalculating it again.

Signed-off-by: Alan Brady <alan.brady@intel.com>
Signed-off-by: Anirudh Venkataramanan <anirudh.venkataramanan@intel.com>
Tested-by: Andrew Bowers <andrewx.bowers@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
drivers/net/ethernet/intel/ice/ice_main.c

index 879c1f1..4731b5d 100644 (file)
@@ -1248,10 +1248,9 @@ static int ice_vsi_req_irq_msix(struct ice_vsi *vsi, char *basename)
                        /* skip this unused q_vector */
                        continue;
                }
-               err = devm_request_irq(&pf->pdev->dev,
-                                      pf->msix_entries[base + vector].vector,
-                                      vsi->irq_handler, 0, q_vector->name,
-                                      q_vector);
+               err = devm_request_irq(&pf->pdev->dev, irq_num,
+                                      vsi->irq_handler, 0,
+                                      q_vector->name, q_vector);
                if (err) {
                        netdev_err(vsi->netdev,
                                   "MSIX request_irq failed, error: %d\n", err);