瀏覽代碼

i40evf: clean up local variable initialization

In i40evf_msix_aq(), the first two lines of rd32() are mainly to clear
the registers. If we initialize 'val' at this point, it will be
overwritten immediately. We shall simply discard the return value here.

When we initialize 'val', we might as well include the mask in one step.

Signed-off-by: Jean Sacren <sakiwit@gmail.com>
Tested-by: Andrew Bowers <andrewx.bowers@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Jean Sacren 9 年之前
父節點
當前提交
ed17f7e5d7
共有 1 個文件被更改,包括 4 次插入5 次删除
  1. 4 5
      drivers/net/ethernet/intel/i40evf/i40evf_main.c

+ 4 - 5
drivers/net/ethernet/intel/i40evf/i40evf_main.c

@@ -306,15 +306,14 @@ static irqreturn_t i40evf_msix_aq(int irq, void *data)
 	struct i40evf_adapter *adapter = netdev_priv(netdev);
 	struct i40evf_adapter *adapter = netdev_priv(netdev);
 	struct i40e_hw *hw = &adapter->hw;
 	struct i40e_hw *hw = &adapter->hw;
 	u32 val;
 	u32 val;
-	u32 ena_mask;
 
 
 	/* handle non-queue interrupts */
 	/* handle non-queue interrupts */
-	val = rd32(hw, I40E_VFINT_ICR01);
-	ena_mask = rd32(hw, I40E_VFINT_ICR0_ENA1);
+	rd32(hw, I40E_VFINT_ICR01);
+	rd32(hw, I40E_VFINT_ICR0_ENA1);
 
 
 
 
-	val = rd32(hw, I40E_VFINT_DYN_CTL01);
-	val = val | I40E_VFINT_DYN_CTL01_CLEARPBA_MASK;
+	val = rd32(hw, I40E_VFINT_DYN_CTL01) |
+	      I40E_VFINT_DYN_CTL01_CLEARPBA_MASK;
 	wr32(hw, I40E_VFINT_DYN_CTL01, val);
 	wr32(hw, I40E_VFINT_DYN_CTL01, val);
 
 
 	/* schedule work on the private workqueue */
 	/* schedule work on the private workqueue */