e1000e: cleanup code duplication

The removed code block is duplicated in e1000e_write_itr() so use that
instead.

Signed-off-by: Bruce Allan <bruce.w.allan@intel.com>
Tested-by: Aaron Brown <aaron.f.brown@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>

diff --git a/drivers/net/ethernet/intel/e1000e/netdev.c b/drivers/net/ethernet/intel/e1000e/netdev.c
index 18790a608f4ff16c20e2fb6cc493d26dd3f5848a..6aa9c5d31a48d925f8487a92ff9f97a397d99142 100644 (file)
--- a/drivers/net/ethernet/intel/e1000e/netdev.c
+++ b/drivers/net/ethernet/intel/e1000e/netdev.c
@@ -2405,7 +2405,6 @@ static unsigned int e1000_update_itr(struct e1000_adapter *adapter,
 
 static void e1000_set_itr(struct e1000_adapter *adapter)
 {
-       struct e1000_hw *hw = &adapter->hw;
        u16 current_itr;
        u32 new_itr = adapter->itr;
 
@@ -2468,10 +2467,7 @@ set_itr_now:
                if (adapter->msix_entries)
                        adapter->rx_ring->set_itr = 1;
                else
-                       if (new_itr)
-                               ew32(ITR, 1000000000 / (new_itr * 256));
-                       else
-                               ew32(ITR, 0);
+                       e1000e_write_itr(adapter, new_itr);
        }
 }