Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6ccb127b authored by Lukas Wunner's avatar Lukas Wunner Committed by Bjorn Helgaas
Browse files

PCI: portdrv: Deduplicate PM callback iterator 



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: default avatarLukas Wunner <lukas@wunner.de>
Signed-off-by: default avatarBjorn Helgaas <bhelgaas@google.com>
parent 5b3f7b7d

drivers/pci/pcie/portdrv_core.c

+12 −18
Original line number Diff line number Diff line
@@ -353,14 +353,19 @@ int pcie_port_device_register(struct pci_dev *dev) 
}



#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;

	size_t offset = *(size_t *)data;

	pcie_pm_callback_t cb;



	if ((dev->bus == &pcie_port_bus_type) && dev->driver) {

		service_driver = to_service_driver(dev->driver);

		if (service_driver->suspend)

			service_driver->suspend(to_pcie_device(dev));

		cb = *(pcie_pm_callback_t *)((void *)service_driver + offset);

		if (cb)

			return cb(to_pcie_device(dev));

	}

	return 0;

}
@@ -371,20 +376,8 @@ static int suspend_iter(struct device *dev, void *data) 
 */

int pcie_port_device_suspend(struct device *dev)

{

	return device_for_each_child(dev, NULL, suspend_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;

	size_t off = offsetof(struct pcie_port_service_driver, suspend);

	return device_for_each_child(dev, &off, pm_iter);

}



/**
@@ -393,7 +386,8 @@ static int resume_iter(struct device *dev, void *data) 
 */

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 */