openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

PM: sleep: core: Rename dev_pm_smart_suspend_and_suspended() 

Because all callers of dev_pm_smart_suspend_and_suspended use it only
for checking whether or not to skip driver suspend callbacks for a
device, rename it to dev_pm_skip_suspend() in analogy with
dev_pm_skip_resume().

No functional impact.

Suggested-by: Alan Stern <stern@rowland.harvard.edu>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Acked-by: Alan Stern <stern@rowland.harvard.edu>
Acked-by: Bjorn Helgaas <bhelgaas@google.com>
This commit is contained in:
Rafael J. Wysocki 2020-04-18 18:52:48 +02:00
parent 76c70cb58c
commit fa2bfead91
6 changed files with 19 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/acpi/acpi_lpss.c
View File

@ -1041,7 +1041,7 @@ static int acpi_lpss_do_suspend_late(struct device *dev)
{ {
int ret; int ret;
if (dev_pm_smart_suspend_and_suspended(dev)) if (dev_pm_skip_suspend(dev))
return 0; return 0;
ret = pm_generic_suspend_late(dev); ret = pm_generic_suspend_late(dev);
@ -1169,7 +1169,7 @@ static int acpi_lpss_poweroff_late(struct device *dev)
{ {
struct lpss_private_data *pdata = acpi_driver_data(ACPI_COMPANION(dev)); struct lpss_private_data *pdata = acpi_driver_data(ACPI_COMPANION(dev));
if (dev_pm_smart_suspend_and_suspended(dev)) if (dev_pm_skip_suspend(dev))
return 0; return 0;
if (pdata->dev_desc->resume_from_noirq) if (pdata->dev_desc->resume_from_noirq)
@ -1182,7 +1182,7 @@ static int acpi_lpss_poweroff_noirq(struct device *dev)
{ {
struct lpss_private_data *pdata = acpi_driver_data(ACPI_COMPANION(dev)); struct lpss_private_data *pdata = acpi_driver_data(ACPI_COMPANION(dev));
if (dev_pm_smart_suspend_and_suspended(dev)) if (dev_pm_skip_suspend(dev))
return 0; return 0;
if (pdata->dev_desc->resume_from_noirq) { if (pdata->dev_desc->resume_from_noirq) {

8
drivers/acpi/device_pm.c
View File

@ -1084,7 +1084,7 @@ int acpi_subsys_suspend_late(struct device *dev)
{ {
int ret; int ret;
if (dev_pm_smart_suspend_and_suspended(dev)) if (dev_pm_skip_suspend(dev))
return 0; return 0;
ret = pm_generic_suspend_late(dev); ret = pm_generic_suspend_late(dev);
@ -1100,7 +1100,7 @@ int acpi_subsys_suspend_noirq(struct device *dev)
{ {
int ret; int ret;
if (dev_pm_smart_suspend_and_suspended(dev)) if (dev_pm_skip_suspend(dev))
return 0; return 0;
ret = pm_generic_suspend_noirq(dev); ret = pm_generic_suspend_noirq(dev);
@ -1213,7 +1213,7 @@ static int acpi_subsys_poweroff_late(struct device *dev)
{ {
int ret; int ret;
if (dev_pm_smart_suspend_and_suspended(dev)) if (dev_pm_skip_suspend(dev))
return 0; return 0;
ret = pm_generic_poweroff_late(dev); ret = pm_generic_poweroff_late(dev);
@ -1229,7 +1229,7 @@ static int acpi_subsys_poweroff_late(struct device *dev)
*/ */
static int acpi_subsys_poweroff_noirq(struct device *dev) static int acpi_subsys_poweroff_noirq(struct device *dev)
{ {
if (dev_pm_smart_suspend_and_suspended(dev)) if (dev_pm_skip_suspend(dev))
return 0; return 0;
return pm_generic_poweroff_noirq(dev); return pm_generic_poweroff_noirq(dev);

13
drivers/base/power/main.c
View File

@ -567,8 +567,7 @@ static void dpm_watchdog_clear(struct dpm_watchdog *wd)
* *
* Return: * Return:
* - %false if the transition under way is RESTORE. * - %false if the transition under way is RESTORE.
* - The return value of dev_pm_smart_suspend_and_suspended() if the transition * - Return value of dev_pm_skip_suspend() if the transition under way is THAW.
* under way is THAW.
* - The logical negation of %power.must_resume otherwise (that is, when the * - The logical negation of %power.must_resume otherwise (that is, when the
* transition under way is RESUME). * transition under way is RESUME).
*/ */
@ -578,7 +577,7 @@ bool dev_pm_skip_resume(struct device *dev)
return false; return false;
if (pm_transition.event == PM_EVENT_THAW) if (pm_transition.event == PM_EVENT_THAW)
return dev_pm_smart_suspend_and_suspended(dev); return dev_pm_skip_suspend(dev);
return !dev->power.must_resume; return !dev->power.must_resume;
} }
@ -624,7 +623,7 @@ static int device_resume_noirq(struct device *dev, pm_message_t state, bool asyn
*/ */
if (skip_resume) if (skip_resume)
pm_runtime_set_suspended(dev); pm_runtime_set_suspended(dev);
else if (dev_pm_smart_suspend_and_suspended(dev)) else if (dev_pm_skip_suspend(dev))
pm_runtime_set_active(dev); pm_runtime_set_active(dev);
if (dev->pm_domain) { if (dev->pm_domain) {
@ -1223,7 +1222,7 @@ static int __device_suspend_noirq(struct device *dev, pm_message_t state, bool a
if (callback) if (callback)
goto Run; goto Run;
if (dev_pm_smart_suspend_and_suspended(dev)) if (dev_pm_skip_suspend(dev))
goto Skip; goto Skip;
if (dev->driver && dev->driver->pm) { if (dev->driver && dev->driver->pm) {
@ -1415,7 +1414,7 @@ static int __device_suspend_late(struct device *dev, pm_message_t state, bool as
if (callback) if (callback)
goto Run; goto Run;
if (dev_pm_smart_suspend_and_suspended(dev)) if (dev_pm_skip_suspend(dev))
goto Skip; goto Skip;
if (dev->driver && dev->driver->pm) { if (dev->driver && dev->driver->pm) {
@ -2003,7 +2002,7 @@ void device_pm_check_callbacks(struct device *dev)
spin_unlock_irq(&dev->power.lock); spin_unlock_irq(&dev->power.lock);
} }
bool dev_pm_smart_suspend_and_suspended(struct device *dev) bool dev_pm_skip_suspend(struct device *dev)
{ {
return dev_pm_test_driver_flags(dev, DPM_FLAG_SMART_SUSPEND) && return dev_pm_test_driver_flags(dev, DPM_FLAG_SMART_SUSPEND) &&
pm_runtime_status_suspended(dev); pm_runtime_status_suspended(dev);

2
drivers/pci/hotplug/pciehp_core.c
View File

@ -275,7 +275,7 @@ static int pciehp_suspend(struct pcie_device *dev)
* If the port is already runtime suspended we can keep it that * If the port is already runtime suspended we can keep it that
* way. * way.
*/ */
if (dev_pm_smart_suspend_and_suspended(&dev->port->dev)) if (dev_pm_skip_suspend(&dev->port->dev))
return 0; return 0;
pciehp_disable_interrupt(dev); pciehp_disable_interrupt(dev);

8
drivers/pci/pci-driver.c
View File

@ -776,7 +776,7 @@ static int pci_pm_suspend(struct device *dev)
static int pci_pm_suspend_late(struct device *dev) static int pci_pm_suspend_late(struct device *dev)
{ {
if (dev_pm_smart_suspend_and_suspended(dev)) if (dev_pm_skip_suspend(dev))
return 0; return 0;
pci_fixup_device(pci_fixup_suspend, to_pci_dev(dev)); pci_fixup_device(pci_fixup_suspend, to_pci_dev(dev));
@ -789,7 +789,7 @@ static int pci_pm_suspend_noirq(struct device *dev)
struct pci_dev *pci_dev = to_pci_dev(dev); struct pci_dev *pci_dev = to_pci_dev(dev);
const struct dev_pm_ops *pm = dev->driver ? dev->driver->pm : NULL; const struct dev_pm_ops *pm = dev->driver ? dev->driver->pm : NULL;
if (dev_pm_smart_suspend_and_suspended(dev)) if (dev_pm_skip_suspend(dev))
return 0; return 0;
if (pci_has_legacy_pm_support(pci_dev)) if (pci_has_legacy_pm_support(pci_dev))
@ -1126,7 +1126,7 @@ static int pci_pm_poweroff(struct device *dev)
static int pci_pm_poweroff_late(struct device *dev) static int pci_pm_poweroff_late(struct device *dev)
{ {
if (dev_pm_smart_suspend_and_suspended(dev)) if (dev_pm_skip_suspend(dev))
return 0; return 0;
pci_fixup_device(pci_fixup_suspend, to_pci_dev(dev)); pci_fixup_device(pci_fixup_suspend, to_pci_dev(dev));
@ -1139,7 +1139,7 @@ static int pci_pm_poweroff_noirq(struct device *dev)
struct pci_dev *pci_dev = to_pci_dev(dev); struct pci_dev *pci_dev = to_pci_dev(dev);
const struct dev_pm_ops *pm = dev->driver ? dev->driver->pm : NULL; const struct dev_pm_ops *pm = dev->driver ? dev->driver->pm : NULL;
if (dev_pm_smart_suspend_and_suspended(dev)) if (dev_pm_skip_suspend(dev))
return 0; return 0;
if (pci_has_legacy_pm_support(pci_dev)) if (pci_has_legacy_pm_support(pci_dev))

2
include/linux/pm.h
View File

@ -759,7 +759,7 @@ extern int pm_generic_poweroff(struct device *dev);
extern void pm_generic_complete(struct device *dev); extern void pm_generic_complete(struct device *dev);
extern bool dev_pm_skip_resume(struct device *dev); extern bool dev_pm_skip_resume(struct device *dev);
extern bool dev_pm_smart_suspend_and_suspended(struct device *dev); extern bool dev_pm_skip_suspend(struct device *dev);
#else /* !CONFIG_PM_SLEEP */ #else /* !CONFIG_PM_SLEEP */