Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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.de
Signed-off-by: Lukas Wunner <lukas@wunner.de>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>

authored by

Lukas Wunner and committed by
Bjorn Helgaas
3134689f e4e737bb

+11 -10
+1
drivers/pci/pcie/portdrv.h
··· 110 110 111 111 extern struct bus_type pcie_port_bus_type; 112 112 int pcie_port_device_register(struct pci_dev *dev); 113 + int pcie_port_device_iter(struct device *dev, void *data); 113 114 #ifdef CONFIG_PM 114 115 int pcie_port_device_suspend(struct device *dev); 115 116 int pcie_port_device_resume_noirq(struct device *dev);
+10 -10
drivers/pci/pcie/portdrv_core.c
··· 367 367 return status; 368 368 } 369 369 370 - #ifdef CONFIG_PM 371 - typedef int (*pcie_pm_callback_t)(struct pcie_device *); 370 + typedef int (*pcie_callback_t)(struct pcie_device *); 372 371 373 - static int pm_iter(struct device *dev, void *data) 372 + int pcie_port_device_iter(struct device *dev, void *data) 374 373 { 375 374 struct pcie_port_service_driver *service_driver; 376 375 size_t offset = *(size_t *)data; 377 - pcie_pm_callback_t cb; 376 + pcie_callback_t cb; 378 377 379 378 if ((dev->bus == &pcie_port_bus_type) && dev->driver) { 380 379 service_driver = to_service_driver(dev->driver); 381 - cb = *(pcie_pm_callback_t *)((void *)service_driver + offset); 380 + cb = *(pcie_callback_t *)((void *)service_driver + offset); 382 381 if (cb) 383 382 return cb(to_pcie_device(dev)); 384 383 } 385 384 return 0; 386 385 } 387 386 387 + #ifdef CONFIG_PM 388 388 /** 389 389 * pcie_port_device_suspend - suspend port services associated with a PCIe port 390 390 * @dev: PCI Express port to handle ··· 392 392 int pcie_port_device_suspend(struct device *dev) 393 393 { 394 394 size_t off = offsetof(struct pcie_port_service_driver, suspend); 395 - return device_for_each_child(dev, &off, pm_iter); 395 + return device_for_each_child(dev, &off, pcie_port_device_iter); 396 396 } 397 397 398 398 int pcie_port_device_resume_noirq(struct device *dev) 399 399 { 400 400 size_t off = offsetof(struct pcie_port_service_driver, resume_noirq); 401 - return device_for_each_child(dev, &off, pm_iter); 401 + return device_for_each_child(dev, &off, pcie_port_device_iter); 402 402 } 403 403 404 404 /** ··· 408 408 int pcie_port_device_resume(struct device *dev) 409 409 { 410 410 size_t off = offsetof(struct pcie_port_service_driver, resume); 411 - return device_for_each_child(dev, &off, pm_iter); 411 + return device_for_each_child(dev, &off, pcie_port_device_iter); 412 412 } 413 413 414 414 /** ··· 418 418 int pcie_port_device_runtime_suspend(struct device *dev) 419 419 { 420 420 size_t off = offsetof(struct pcie_port_service_driver, runtime_suspend); 421 - return device_for_each_child(dev, &off, pm_iter); 421 + return device_for_each_child(dev, &off, pcie_port_device_iter); 422 422 } 423 423 424 424 /** ··· 428 428 int pcie_port_device_runtime_resume(struct device *dev) 429 429 { 430 430 size_t off = offsetof(struct pcie_port_service_driver, runtime_resume); 431 - return device_for_each_child(dev, &off, pm_iter); 431 + return device_for_each_child(dev, &off, pcie_port_device_iter); 432 432 } 433 433 #endif /* PM */ 434 434