Commit 3134689f authored by Lukas Wunner's avatar Lukas Wunner Committed by Bjorn Helgaas

PCI/portdrv: Rename pm_iter() to pcie_port_device_iter()

Rename pm_iter() to pcie_port_device_iter() and make it visible outside
CONFIG_PM and portdrv_core.c so it can be used for pciehp slot reset
recovery.

[bhelgaas: split into its own patch]
Link: https://lore.kernel.org/linux-pci/08c046b0-c9f2-3489-eeef-7e7aca435bb9@gmail.com/
Link: https://lore.kernel.org/r/251f4edcc04c14f873ff1c967bc686169cd07d2d.1627638184.git.lukas@wunner.deSigned-off-by: default avatarLukas Wunner <lukas@wunner.de>
Signed-off-by: default avatarBjorn Helgaas <bhelgaas@google.com>
parent e4e737bb
...@@ -110,6 +110,7 @@ void pcie_port_service_unregister(struct pcie_port_service_driver *new); ...@@ -110,6 +110,7 @@ void pcie_port_service_unregister(struct pcie_port_service_driver *new);
extern struct bus_type pcie_port_bus_type; extern struct bus_type pcie_port_bus_type;
int pcie_port_device_register(struct pci_dev *dev); int pcie_port_device_register(struct pci_dev *dev);
int pcie_port_device_iter(struct device *dev, void *data);
#ifdef CONFIG_PM #ifdef CONFIG_PM
int pcie_port_device_suspend(struct device *dev); int pcie_port_device_suspend(struct device *dev);
int pcie_port_device_resume_noirq(struct device *dev); int pcie_port_device_resume_noirq(struct device *dev);
......
...@@ -367,24 +367,24 @@ int pcie_port_device_register(struct pci_dev *dev) ...@@ -367,24 +367,24 @@ int pcie_port_device_register(struct pci_dev *dev)
return status; return status;
} }
#ifdef CONFIG_PM typedef int (*pcie_callback_t)(struct pcie_device *);
typedef int (*pcie_pm_callback_t)(struct pcie_device *);
static int pm_iter(struct device *dev, void *data) int pcie_port_device_iter(struct device *dev, void *data)
{ {
struct pcie_port_service_driver *service_driver; struct pcie_port_service_driver *service_driver;
size_t offset = *(size_t *)data; size_t offset = *(size_t *)data;
pcie_pm_callback_t cb; pcie_callback_t cb;
if ((dev->bus == &pcie_port_bus_type) && dev->driver) { if ((dev->bus == &pcie_port_bus_type) && dev->driver) {
service_driver = to_service_driver(dev->driver); service_driver = to_service_driver(dev->driver);
cb = *(pcie_pm_callback_t *)((void *)service_driver + offset); cb = *(pcie_callback_t *)((void *)service_driver + offset);
if (cb) if (cb)
return cb(to_pcie_device(dev)); return cb(to_pcie_device(dev));
} }
return 0; return 0;
} }
#ifdef CONFIG_PM
/** /**
* pcie_port_device_suspend - suspend port services associated with a PCIe port * pcie_port_device_suspend - suspend port services associated with a PCIe port
* @dev: PCI Express port to handle * @dev: PCI Express port to handle
...@@ -392,13 +392,13 @@ static int pm_iter(struct device *dev, void *data) ...@@ -392,13 +392,13 @@ static int pm_iter(struct device *dev, void *data)
int pcie_port_device_suspend(struct device *dev) int pcie_port_device_suspend(struct device *dev)
{ {
size_t off = offsetof(struct pcie_port_service_driver, suspend); size_t off = offsetof(struct pcie_port_service_driver, suspend);
return device_for_each_child(dev, &off, pm_iter); return device_for_each_child(dev, &off, pcie_port_device_iter);
} }
int pcie_port_device_resume_noirq(struct device *dev) int pcie_port_device_resume_noirq(struct device *dev)
{ {
size_t off = offsetof(struct pcie_port_service_driver, resume_noirq); size_t off = offsetof(struct pcie_port_service_driver, resume_noirq);
return device_for_each_child(dev, &off, pm_iter); return device_for_each_child(dev, &off, pcie_port_device_iter);
} }
/** /**
...@@ -408,7 +408,7 @@ int pcie_port_device_resume_noirq(struct device *dev) ...@@ -408,7 +408,7 @@ int pcie_port_device_resume_noirq(struct device *dev)
int pcie_port_device_resume(struct device *dev) int pcie_port_device_resume(struct device *dev)
{ {
size_t off = offsetof(struct pcie_port_service_driver, resume); size_t off = offsetof(struct pcie_port_service_driver, resume);
return device_for_each_child(dev, &off, pm_iter); return device_for_each_child(dev, &off, pcie_port_device_iter);
} }
/** /**
...@@ -418,7 +418,7 @@ int pcie_port_device_resume(struct device *dev) ...@@ -418,7 +418,7 @@ int pcie_port_device_resume(struct device *dev)
int pcie_port_device_runtime_suspend(struct device *dev) int pcie_port_device_runtime_suspend(struct device *dev)
{ {
size_t off = offsetof(struct pcie_port_service_driver, runtime_suspend); size_t off = offsetof(struct pcie_port_service_driver, runtime_suspend);
return device_for_each_child(dev, &off, pm_iter); return device_for_each_child(dev, &off, pcie_port_device_iter);
} }
/** /**
...@@ -428,7 +428,7 @@ int pcie_port_device_runtime_suspend(struct device *dev) ...@@ -428,7 +428,7 @@ int pcie_port_device_runtime_suspend(struct device *dev)
int pcie_port_device_runtime_resume(struct device *dev) int pcie_port_device_runtime_resume(struct device *dev)
{ {
size_t off = offsetof(struct pcie_port_service_driver, runtime_resume); size_t off = offsetof(struct pcie_port_service_driver, runtime_resume);
return device_for_each_child(dev, &off, pm_iter); return device_for_each_child(dev, &off, pcie_port_device_iter);
} }
#endif /* PM */ #endif /* PM */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment