tmakin/ack-tegra
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

UPSTREAM: PCI/pwrctl: Remove pwrctl device without iterating over all children of pwrctl parent

Browse Source 
There is no need to iterate over all children of the pwrctl device parent
to remove the pwrctl device. Since the pwrctl device associated with the
PCI device can be found using of_find_device_by_node() API, use it directly
instead.

Any pwrctl devices lying around without getting associated with the PCI
devices will be removed once their parent device gets removed.

Link: https://lore.kernel.org/r/20241025-pci-pwrctl-rework-v2-5-568756156cbe@linaro.org
Tested-by: Bartosz Golaszewski <bartosz.golaszewski@linaro.org>
Tested-by: Krishna chaitanya chundru <quic_krichai@quicinc.com>
Signed-off-by: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
[bhelgaas: commit log]
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Signed-off-by: Krzysztof Wilczyński <kwilczynski@kernel.org>
Reviewed-by: Bartosz Golaszewski <bartosz.golaszewski@linaro.org>
(cherry picked from commit 681725afb6b91dfa581f4eba5f256ac5e953b463)

Bug: 380139395

Change-Id: I5f5eddfa6fe06f6fb4c3e1d353e318230b16a8ea
Signed-off-by: Brian Norris <briannorris@google.com>
This commit is contained in:
Manivannan Sadhasivam
2024-10-25 13:24:55 +05:30
committed by Treehugger Robot
parent 62898d4fee
commit ed72660c5c
1 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
drivers/pci/remove.c
+8 -9
View File
@@ -17,16 +17,16 @@ static void pci_free_resources(struct pci_dev *dev)
}
}
static int pci_pwrctl_unregister(struct device *dev, void *data)
static void pci_pwrctl_unregister(struct device *dev)
{
struct device_node *pci_node = data, *plat_node = dev_of_node(dev);
struct platform_device *pdev;
if (dev_is_platform(dev) && plat_node && plat_node == pci_node) {
of_device_unregister(to_platform_device(dev));
of_node_clear_flag(plat_node, OF_POPULATED);
}
pdev = of_find_device_by_node(dev_of_node(dev));
if (!pdev)
return;
return 0;
of_device_unregister(pdev);
of_node_clear_flag(dev_of_node(dev), OF_POPULATED);
}
static void pci_stop_dev(struct pci_dev *dev)
@@ -34,8 +34,7 @@ static void pci_stop_dev(struct pci_dev *dev)
pci_pme_active(dev, false);
if (pci_dev_is_added(dev)) {
device_for_each_child(dev->dev.parent, dev_of_node(&dev->dev),
pci_pwrctl_unregister);
pci_pwrctl_unregister(&dev->dev);
device_release_driver(&dev->dev);
pci_proc_detach_device(dev);
pci_remove_sysfs_dev_files(dev);