Commit 99efde6c authored by Mika Westerberg's avatar Mika Westerberg Committed by Bjorn Helgaas
Browse files

PCI/PM: Rename pci_wakeup_bus() to pci_resume_bus() 

A "wakeup" is a signal from a device telling the system that the device or
the whole system should be awakened and made active.  PCI devices are made
active by "resuming" them.

pci_wakeup_bus() is not involved with the wakeup signal; it *resumes*
devices on a bus (possibly in response to a wakeup signal, but that's at a
higher level).

Rename pci_wakeup_bus() to pci_resume_bus() to better reflect what it does.
No functional change intended.

[bhelgaas: commit log, reorder before removal of pci_wakeup_event()]
Link: https://lore.kernel.org/r/20201125090733.77782-2-mika.westerberg@linux.intel.com


Signed-off-by: default avatarMika Westerberg <mika.westerberg@linux.intel.com>
Signed-off-by: default avatarBjorn Helgaas <bhelgaas@google.com>
Reviewed-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent 80a129af

drivers/gpu/vga/vga_switcheroo.c

+1 −1
Original line number Diff line number Diff line
@@ -1039,7 +1039,7 @@ static int vga_switcheroo_runtime_resume(struct device *dev) 
	mutex_lock(&vgasr_mutex);

	vga_switcheroo_power_switch(pdev, VGA_SWITCHEROO_ON);

	mutex_unlock(&vgasr_mutex);

	pci_wakeup_bus(pdev->bus);

	pci_resume_bus(pdev->bus);

	ret = dev->bus->pm->runtime_resume(dev);

	if (ret)

		return ret;

drivers/pci/pci.c

+5 −10
Original line number Diff line number Diff line
@@ -1174,12 +1174,7 @@ int pci_platform_power_transition(struct pci_dev *dev, pci_power_t state) 
}

EXPORT_SYMBOL_GPL(pci_platform_power_transition);



/**

 * pci_wakeup - Wake up a PCI device

 * @pci_dev: Device to handle.

 * @ign: ignored parameter

 */

static int pci_wakeup(struct pci_dev *pci_dev, void *ign)

static int pci_resume_one(struct pci_dev *pci_dev, void *ign)

{

	pci_wakeup_event(pci_dev);

	pm_request_resume(&pci_dev->dev);
@@ -1187,13 +1182,13 @@ static int pci_wakeup(struct pci_dev *pci_dev, void *ign) 
}



/**

 * pci_wakeup_bus - Walk given bus and wake up devices on it

 * pci_resume_bus - Walk given bus and runtime resume devices on it

 * @bus: Top bus of the subtree to walk.

 */

void pci_wakeup_bus(struct pci_bus *bus)

void pci_resume_bus(struct pci_bus *bus)

{

	if (bus)

		pci_walk_bus(bus, pci_wakeup, NULL);

		pci_walk_bus(bus, pci_resume_one, NULL);

}



static int pci_dev_wait(struct pci_dev *dev, char *reset_type, int timeout)
@@ -1256,7 +1251,7 @@ int pci_power_up(struct pci_dev *dev) 
		 * may be powered on into D0uninitialized state, resume them to

		 * give them a chance to suspend again

		 */

		pci_wakeup_bus(dev->subordinate);

		pci_resume_bus(dev->subordinate);

	}



	return pci_raw_set_power_state(dev, PCI_D0);

include/linux/pci.h

+1 −1
Original line number Diff line number Diff line
@@ -1271,7 +1271,7 @@ bool pci_dev_run_wake(struct pci_dev *dev); 
void pci_d3cold_enable(struct pci_dev *dev);

void pci_d3cold_disable(struct pci_dev *dev);

bool pcie_relaxed_ordering_enabled(struct pci_dev *dev);

void pci_wakeup_bus(struct pci_bus *bus);

void pci_resume_bus(struct pci_bus *bus);

void pci_bus_set_current_state(struct pci_bus *bus, pci_power_t state);



/* For use by arch with custom probe code */

CRA Git | Maintained and supported by SUSTech CRA and CCSE