* [PATCH] PCI/PM: Remove unused 'state' parameter to pci_legacy_suspend_late()
@ 2022-10-25 19:35 Bjorn Helgaas
2022-10-25 19:44 ` Rafael J. Wysocki
2022-10-25 22:46 ` Bjorn Helgaas
0 siblings, 2 replies; 3+ messages in thread
From: Bjorn Helgaas @ 2022-10-25 19:35 UTC (permalink / raw)
To: linux-pci
Cc: Krzysztof Wilczyński, Rafael J . Wysocki, linux-pm,
linux-kernel, Bjorn Helgaas
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>
---
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
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH] PCI/PM: Remove unused 'state' parameter to pci_legacy_suspend_late()
2022-10-25 19:35 [PATCH] PCI/PM: Remove unused 'state' parameter to pci_legacy_suspend_late() Bjorn Helgaas
@ 2022-10-25 19:44 ` Rafael J. Wysocki
2022-10-25 22:46 ` Bjorn Helgaas
1 sibling, 0 replies; 3+ messages in thread
From: Rafael J. Wysocki @ 2022-10-25 19:44 UTC (permalink / raw)
To: Bjorn Helgaas
Cc: linux-pci, Krzysztof Wilczyński, Rafael J . Wysocki,
linux-pm, linux-kernel, Bjorn Helgaas
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
>
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH] PCI/PM: Remove unused 'state' parameter to pci_legacy_suspend_late()
2022-10-25 19:35 [PATCH] PCI/PM: Remove unused 'state' parameter to pci_legacy_suspend_late() Bjorn Helgaas
2022-10-25 19:44 ` Rafael J. Wysocki
@ 2022-10-25 22:46 ` Bjorn Helgaas
1 sibling, 0 replies; 3+ messages in thread
From: Bjorn Helgaas @ 2022-10-25 22:46 UTC (permalink / raw)
To: linux-pci
Cc: Krzysztof Wilczyński, Rafael J . Wysocki, linux-pm,
linux-kernel, Bjorn Helgaas
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
>
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2022-10-25 22:46 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-10-25 19:35 [PATCH] PCI/PM: Remove unused 'state' parameter to pci_legacy_suspend_late() Bjorn Helgaas
2022-10-25 19:44 ` Rafael J. Wysocki
2022-10-25 22:46 ` Bjorn Helgaas
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox