]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
igc: Remove no need declaration of the igc_write_itr
authorSasha Neftin <sasha.neftin@intel.com>
Tue, 19 Nov 2019 11:45:32 +0000 (13:45 +0200)
committerJeff Kirsher <jeffrey.t.kirsher@intel.com>
Sun, 5 Jan 2020 07:06:03 +0000 (23:06 -0800)
We want to avoid forward-declarations of function if possible.
Rearrange the igc_write_itr function implementation.

Signed-off-by: Sasha Neftin <sasha.neftin@intel.com>
Tested-by: Aaron Brown <aaron.f.brown@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
drivers/net/ethernet/intel/igc/igc_main.c

index 4fb40c6aa5834260f3b77e1ffa80fd890128dae0..c7b9bbbef3aa8df16aaf48c3eb43e4e777fc3b2a 100644 (file)
@@ -53,7 +53,6 @@ MODULE_DEVICE_TABLE(pci, igc_pci_tbl);
 
 /* forward declaration */
 static int igc_sw_init(struct igc_adapter *);
-static void igc_write_itr(struct igc_q_vector *q_vector);
 
 enum latency_range {
        lowest_latency = 0,
@@ -2931,6 +2930,22 @@ static irqreturn_t igc_msix_other(int irq, void *data)
        return IRQ_HANDLED;
 }
 
+static void igc_write_itr(struct igc_q_vector *q_vector)
+{
+       u32 itr_val = q_vector->itr_val & IGC_QVECTOR_MASK;
+
+       if (!q_vector->set_itr)
+               return;
+
+       if (!itr_val)
+               itr_val = IGC_ITR_VAL_MASK;
+
+       itr_val |= IGC_EITR_CNT_IGNR;
+
+       writel(itr_val, q_vector->itr_register);
+       q_vector->set_itr = 0;
+}
+
 static irqreturn_t igc_msix_ring(int irq, void *data)
 {
        struct igc_q_vector *q_vector = data;
@@ -4044,22 +4059,6 @@ request_done:
        return err;
 }
 
-static void igc_write_itr(struct igc_q_vector *q_vector)
-{
-       u32 itr_val = q_vector->itr_val & IGC_QVECTOR_MASK;
-
-       if (!q_vector->set_itr)
-               return;
-
-       if (!itr_val)
-               itr_val = IGC_ITR_VAL_MASK;
-
-       itr_val |= IGC_EITR_CNT_IGNR;
-
-       writel(itr_val, q_vector->itr_register);
-       q_vector->set_itr = 0;
-}
-
 /**
  * __igc_open - Called when a network interface is made active
  * @netdev: network interface device structure