| Message ID | 20191101204558.210235-3-helgaas@kernel.org (mailing list archive) |
|---|---|
| State | Not Applicable, archived |
| Headers | show |
| Series | PCI/PM: Minor fix and cleanups | expand |
On Fri, Nov 1, 2019 at 9:46 PM Bjorn Helgaas <helgaas@kernel.org> wrote: > > From: Bjorn Helgaas <bhelgaas@google.com> > > pci_pm_reset() resets a device by putting it in D3hot and bringing it back > to D0. Clarify related messages to mention "D3hot" explicitly instead of > just "D3". > > Signed-off-by: Bjorn Helgaas <bhelgaas@google.com> Reviewed-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com> > --- > drivers/pci/pci.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c > index cd96874ae76d..a9d3653ef960 100644 > --- a/drivers/pci/pci.c > +++ b/drivers/pci/pci.c > @@ -4605,7 +4605,7 @@ static int pci_pm_reset(struct pci_dev *dev, int probe) > pci_write_config_word(dev, dev->pm_cap + PCI_PM_CTRL, csr); > pci_dev_d3_sleep(dev); > > - return pci_dev_wait(dev, "PM D3->D0", PCIE_RESET_READY_POLL_MS); > + return pci_dev_wait(dev, "PM D3hot->D0", PCIE_RESET_READY_POLL_MS); > } > /** > * pcie_wait_for_link - Wait until link is active or inactive > -- > 2.24.0.rc1.363.gb1bccd3e3d-goog >
diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c index cd96874ae76d..a9d3653ef960 100644 --- a/drivers/pci/pci.c +++ b/drivers/pci/pci.c @@ -4605,7 +4605,7 @@ static int pci_pm_reset(struct pci_dev *dev, int probe) pci_write_config_word(dev, dev->pm_cap + PCI_PM_CTRL, csr); pci_dev_d3_sleep(dev); - return pci_dev_wait(dev, "PM D3->D0", PCIE_RESET_READY_POLL_MS); + return pci_dev_wait(dev, "PM D3hot->D0", PCIE_RESET_READY_POLL_MS); } /** * pcie_wait_for_link - Wait until link is active or inactive