From: Gavin Shan Date: Wed, 24 Jul 2013 02:24:54 +0000 (+0800) Subject: powerpc/pci/hotplug: Don't need to remove from EEH cache twice X-Git-Tag: accepted/tizen/common/20141203.182822~1756^2~17 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=c7b51bce636e4990662bb100bc17e1d4d6c02d34;p=platform%2Fkernel%2Flinux-arm64.git powerpc/pci/hotplug: Don't need to remove from EEH cache twice Since pcibios_release_device() called by pci_stop_and_remove_bus_device() has removed the device from the EEH cache, we needn't do that again. Cc: Bjorn Helgaas Acked-by: Bjorn Helgaas Signed-off-by: Gavin Shan Signed-off-by: Benjamin Herrenschmidt --- diff --git a/drivers/pci/hotplug/rpadlpar_core.c b/drivers/pci/hotplug/rpadlpar_core.c index b29e20b..bb7af78 100644 --- a/drivers/pci/hotplug/rpadlpar_core.c +++ b/drivers/pci/hotplug/rpadlpar_core.c @@ -388,7 +388,6 @@ int dlpar_remove_pci_slot(char *drc_name, struct device_node *dn) /* Remove the EADS bridge device itself */ BUG_ON(!bus->self); pr_debug("PCI: Now removing bridge device %s\n", pci_name(bus->self)); - eeh_remove_bus_device(bus->self, true); pci_stop_and_remove_bus_device(bus->self); return 0;