Merge branch 'pci/controller/sg2042'

bjorn-helgaas · bjorn-helgaas · commit af257c730f04 · 2025-12-03T14:18:43.000-06:00
- Fix sg2042_pcie_remove() reference count issue (Christophe JAILLET)

* pci/controller/sg2042:
  PCI: sg2042: Fix a reference count issue in sg2042_pcie_remove()
diff --git a/drivers/pci/controller/cadence/pcie-sg2042.c b/drivers/pci/controller/cadence/pcie-sg2042.c
@@ -74,15 +74,12 @@ static int sg2042_pcie_probe(struct platform_device *pdev)
 static void sg2042_pcie_remove(struct platform_device *pdev)
 {
 	struct cdns_pcie *pcie = platform_get_drvdata(pdev);
-	struct device *dev = &pdev->dev;
 	struct cdns_pcie_rc *rc;
 
 	rc = container_of(pcie, struct cdns_pcie_rc, pcie);
 	cdns_pcie_host_disable(rc);
 
 	cdns_pcie_disable_phy(pcie);
-
-	pm_runtime_disable(dev);
 }
 
 static int sg2042_pcie_suspend_noirq(struct device *dev)

Original file line number	Diff line number	Diff line change
`@@ -74,15 +74,12 @@ static int sg2042_pcie_probe(struct platform_device *pdev)`
`74`	`74`	`static void sg2042_pcie_remove(struct platform_device *pdev)`
`75`	`75`	`{`
`76`	`76`	`struct cdns_pcie *pcie = platform_get_drvdata(pdev);`
`77`		`- struct device *dev = &pdev->dev;`
`78`	`77`	`struct cdns_pcie_rc *rc;`
`79`	`78`
`80`	`79`	`rc = container_of(pcie, struct cdns_pcie_rc, pcie);`
`81`	`80`	`cdns_pcie_host_disable(rc);`
`82`	`81`
`83`	`82`	`cdns_pcie_disable_phy(pcie);`
`84`		`-`
`85`		`- pm_runtime_disable(dev);`
`86`	`83`	`}`
`87`	`84`
`88`	`85`	`static int sg2042_pcie_suspend_noirq(struct device *dev)`