| Message ID | 1372993054-25730-5-git-send-email-shangw@linux.vnet.ibm.com (mailing list archive) |
|---|---|
| State | Accepted, archived |
| Commit | c7b51bce636e4990662bb100bc17e1d4d6c02d34 |
| Headers | show |
On Thu, Jul 4, 2013 at 8:57 PM, Gavin Shan <shangw@linux.vnet.ibm.com> wrote: > Since pci_stop_and_remove_bus_device() has removed the EEH cache, > we needn't do that again. > > Cc: Bjorn Helgaas <bhelgaas@google.com> > Cc: linux-pci@vger.kernel.org > Signed-off-by: Gavin Shan <shangw@linux.vnet.ibm.com> Acked-by: Bjorn Helgaas <bhelgaas@google.com> Please merge this along with the rest of your series via whatever tree you choose. > --- > drivers/pci/hotplug/rpadlpar_core.c | 1 - > 1 files changed, 0 insertions(+), 1 deletions(-) > > 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; > -- > 1.7.5.4 > > -- > To unsubscribe from this list: send the line "unsubscribe linux-pci" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html
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;
Since pci_stop_and_remove_bus_device() has removed the EEH cache, we needn't do that again. Cc: Bjorn Helgaas <bhelgaas@google.com> Cc: linux-pci@vger.kernel.org Signed-off-by: Gavin Shan <shangw@linux.vnet.ibm.com> --- drivers/pci/hotplug/rpadlpar_core.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-)