From: Alexander Duyck <aduyck@mirantis.com>
Date: Thu, 29 Oct 2015 21:21:11 +0000 (-0500)
Subject: PCI: Reorder pcibios_sriov_disable()
X-Git-Tag: firefly_0821_release~176^2~768^2~3^7~2
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=a39e3fcd72356e2bcb46fd99ec4e98064bd806b2;p=firefly-linux-kernel-4.4.55.git

PCI: Reorder pcibios_sriov_disable()

Move pcibios_sriov_disable() up so it's defined before a future use.

[bhelgaas: split to separate patch for reviewability]
Signed-off-by: Alexander Duyck <aduyck@mirantis.com>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Reviewed-by: Wei Yang <weiyang@linux.vnet.ibm.com>
---

diff --git a/drivers/pci/iov.c b/drivers/pci/iov.c
index c86d94c0c7a4..fada98da731b 100644
--- a/drivers/pci/iov.c
+++ b/drivers/pci/iov.c
@@ -227,7 +227,12 @@ static void virtfn_remove(struct pci_dev *dev, int id, int reset)
 
 int __weak pcibios_sriov_enable(struct pci_dev *pdev, u16 num_vfs)
 {
-       return 0;
+	return 0;
+}
+
+int __weak pcibios_sriov_disable(struct pci_dev *pdev)
+{
+	return 0;
 }
 
 static int sriov_enable(struct pci_dev *dev, int nr_virtfn)
@@ -344,11 +349,6 @@ failed:
 	return rc;
 }
 
-int __weak pcibios_sriov_disable(struct pci_dev *pdev)
-{
-       return 0;
-}
-
 static void sriov_disable(struct pci_dev *dev)
 {
 	int i;