| Message ID | 20221025193502.669091-1-helgaas@kernel.org (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | c946287d8e2fde04c73d6a7bc8a9713a7d84b16b |
| Headers | show |
| Series | PCI/PM: Remove unused 'state' parameter to pci_legacy_suspend_late() | expand |
On Tue, Oct 25, 2022 at 9:35 PM Bjorn Helgaas <helgaas@kernel.org> wrote: > > From: Bjorn Helgaas <bhelgaas@google.com> > > 1a1daf097e21 ("PCI/PM: Remove unused pci_driver.suspend_late() hook") > removed the legacy .suspend_late() hook, which was the only user of the > "state" parameter to pci_legacy_suspend_late(), but it neglected to remove > the parameter. > > Remove the unused "state" parameter to pci_legacy_suspend_late(). > > Signed-off-by: Bjorn Helgaas <bhelgaas@google.com> Acked-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com> > --- > drivers/pci/pci-driver.c | 8 ++++---- > 1 file changed, 4 insertions(+), 4 deletions(-) > > diff --git a/drivers/pci/pci-driver.c b/drivers/pci/pci-driver.c > index 107d77f3c846..a2ceeacc33eb 100644 > --- a/drivers/pci/pci-driver.c > +++ b/drivers/pci/pci-driver.c > @@ -646,7 +646,7 @@ static int pci_legacy_suspend(struct device *dev, pm_message_t state) > return 0; > } > > -static int pci_legacy_suspend_late(struct device *dev, pm_message_t state) > +static int pci_legacy_suspend_late(struct device *dev) > { > struct pci_dev *pci_dev = to_pci_dev(dev); > > @@ -848,7 +848,7 @@ static int pci_pm_suspend_noirq(struct device *dev) > return 0; > > if (pci_has_legacy_pm_support(pci_dev)) > - return pci_legacy_suspend_late(dev, PMSG_SUSPEND); > + return pci_legacy_suspend_late(dev); > > if (!pm) { > pci_save_state(pci_dev); > @@ -1060,7 +1060,7 @@ static int pci_pm_freeze_noirq(struct device *dev) > const struct dev_pm_ops *pm = dev->driver ? dev->driver->pm : NULL; > > if (pci_has_legacy_pm_support(pci_dev)) > - return pci_legacy_suspend_late(dev, PMSG_FREEZE); > + return pci_legacy_suspend_late(dev); > > if (pm && pm->freeze_noirq) { > int error; > @@ -1179,7 +1179,7 @@ static int pci_pm_poweroff_noirq(struct device *dev) > return 0; > > if (pci_has_legacy_pm_support(pci_dev)) > - return pci_legacy_suspend_late(dev, PMSG_HIBERNATE); > + return pci_legacy_suspend_late(dev); > > if (!pm) { > pci_fixup_device(pci_fixup_suspend_late, pci_dev); > -- > 2.25.1 >
On Tue, Oct 25, 2022 at 02:35:02PM -0500, Bjorn Helgaas wrote: > From: Bjorn Helgaas <bhelgaas@google.com> > > 1a1daf097e21 ("PCI/PM: Remove unused pci_driver.suspend_late() hook") > removed the legacy .suspend_late() hook, which was the only user of the > "state" parameter to pci_legacy_suspend_late(), but it neglected to remove > the parameter. > > Remove the unused "state" parameter to pci_legacy_suspend_late(). > > Signed-off-by: Bjorn Helgaas <bhelgaas@google.com> Applied with Rafael's ack to pci/pm for v6.2. > --- > drivers/pci/pci-driver.c | 8 ++++---- > 1 file changed, 4 insertions(+), 4 deletions(-) > > diff --git a/drivers/pci/pci-driver.c b/drivers/pci/pci-driver.c > index 107d77f3c846..a2ceeacc33eb 100644 > --- a/drivers/pci/pci-driver.c > +++ b/drivers/pci/pci-driver.c > @@ -646,7 +646,7 @@ static int pci_legacy_suspend(struct device *dev, pm_message_t state) > return 0; > } > > -static int pci_legacy_suspend_late(struct device *dev, pm_message_t state) > +static int pci_legacy_suspend_late(struct device *dev) > { > struct pci_dev *pci_dev = to_pci_dev(dev); > > @@ -848,7 +848,7 @@ static int pci_pm_suspend_noirq(struct device *dev) > return 0; > > if (pci_has_legacy_pm_support(pci_dev)) > - return pci_legacy_suspend_late(dev, PMSG_SUSPEND); > + return pci_legacy_suspend_late(dev); > > if (!pm) { > pci_save_state(pci_dev); > @@ -1060,7 +1060,7 @@ static int pci_pm_freeze_noirq(struct device *dev) > const struct dev_pm_ops *pm = dev->driver ? dev->driver->pm : NULL; > > if (pci_has_legacy_pm_support(pci_dev)) > - return pci_legacy_suspend_late(dev, PMSG_FREEZE); > + return pci_legacy_suspend_late(dev); > > if (pm && pm->freeze_noirq) { > int error; > @@ -1179,7 +1179,7 @@ static int pci_pm_poweroff_noirq(struct device *dev) > return 0; > > if (pci_has_legacy_pm_support(pci_dev)) > - return pci_legacy_suspend_late(dev, PMSG_HIBERNATE); > + return pci_legacy_suspend_late(dev); > > if (!pm) { > pci_fixup_device(pci_fixup_suspend_late, pci_dev); > -- > 2.25.1 >
diff --git a/drivers/pci/pci-driver.c b/drivers/pci/pci-driver.c index 107d77f3c846..a2ceeacc33eb 100644 --- a/drivers/pci/pci-driver.c +++ b/drivers/pci/pci-driver.c @@ -646,7 +646,7 @@ static int pci_legacy_suspend(struct device *dev, pm_message_t state) return 0; } -static int pci_legacy_suspend_late(struct device *dev, pm_message_t state) +static int pci_legacy_suspend_late(struct device *dev) { struct pci_dev *pci_dev = to_pci_dev(dev); @@ -848,7 +848,7 @@ static int pci_pm_suspend_noirq(struct device *dev) return 0; if (pci_has_legacy_pm_support(pci_dev)) - return pci_legacy_suspend_late(dev, PMSG_SUSPEND); + return pci_legacy_suspend_late(dev); if (!pm) { pci_save_state(pci_dev); @@ -1060,7 +1060,7 @@ static int pci_pm_freeze_noirq(struct device *dev) const struct dev_pm_ops *pm = dev->driver ? dev->driver->pm : NULL; if (pci_has_legacy_pm_support(pci_dev)) - return pci_legacy_suspend_late(dev, PMSG_FREEZE); + return pci_legacy_suspend_late(dev); if (pm && pm->freeze_noirq) { int error; @@ -1179,7 +1179,7 @@ static int pci_pm_poweroff_noirq(struct device *dev) return 0; if (pci_has_legacy_pm_support(pci_dev)) - return pci_legacy_suspend_late(dev, PMSG_HIBERNATE); + return pci_legacy_suspend_late(dev); if (!pm) { pci_fixup_device(pci_fixup_suspend_late, pci_dev);