OSDN Git Service

powerpc/pci: Remove unused parameter from add_one_dev_pci_data()
authorAlexey Kardashevskiy <aik@ozlabs.ru>
Tue, 29 Aug 2017 07:33:59 +0000 (17:33 +1000)
committerMichael Ellerman <mpe@ellerman.id.au>
Thu, 31 Aug 2017 04:26:07 +0000 (14:26 +1000)
pdev is always NULL, remove it.

To make checkpatch.pl happy, this also removes the "out of memory"
message.

Signed-off-by: Alexey Kardashevskiy <aik@ozlabs.ru>
Reviewed-by: Andrew Donnellan <andrew.donnellan@au1.ibm.com>
Acked-by: Russell Currey <ruscur@russell.cc>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
arch/powerpc/kernel/pci_dn.c

index 5926934..0256372 100644 (file)
@@ -139,7 +139,6 @@ struct pci_dn *pci_get_pdn(struct pci_dev *pdev)
 
 #ifdef CONFIG_PCI_IOV
 static struct pci_dn *add_one_dev_pci_data(struct pci_dn *parent,
-                                          struct pci_dev *pdev,
                                           int vf_index,
                                           int busno, int devfn)
 {
@@ -150,10 +149,8 @@ static struct pci_dn *add_one_dev_pci_data(struct pci_dn *parent,
                return NULL;
 
        pdn = kzalloc(sizeof(*pdn), GFP_KERNEL);
-       if (!pdn) {
-               dev_warn(&pdev->dev, "%s: Out of memory!\n", __func__);
+       if (!pdn)
                return NULL;
-       }
 
        pdn->phb = parent->phb;
        pdn->parent = parent;
@@ -167,13 +164,6 @@ static struct pci_dn *add_one_dev_pci_data(struct pci_dn *parent,
        INIT_LIST_HEAD(&pdn->list);
        list_add_tail(&pdn->list, &parent->child_list);
 
-       /*
-        * If we already have PCI device instance, lets
-        * bind them.
-        */
-       if (pdev)
-               pdev->dev.archdata.pci_data = pdn;
-
        return pdn;
 }
 #endif
@@ -201,7 +191,7 @@ struct pci_dn *add_dev_pci_data(struct pci_dev *pdev)
        for (i = 0; i < pci_sriov_get_totalvfs(pdev); i++) {
                struct eeh_dev *edev __maybe_unused;
 
-               pdn = add_one_dev_pci_data(parent, NULL, i,
+               pdn = add_one_dev_pci_data(parent, i,
                                           pci_iov_virtfn_bus(pdev, i),
                                           pci_iov_virtfn_devfn(pdev, i));
                if (!pdn) {