kpriv/linux-hardened
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

PCI: portdrv: Deduplicate PM callback iterator

Browse source 
Replace suspend_iter() and resume_iter() with a single function pm_iter()
to allow addition of port service callbacks for further power management
phases without having to add another iterator each time.

No functional change intended.

Signed-off-by: Lukas Wunner <lukas@wunner.de>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
This commit is contained in:
Lukas Wunner 2018-07-19 17:27:52 -05:00 committed by Bjorn Helgaas
parent 5b3f7b7d06
commit 6ccb127ba6
1 changed files with 12 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
drivers/pci/pcie/portdrv_core.c
View file

@ -353,14 +353,19 @@ error_disable:
} }
#ifdef CONFIG_PM #ifdef CONFIG_PM
static int suspend_iter(struct device *dev, void *data) typedef int (*pcie_pm_callback_t)(struct pcie_device *);
static int pm_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;
pcie_pm_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);
if (service_driver->suspend) cb = *(pcie_pm_callback_t *)((void *)service_driver + offset);
service_driver->suspend(to_pcie_device(dev)); if (cb)
return cb(to_pcie_device(dev));
} }
return 0; return 0;
} }
@ -371,20 +376,8 @@ static int suspend_iter(struct device *dev, void *data)
*/ */
int pcie_port_device_suspend(struct device *dev) int pcie_port_device_suspend(struct device *dev)
{ {
return device_for_each_child(dev, NULL, suspend_iter); size_t off = offsetof(struct pcie_port_service_driver, suspend);
} return device_for_each_child(dev, &off, pm_iter);
static int resume_iter(struct device *dev, void *data)
{
struct pcie_port_service_driver *service_driver;
if ((dev->bus == &pcie_port_bus_type) &&
(dev->driver)) {
service_driver = to_service_driver(dev->driver);
if (service_driver->resume)
service_driver->resume(to_pcie_device(dev));
}
return 0;
} }
/** /**
@ -393,7 +386,8 @@ static int resume_iter(struct device *dev, void *data)
*/ */
int pcie_port_device_resume(struct device *dev) int pcie_port_device_resume(struct device *dev)
{ {
return device_for_each_child(dev, NULL, resume_iter); size_t off = offsetof(struct pcie_port_service_driver, resume);
return device_for_each_child(dev, &off, pm_iter);
} }
#endif /* PM */ #endif /* PM */