[SRU][F][PATCH 12/12] s390/pci: removes wrong PCI multifunction assignment

[frank.heimes at canonical.com]

From: Pierre Morel <pmorel at linux.ibm.com>

BugLink: https://bugs.launchpad.net/bugs/1874056

The assignment of the PCI device multifunction attribute
is set during the PCI device probe.
There is no need to set it here.

Let's do it right and remove this assignment.

Signed-off-by: Pierre Morel <pmorel at linux.ibm.com>
Reviewed-by: Niklas Schnelle <schnelle at linux.ibm.com>
Signed-off-by: Vasily Gorbik <gor at linux.ibm.com>
(backported from commit d1379279f2d6b407bd08324a170cb21928e69854)
Signed-off-by: Frank Heimes <frank.heimes at canonical.com>
---
 arch/s390/pci/pci_bus.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/arch/s390/pci/pci_bus.c b/arch/s390/pci/pci_bus.c
index 8b76b88b0840..fdc36f948ab2 100644
--- a/arch/s390/pci/pci_bus.c
+++ b/arch/s390/pci/pci_bus.c
@@ -151,10 +151,8 @@ static int zpci_bus_add_device(struct zpci_bus *zbus, struct zpci_dev *zdev)
 	}
 
 	pdev = pci_scan_single_device(bus, zdev->devfn);
-	if (pdev) {
-		pdev->multifunction = 1;
+	if (pdev)
 		pci_bus_add_device(pdev);
-	}
 
 	return 0;
 }
-- 
2.25.1