summaryrefslogtreecommitdiffstats
path: root/arch/s390/pci
diff options
context:
space:
mode:
authorPierre Morel <pmorel@linux.ibm.com>2020-04-28 17:25:56 +0200
committerVasily Gorbik <gor@linux.ibm.com>2020-05-06 14:59:20 +0200
commitd1379279f2d6b407bd08324a170cb21928e69854 (patch)
treec7f94f19fc6c1ef40cc3eca92b2951bee7a9bf68 /arch/s390/pci
parents390: ptrace: hard-code "s390x" instead of UTS_MACHINE (diff)
downloadlinux-d1379279f2d6b407bd08324a170cb21928e69854.tar.xz
linux-d1379279f2d6b407bd08324a170cb21928e69854.zip
s390/pci: removes wrong PCI multifunction assignment
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@linux.ibm.com> Reviewed-by: Niklas Schnelle <schnelle@linux.ibm.com> Signed-off-by: Vasily Gorbik <gor@linux.ibm.com>
Diffstat (limited to 'arch/s390/pci')
-rw-r--r--arch/s390/pci/pci_bus.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/arch/s390/pci/pci_bus.c b/arch/s390/pci/pci_bus.c
index 542c6b8f56df..ada571d1c630 100644
--- a/arch/s390/pci/pci_bus.c
+++ b/arch/s390/pci/pci_bus.c
@@ -156,10 +156,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;
}