From: Niklas Schnelle Date: Mon, 6 Mar 2023 15:10:12 +0000 (+0100) Subject: s390/pci: only add specific device in zpci_bus_scan_device() X-Git-Tag: v6.4-rc1~69^2~100 X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=ae83707f39e1b8f2a15af3868bba25ce4fa93364;p=linux-2.6-block.git s390/pci: only add specific device in zpci_bus_scan_device() As the name suggests zpci_bus_scan_device() is used to scan a specific device and thus pci_bus_add_device() for that device is sufficient. Furthermore move this call inside the rescan/remove locking. Suggested-by: Bjorn Helgaas Signed-off-by: Niklas Schnelle Reviewed-by: Matthew Rosato Link: https://lore.kernel.org/r/20230306151014.60913-3-schnelle@linux.ibm.com Signed-off-by: Vasily Gorbik --- diff --git a/arch/s390/pci/pci_bus.c b/arch/s390/pci/pci_bus.c index 6a8da1b742ae..465399dc4a53 100644 --- a/arch/s390/pci/pci_bus.c +++ b/arch/s390/pci/pci_bus.c @@ -87,9 +87,8 @@ int zpci_bus_scan_device(struct zpci_dev *zdev) if (!pdev) return -ENODEV; - pci_bus_add_device(pdev); pci_lock_rescan_remove(); - pci_bus_add_devices(zdev->zbus->bus); + pci_bus_add_device(pdev); pci_unlock_rescan_remove(); return 0;