fm10k: move fm10k_prepare_for_reset and fm10k_handle_reset

A future patch needs these functions defined earlier in the file. Move
them closer to above where they will be called.

Signed-off-by: Jacob Keller <jacob.e.keller@intel.com>
Tested-by: Krishneil Singh <krishneil.k.singh@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>

diff --git a/drivers/net/ethernet/intel/fm10k/fm10k_pci.c b/drivers/net/ethernet/intel/fm10k/fm10k_pci.c
index 6c2c4bffaedfb1aee0741b22c0185595f8547d09..41335154d6b1bb078d2e79a7c14514e597464340 100644 (file)
--- a/drivers/net/ethernet/intel/fm10k/fm10k_pci.c
+++ b/drivers/net/ethernet/intel/fm10k/fm10k_pci.c
@@ -132,35 +132,6 @@ static void fm10k_service_timer(unsigned long data)
        fm10k_service_event_schedule(interface);
 }
 
-static void fm10k_detach_subtask(struct fm10k_intfc *interface)
-{
-       struct net_device *netdev = interface->netdev;
-       u32 __iomem *hw_addr;
-       u32 value;
-
-       /* do nothing if device is still present or hw_addr is set */
-       if (netif_device_present(netdev) || interface->hw.hw_addr)
-               return;
-
-       /* check the real address space to see if we've recovered */
-       hw_addr = READ_ONCE(interface->uc_addr);
-       value = readl(hw_addr);
-       if (~value) {
-               interface->hw.hw_addr = interface->uc_addr;
-               netif_device_attach(netdev);
-               set_bit(FM10K_FLAG_RESET_REQUESTED, interface->flags);
-               netdev_warn(netdev, "PCIe link restored, device now attached\n");
-               return;
-       }
-
-       rtnl_lock();
-
-       if (netif_running(netdev))
-               dev_close(netdev);
-
-       rtnl_unlock();
-}
-
 static void fm10k_prepare_for_reset(struct fm10k_intfc *interface)
 {
        struct net_device *netdev = interface->netdev;
@@ -270,6 +241,35 @@ reinit_err:
        return err;
 }
 
+static void fm10k_detach_subtask(struct fm10k_intfc *interface)
+{
+       struct net_device *netdev = interface->netdev;
+       u32 __iomem *hw_addr;
+       u32 value;
+
+       /* do nothing if device is still present or hw_addr is set */
+       if (netif_device_present(netdev) || interface->hw.hw_addr)
+               return;
+
+       /* check the real address space to see if we've recovered */
+       hw_addr = READ_ONCE(interface->uc_addr);
+       value = readl(hw_addr);
+       if (~value) {
+               interface->hw.hw_addr = interface->uc_addr;
+               netif_device_attach(netdev);
+               set_bit(FM10K_FLAG_RESET_REQUESTED, interface->flags);
+               netdev_warn(netdev, "PCIe link restored, device now attached\n");
+               return;
+       }
+
+       rtnl_lock();
+
+       if (netif_running(netdev))
+               dev_close(netdev);
+
+       rtnl_unlock();
+}
+
 static void fm10k_reinit(struct fm10k_intfc *interface)
 {
        int err;