Merge branch 'pci/ctrl/pm-ops'

bjorn-helgaas · bjorn-helgaas · commit ed89d69a1506 · 2022-08-04T11:46:52.000-05:00
- Convert to new *_PM_OPS macros to avoid need for "#ifdef CONFIG_PM_SLEEP"
  or "__maybe_unused" (Bjorn Helgaas)

* pci/ctrl/pm-ops:
  PCI: Convert to new *_PM_OPS macros
diff --git a/drivers/pci/controller/cadence/pcie-cadence.c b/drivers/pci/controller/cadence/pcie-cadence.c
@@ -243,7 +243,6 @@ int cdns_pcie_init_phy(struct device *dev, struct cdns_pcie *pcie)
 	return ret;
 }
 
-#ifdef CONFIG_PM_SLEEP
 static int cdns_pcie_suspend_noirq(struct device *dev)
 {
 	struct cdns_pcie *pcie = dev_get_drvdata(dev);
@@ -266,9 +265,8 @@ static int cdns_pcie_resume_noirq(struct device *dev)
 
 	return 0;
 }
-#endif
 
 const struct dev_pm_ops cdns_pcie_pm_ops = {
-	SET_NOIRQ_SYSTEM_SLEEP_PM_OPS(cdns_pcie_suspend_noirq,
-				      cdns_pcie_resume_noirq)
+	NOIRQ_SYSTEM_SLEEP_PM_OPS(cdns_pcie_suspend_noirq,
+				  cdns_pcie_resume_noirq)
 };
diff --git a/drivers/pci/controller/dwc/pci-dra7xx.c b/drivers/pci/controller/dwc/pci-dra7xx.c
@@ -862,7 +862,6 @@ static int dra7xx_pcie_probe(struct platform_device *pdev)
 	return ret;
 }
 
-#ifdef CONFIG_PM_SLEEP
 static int dra7xx_pcie_suspend(struct device *dev)
 {
 	struct dra7xx_pcie *dra7xx = dev_get_drvdata(dev);
@@ -919,7 +918,6 @@ static int dra7xx_pcie_resume_noirq(struct device *dev)
 
 	return 0;
 }
-#endif
 
 static void dra7xx_pcie_shutdown(struct platform_device *pdev)
 {
@@ -940,9 +938,9 @@ static void dra7xx_pcie_shutdown(struct platform_device *pdev)
 }
 
 static const struct dev_pm_ops dra7xx_pcie_pm_ops = {
-	SET_SYSTEM_SLEEP_PM_OPS(dra7xx_pcie_suspend, dra7xx_pcie_resume)
-	SET_NOIRQ_SYSTEM_SLEEP_PM_OPS(dra7xx_pcie_suspend_noirq,
-				      dra7xx_pcie_resume_noirq)
+	SYSTEM_SLEEP_PM_OPS(dra7xx_pcie_suspend, dra7xx_pcie_resume)
+	NOIRQ_SYSTEM_SLEEP_PM_OPS(dra7xx_pcie_suspend_noirq,
+				  dra7xx_pcie_resume_noirq)
 };
 
 static struct platform_driver dra7xx_pcie_driver = {
diff --git a/drivers/pci/controller/dwc/pci-exynos.c b/drivers/pci/controller/dwc/pci-exynos.c
@@ -389,7 +389,7 @@ static int __exit exynos_pcie_remove(struct platform_device *pdev)
 	return 0;
 }
 
-static int __maybe_unused exynos_pcie_suspend_noirq(struct device *dev)
+static int exynos_pcie_suspend_noirq(struct device *dev)
 {
 	struct exynos_pcie *ep = dev_get_drvdata(dev);
 
@@ -401,7 +401,7 @@ static int __maybe_unused exynos_pcie_suspend_noirq(struct device *dev)
 	return 0;
 }
 
-static int __maybe_unused exynos_pcie_resume_noirq(struct device *dev)
+static int exynos_pcie_resume_noirq(struct device *dev)
 {
 	struct exynos_pcie *ep = dev_get_drvdata(dev);
 	struct dw_pcie *pci = &ep->pci;
@@ -420,8 +420,8 @@ static int __maybe_unused exynos_pcie_resume_noirq(struct device *dev)
 }
 
 static const struct dev_pm_ops exynos_pcie_pm_ops = {
-	SET_NOIRQ_SYSTEM_SLEEP_PM_OPS(exynos_pcie_suspend_noirq,
-				      exynos_pcie_resume_noirq)
+	NOIRQ_SYSTEM_SLEEP_PM_OPS(exynos_pcie_suspend_noirq,
+				  exynos_pcie_resume_noirq)
 };
 
 static const struct of_device_id exynos_pcie_of_match[] = {
diff --git a/drivers/pci/controller/dwc/pcie-intel-gw.c b/drivers/pci/controller/dwc/pcie-intel-gw.c
@@ -351,7 +351,7 @@ static int intel_pcie_remove(struct platform_device *pdev)
 	return 0;
 }
 
-static int __maybe_unused intel_pcie_suspend_noirq(struct device *dev)
+static int intel_pcie_suspend_noirq(struct device *dev)
 {
 	struct intel_pcie *pcie = dev_get_drvdata(dev);
 	int ret;
@@ -366,7 +366,7 @@ static int __maybe_unused intel_pcie_suspend_noirq(struct device *dev)
 	return ret;
 }
 
-static int __maybe_unused intel_pcie_resume_noirq(struct device *dev)
+static int intel_pcie_resume_noirq(struct device *dev)
 {
 	struct intel_pcie *pcie = dev_get_drvdata(dev);
 
@@ -432,8 +432,8 @@ static int intel_pcie_probe(struct platform_device *pdev)
 }
 
 static const struct dev_pm_ops intel_pcie_pm_ops = {
-	SET_NOIRQ_SYSTEM_SLEEP_PM_OPS(intel_pcie_suspend_noirq,
-				      intel_pcie_resume_noirq)
+	NOIRQ_SYSTEM_SLEEP_PM_OPS(intel_pcie_suspend_noirq,
+				  intel_pcie_resume_noirq)
 };
 
 static const struct of_device_id of_intel_pcie_match[] = {
diff --git a/drivers/pci/controller/pci-mvebu.c b/drivers/pci/controller/pci-mvebu.c
@@ -1216,7 +1216,6 @@ static int mvebu_get_tgt_attr(struct device_node *np, int devfn,
 	return -ENOENT;
 }
 
-#ifdef CONFIG_PM_SLEEP
 static int mvebu_pcie_suspend(struct device *dev)
 {
 	struct mvebu_pcie *pcie;
@@ -1249,7 +1248,6 @@ static int mvebu_pcie_resume(struct device *dev)
 
 	return 0;
 }
-#endif
 
 static void mvebu_pcie_port_clk_put(void *data)
 {
@@ -1737,7 +1735,7 @@ static const struct of_device_id mvebu_pcie_of_match_table[] = {
 };
 
 static const struct dev_pm_ops mvebu_pcie_pm_ops = {
-	SET_NOIRQ_SYSTEM_SLEEP_PM_OPS(mvebu_pcie_suspend, mvebu_pcie_resume)
+	NOIRQ_SYSTEM_SLEEP_PM_OPS(mvebu_pcie_suspend, mvebu_pcie_resume)
 };
 
 static struct platform_driver mvebu_pcie_driver = {
diff --git a/drivers/pci/controller/pci-tegra.c b/drivers/pci/controller/pci-tegra.c
@@ -2707,7 +2707,7 @@ static int tegra_pcie_remove(struct platform_device *pdev)
 	return 0;
 }
 
-static int __maybe_unused tegra_pcie_pm_suspend(struct device *dev)
+static int tegra_pcie_pm_suspend(struct device *dev)
 {
 	struct tegra_pcie *pcie = dev_get_drvdata(dev);
 	struct tegra_pcie_port *port;
@@ -2742,7 +2742,7 @@ static int __maybe_unused tegra_pcie_pm_suspend(struct device *dev)
 	return 0;
 }
 
-static int __maybe_unused tegra_pcie_pm_resume(struct device *dev)
+static int tegra_pcie_pm_resume(struct device *dev)
 {
 	struct tegra_pcie *pcie = dev_get_drvdata(dev);
 	int err;
@@ -2798,9 +2798,8 @@ static int __maybe_unused tegra_pcie_pm_resume(struct device *dev)
 }
 
 static const struct dev_pm_ops tegra_pcie_pm_ops = {
-	SET_RUNTIME_PM_OPS(tegra_pcie_pm_suspend, tegra_pcie_pm_resume, NULL)
-	SET_NOIRQ_SYSTEM_SLEEP_PM_OPS(tegra_pcie_pm_suspend,
-				      tegra_pcie_pm_resume)
+	RUNTIME_PM_OPS(tegra_pcie_pm_suspend, tegra_pcie_pm_resume, NULL)
+	NOIRQ_SYSTEM_SLEEP_PM_OPS(tegra_pcie_pm_suspend, tegra_pcie_pm_resume)
 };
 
 static struct platform_driver tegra_pcie_driver = {
diff --git a/drivers/pci/controller/pcie-mediatek-gen3.c b/drivers/pci/controller/pcie-mediatek-gen3.c
@@ -959,7 +959,7 @@ static int mtk_pcie_remove(struct platform_device *pdev)
 	return 0;
 }
 
-static void __maybe_unused mtk_pcie_irq_save(struct mtk_gen3_pcie *pcie)
+static void mtk_pcie_irq_save(struct mtk_gen3_pcie *pcie)
 {
 	int i;
 
@@ -977,7 +977,7 @@ static void __maybe_unused mtk_pcie_irq_save(struct mtk_gen3_pcie *pcie)
 	raw_spin_unlock(&pcie->irq_lock);
 }
 
-static void __maybe_unused mtk_pcie_irq_restore(struct mtk_gen3_pcie *pcie)
+static void mtk_pcie_irq_restore(struct mtk_gen3_pcie *pcie)
 {
 	int i;
 
@@ -995,7 +995,7 @@ static void __maybe_unused mtk_pcie_irq_restore(struct mtk_gen3_pcie *pcie)
 	raw_spin_unlock(&pcie->irq_lock);
 }
 
-static int __maybe_unused mtk_pcie_turn_off_link(struct mtk_gen3_pcie *pcie)
+static int mtk_pcie_turn_off_link(struct mtk_gen3_pcie *pcie)
 {
 	u32 val;
 
@@ -1010,7 +1010,7 @@ static int __maybe_unused mtk_pcie_turn_off_link(struct mtk_gen3_pcie *pcie)
 				   50 * USEC_PER_MSEC);
 }
 
-static int __maybe_unused mtk_pcie_suspend_noirq(struct device *dev)
+static int mtk_pcie_suspend_noirq(struct device *dev)
 {
 	struct mtk_gen3_pcie *pcie = dev_get_drvdata(dev);
 	int err;
@@ -1036,7 +1036,7 @@ static int __maybe_unused mtk_pcie_suspend_noirq(struct device *dev)
 	return 0;
 }
 
-static int __maybe_unused mtk_pcie_resume_noirq(struct device *dev)
+static int mtk_pcie_resume_noirq(struct device *dev)
 {
 	struct mtk_gen3_pcie *pcie = dev_get_drvdata(dev);
 	int err;
@@ -1057,8 +1057,8 @@ static int __maybe_unused mtk_pcie_resume_noirq(struct device *dev)
 }
 
 static const struct dev_pm_ops mtk_pcie_pm_ops = {
-	SET_NOIRQ_SYSTEM_SLEEP_PM_OPS(mtk_pcie_suspend_noirq,
-				      mtk_pcie_resume_noirq)
+	NOIRQ_SYSTEM_SLEEP_PM_OPS(mtk_pcie_suspend_noirq,
+				  mtk_pcie_resume_noirq)
 };
 
 static const struct of_device_id mtk_pcie_of_match[] = {
diff --git a/drivers/pci/controller/pcie-mediatek.c b/drivers/pci/controller/pcie-mediatek.c
@@ -1150,7 +1150,7 @@ static int mtk_pcie_remove(struct platform_device *pdev)
 	return 0;
 }
 
-static int __maybe_unused mtk_pcie_suspend_noirq(struct device *dev)
+static int mtk_pcie_suspend_noirq(struct device *dev)
 {
 	struct mtk_pcie *pcie = dev_get_drvdata(dev);
 	struct mtk_pcie_port *port;
@@ -1174,7 +1174,7 @@ static int __maybe_unused mtk_pcie_suspend_noirq(struct device *dev)
 	return 0;
 }
 
-static int __maybe_unused mtk_pcie_resume_noirq(struct device *dev)
+static int mtk_pcie_resume_noirq(struct device *dev)
 {
 	struct mtk_pcie *pcie = dev_get_drvdata(dev);
 	struct mtk_pcie_port *port, *tmp;
@@ -1195,8 +1195,8 @@ static int __maybe_unused mtk_pcie_resume_noirq(struct device *dev)
 }
 
 static const struct dev_pm_ops mtk_pcie_pm_ops = {
-	SET_NOIRQ_SYSTEM_SLEEP_PM_OPS(mtk_pcie_suspend_noirq,
-				      mtk_pcie_resume_noirq)
+	NOIRQ_SYSTEM_SLEEP_PM_OPS(mtk_pcie_suspend_noirq,
+				  mtk_pcie_resume_noirq)
 };
 
 static const struct mtk_pcie_soc mtk_pcie_soc_v1 = {
diff --git a/drivers/pci/controller/pcie-rcar-host.c b/drivers/pci/controller/pcie-rcar-host.c
@@ -1072,7 +1072,7 @@ static int rcar_pcie_probe(struct platform_device *pdev)
 	return err;
 }
 
-static int __maybe_unused rcar_pcie_resume(struct device *dev)
+static int rcar_pcie_resume(struct device *dev)
 {
 	struct rcar_pcie_host *host = dev_get_drvdata(dev);
 	struct rcar_pcie *pcie = &host->pcie;
@@ -1127,7 +1127,7 @@ static int rcar_pcie_resume_noirq(struct device *dev)
 }
 
 static const struct dev_pm_ops rcar_pcie_pm_ops = {
-	SET_SYSTEM_SLEEP_PM_OPS(NULL, rcar_pcie_resume)
+	SYSTEM_SLEEP_PM_OPS(NULL, rcar_pcie_resume)
 	.resume_noirq = rcar_pcie_resume_noirq,
 };
 
diff --git a/drivers/pci/controller/pcie-rockchip-host.c b/drivers/pci/controller/pcie-rockchip-host.c
@@ -864,7 +864,7 @@ static int rockchip_pcie_wait_l2(struct rockchip_pcie *rockchip)
 	return 0;
 }
 
-static int __maybe_unused rockchip_pcie_suspend_noirq(struct device *dev)
+static int rockchip_pcie_suspend_noirq(struct device *dev)
 {
 	struct rockchip_pcie *rockchip = dev_get_drvdata(dev);
 	int ret;
@@ -889,7 +889,7 @@ static int __maybe_unused rockchip_pcie_suspend_noirq(struct device *dev)
 	return ret;
 }
 
-static int __maybe_unused rockchip_pcie_resume_noirq(struct device *dev)
+static int rockchip_pcie_resume_noirq(struct device *dev)
 {
 	struct rockchip_pcie *rockchip = dev_get_drvdata(dev);
 	int err;
@@ -1035,8 +1035,8 @@ static int rockchip_pcie_remove(struct platform_device *pdev)
 }
 
 static const struct dev_pm_ops rockchip_pcie_pm_ops = {
-	SET_NOIRQ_SYSTEM_SLEEP_PM_OPS(rockchip_pcie_suspend_noirq,
-				      rockchip_pcie_resume_noirq)
+	NOIRQ_SYSTEM_SLEEP_PM_OPS(rockchip_pcie_suspend_noirq,
+				  rockchip_pcie_resume_noirq)
 };
 
 static const struct of_device_id rockchip_pcie_of_match[] = {

Original file line number	Diff line number	Diff line change
`@@ -243,7 +243,6 @@ int cdns_pcie_init_phy(struct device dev, struct cdns_pcie pcie)`
`243`	`243`	`return ret;`
`244`	`244`	`}`
`245`	`245`
`246`		`-#ifdef CONFIG_PM_SLEEP`
`247`	`246`	`static int cdns_pcie_suspend_noirq(struct device *dev)`
`248`	`247`	`{`
`249`	`248`	`struct cdns_pcie *pcie = dev_get_drvdata(dev);`
`@@ -266,9 +265,8 @@ static int cdns_pcie_resume_noirq(struct device *dev)`
`266`	`265`
`267`	`266`	`return 0;`
`268`	`267`	`}`
`269`		`-#endif`
`270`	`268`
`271`	`269`	`const struct dev_pm_ops cdns_pcie_pm_ops = {`
`272`		`- SET_NOIRQ_SYSTEM_SLEEP_PM_OPS(cdns_pcie_suspend_noirq,`
`273`		`- cdns_pcie_resume_noirq)`
	`270`	`+ NOIRQ_SYSTEM_SLEEP_PM_OPS(cdns_pcie_suspend_noirq,`
	`271`	`+ cdns_pcie_resume_noirq)`
`274`	`272`	`};`
Original file line number	Diff line number	Diff line change
`@@ -862,7 +862,6 @@ static int dra7xx_pcie_probe(struct platform_device *pdev)`
`862`	`862`	`return ret;`
`863`	`863`	`}`
`864`	`864`
`865`		`-#ifdef CONFIG_PM_SLEEP`
`866`	`865`	`static int dra7xx_pcie_suspend(struct device *dev)`
`867`	`866`	`{`
`868`	`867`	`struct dra7xx_pcie *dra7xx = dev_get_drvdata(dev);`
`@@ -919,7 +918,6 @@ static int dra7xx_pcie_resume_noirq(struct device *dev)`
`919`	`918`
`920`	`919`	`return 0;`
`921`	`920`	`}`
`922`		`-#endif`
`923`	`921`
`924`	`922`	`static void dra7xx_pcie_shutdown(struct platform_device *pdev)`
`925`	`923`	`{`
`@@ -940,9 +938,9 @@ static void dra7xx_pcie_shutdown(struct platform_device *pdev)`
`940`	`938`	`}`
`941`	`939`
`942`	`940`	`static const struct dev_pm_ops dra7xx_pcie_pm_ops = {`
`943`		`- SET_SYSTEM_SLEEP_PM_OPS(dra7xx_pcie_suspend, dra7xx_pcie_resume)`
`944`		`- SET_NOIRQ_SYSTEM_SLEEP_PM_OPS(dra7xx_pcie_suspend_noirq,`
`945`		`- dra7xx_pcie_resume_noirq)`
	`941`	`+ SYSTEM_SLEEP_PM_OPS(dra7xx_pcie_suspend, dra7xx_pcie_resume)`
	`942`	`+ NOIRQ_SYSTEM_SLEEP_PM_OPS(dra7xx_pcie_suspend_noirq,`
	`943`	`+ dra7xx_pcie_resume_noirq)`
`946`	`944`	`};`
`947`	`945`
`948`	`946`	`static struct platform_driver dra7xx_pcie_driver = {`
Original file line number	Diff line number	Diff line change
`@@ -389,7 +389,7 @@ static int __exit exynos_pcie_remove(struct platform_device *pdev)`
`389`	`389`	`return 0;`
`390`	`390`	`}`
`391`	`391`
`392`		`-static int __maybe_unused exynos_pcie_suspend_noirq(struct device *dev)`
	`392`	`+static int exynos_pcie_suspend_noirq(struct device *dev)`
`393`	`393`	`{`
`394`	`394`	`struct exynos_pcie *ep = dev_get_drvdata(dev);`
`395`	`395`
`@@ -401,7 +401,7 @@ static int __maybe_unused exynos_pcie_suspend_noirq(struct device *dev)`
`401`	`401`	`return 0;`
`402`	`402`	`}`
`403`	`403`
`404`		`-static int __maybe_unused exynos_pcie_resume_noirq(struct device *dev)`
	`404`	`+static int exynos_pcie_resume_noirq(struct device *dev)`
`405`	`405`	`{`
`406`	`406`	`struct exynos_pcie *ep = dev_get_drvdata(dev);`
`407`	`407`	`struct dw_pcie *pci = &ep->pci;`
`@@ -420,8 +420,8 @@ static int __maybe_unused exynos_pcie_resume_noirq(struct device *dev)`
`420`	`420`	`}`
`421`	`421`
`422`	`422`	`static const struct dev_pm_ops exynos_pcie_pm_ops = {`
`423`		`- SET_NOIRQ_SYSTEM_SLEEP_PM_OPS(exynos_pcie_suspend_noirq,`
`424`		`- exynos_pcie_resume_noirq)`
	`423`	`+ NOIRQ_SYSTEM_SLEEP_PM_OPS(exynos_pcie_suspend_noirq,`
	`424`	`+ exynos_pcie_resume_noirq)`
`425`	`425`	`};`
`426`	`426`
`427`	`427`	`static const struct of_device_id exynos_pcie_of_match[] = {`
Original file line number	Diff line number	Diff line change
`@@ -351,7 +351,7 @@ static int intel_pcie_remove(struct platform_device *pdev)`
`351`	`351`	`return 0;`
`352`	`352`	`}`
`353`	`353`
`354`		`-static int __maybe_unused intel_pcie_suspend_noirq(struct device *dev)`
	`354`	`+static int intel_pcie_suspend_noirq(struct device *dev)`
`355`	`355`	`{`
`356`	`356`	`struct intel_pcie *pcie = dev_get_drvdata(dev);`
`357`	`357`	`int ret;`
`@@ -366,7 +366,7 @@ static int __maybe_unused intel_pcie_suspend_noirq(struct device *dev)`
`366`	`366`	`return ret;`
`367`	`367`	`}`
`368`	`368`
`369`		`-static int __maybe_unused intel_pcie_resume_noirq(struct device *dev)`
	`369`	`+static int intel_pcie_resume_noirq(struct device *dev)`
`370`	`370`	`{`
`371`	`371`	`struct intel_pcie *pcie = dev_get_drvdata(dev);`
`372`	`372`
`@@ -432,8 +432,8 @@ static int intel_pcie_probe(struct platform_device *pdev)`
`432`	`432`	`}`
`433`	`433`
`434`	`434`	`static const struct dev_pm_ops intel_pcie_pm_ops = {`
`435`		`- SET_NOIRQ_SYSTEM_SLEEP_PM_OPS(intel_pcie_suspend_noirq,`
`436`		`- intel_pcie_resume_noirq)`
	`435`	`+ NOIRQ_SYSTEM_SLEEP_PM_OPS(intel_pcie_suspend_noirq,`
	`436`	`+ intel_pcie_resume_noirq)`
`437`	`437`	`};`
`438`	`438`
`439`	`439`	`static const struct of_device_id of_intel_pcie_match[] = {`
Original file line number	Diff line number	Diff line change
`@@ -1216,7 +1216,6 @@ static int mvebu_get_tgt_attr(struct device_node *np, int devfn,`
`1216`	`1216`	`return -ENOENT;`
`1217`	`1217`	`}`
`1218`	`1218`
`1219`		`-#ifdef CONFIG_PM_SLEEP`
`1220`	`1219`	`static int mvebu_pcie_suspend(struct device *dev)`
`1221`	`1220`	`{`
`1222`	`1221`	`struct mvebu_pcie *pcie;`
`@@ -1249,7 +1248,6 @@ static int mvebu_pcie_resume(struct device *dev)`
`1249`	`1248`
`1250`	`1249`	`return 0;`
`1251`	`1250`	`}`
`1252`		`-#endif`
`1253`	`1251`
`1254`	`1252`	`static void mvebu_pcie_port_clk_put(void *data)`
`1255`	`1253`	`{`
`@@ -1737,7 +1735,7 @@ static const struct of_device_id mvebu_pcie_of_match_table[] = {`
`1737`	`1735`	`};`
`1738`	`1736`
`1739`	`1737`	`static const struct dev_pm_ops mvebu_pcie_pm_ops = {`
`1740`		`- SET_NOIRQ_SYSTEM_SLEEP_PM_OPS(mvebu_pcie_suspend, mvebu_pcie_resume)`
	`1738`	`+ NOIRQ_SYSTEM_SLEEP_PM_OPS(mvebu_pcie_suspend, mvebu_pcie_resume)`
`1741`	`1739`	`};`
`1742`	`1740`
`1743`	`1741`	`static struct platform_driver mvebu_pcie_driver = {`
Original file line number	Diff line number	Diff line change
`@@ -2707,7 +2707,7 @@ static int tegra_pcie_remove(struct platform_device *pdev)`
`2707`	`2707`	`return 0;`
`2708`	`2708`	`}`
`2709`	`2709`
`2710`		`-static int __maybe_unused tegra_pcie_pm_suspend(struct device *dev)`
	`2710`	`+static int tegra_pcie_pm_suspend(struct device *dev)`
`2711`	`2711`	`{`
`2712`	`2712`	`struct tegra_pcie *pcie = dev_get_drvdata(dev);`
`2713`	`2713`	`struct tegra_pcie_port *port;`
`@@ -2742,7 +2742,7 @@ static int __maybe_unused tegra_pcie_pm_suspend(struct device *dev)`
`2742`	`2742`	`return 0;`
`2743`	`2743`	`}`
`2744`	`2744`
`2745`		`-static int __maybe_unused tegra_pcie_pm_resume(struct device *dev)`
	`2745`	`+static int tegra_pcie_pm_resume(struct device *dev)`
`2746`	`2746`	`{`
`2747`	`2747`	`struct tegra_pcie *pcie = dev_get_drvdata(dev);`
`2748`	`2748`	`int err;`
`@@ -2798,9 +2798,8 @@ static int __maybe_unused tegra_pcie_pm_resume(struct device *dev)`
`2798`	`2798`	`}`
`2799`	`2799`
`2800`	`2800`	`static const struct dev_pm_ops tegra_pcie_pm_ops = {`
`2801`		`- SET_RUNTIME_PM_OPS(tegra_pcie_pm_suspend, tegra_pcie_pm_resume, NULL)`
`2802`		`- SET_NOIRQ_SYSTEM_SLEEP_PM_OPS(tegra_pcie_pm_suspend,`
`2803`		`- tegra_pcie_pm_resume)`
	`2801`	`+ RUNTIME_PM_OPS(tegra_pcie_pm_suspend, tegra_pcie_pm_resume, NULL)`
	`2802`	`+ NOIRQ_SYSTEM_SLEEP_PM_OPS(tegra_pcie_pm_suspend, tegra_pcie_pm_resume)`
`2804`	`2803`	`};`
`2805`	`2804`
`2806`	`2805`	`static struct platform_driver tegra_pcie_driver = {`
Original file line number	Diff line number	Diff line change
`@@ -959,7 +959,7 @@ static int mtk_pcie_remove(struct platform_device *pdev)`
`959`	`959`	`return 0;`
`960`	`960`	`}`
`961`	`961`
`962`		`-static void __maybe_unused mtk_pcie_irq_save(struct mtk_gen3_pcie *pcie)`
	`962`	`+static void mtk_pcie_irq_save(struct mtk_gen3_pcie *pcie)`
`963`	`963`	`{`
`964`	`964`	`int i;`
`965`	`965`
`@@ -977,7 +977,7 @@ static void __maybe_unused mtk_pcie_irq_save(struct mtk_gen3_pcie *pcie)`
`977`	`977`	`raw_spin_unlock(&pcie->irq_lock);`
`978`	`978`	`}`
`979`	`979`
`980`		`-static void __maybe_unused mtk_pcie_irq_restore(struct mtk_gen3_pcie *pcie)`
	`980`	`+static void mtk_pcie_irq_restore(struct mtk_gen3_pcie *pcie)`
`981`	`981`	`{`
`982`	`982`	`int i;`
`983`	`983`
`@@ -995,7 +995,7 @@ static void __maybe_unused mtk_pcie_irq_restore(struct mtk_gen3_pcie *pcie)`
`995`	`995`	`raw_spin_unlock(&pcie->irq_lock);`
`996`	`996`	`}`
`997`	`997`
`998`		`-static int __maybe_unused mtk_pcie_turn_off_link(struct mtk_gen3_pcie *pcie)`
	`998`	`+static int mtk_pcie_turn_off_link(struct mtk_gen3_pcie *pcie)`
`999`	`999`	`{`
`1000`	`1000`	`u32 val;`
`1001`	`1001`
`@@ -1010,7 +1010,7 @@ static int __maybe_unused mtk_pcie_turn_off_link(struct mtk_gen3_pcie *pcie)`
`1010`	`1010`	`50 * USEC_PER_MSEC);`
`1011`	`1011`	`}`
`1012`	`1012`
`1013`		`-static int __maybe_unused mtk_pcie_suspend_noirq(struct device *dev)`
	`1013`	`+static int mtk_pcie_suspend_noirq(struct device *dev)`
`1014`	`1014`	`{`
`1015`	`1015`	`struct mtk_gen3_pcie *pcie = dev_get_drvdata(dev);`
`1016`	`1016`	`int err;`
`@@ -1036,7 +1036,7 @@ static int __maybe_unused mtk_pcie_suspend_noirq(struct device *dev)`
`1036`	`1036`	`return 0;`
`1037`	`1037`	`}`
`1038`	`1038`
`1039`		`-static int __maybe_unused mtk_pcie_resume_noirq(struct device *dev)`
	`1039`	`+static int mtk_pcie_resume_noirq(struct device *dev)`
`1040`	`1040`	`{`
`1041`	`1041`	`struct mtk_gen3_pcie *pcie = dev_get_drvdata(dev);`
`1042`	`1042`	`int err;`
`@@ -1057,8 +1057,8 @@ static int __maybe_unused mtk_pcie_resume_noirq(struct device *dev)`
`1057`	`1057`	`}`
`1058`	`1058`
`1059`	`1059`	`static const struct dev_pm_ops mtk_pcie_pm_ops = {`
`1060`		`- SET_NOIRQ_SYSTEM_SLEEP_PM_OPS(mtk_pcie_suspend_noirq,`
`1061`		`- mtk_pcie_resume_noirq)`
	`1060`	`+ NOIRQ_SYSTEM_SLEEP_PM_OPS(mtk_pcie_suspend_noirq,`
	`1061`	`+ mtk_pcie_resume_noirq)`
`1062`	`1062`	`};`
`1063`	`1063`
`1064`	`1064`	`static const struct of_device_id mtk_pcie_of_match[] = {`
Original file line number	Diff line number	Diff line change
`@@ -1150,7 +1150,7 @@ static int mtk_pcie_remove(struct platform_device *pdev)`
`1150`	`1150`	`return 0;`
`1151`	`1151`	`}`
`1152`	`1152`
`1153`		`-static int __maybe_unused mtk_pcie_suspend_noirq(struct device *dev)`
	`1153`	`+static int mtk_pcie_suspend_noirq(struct device *dev)`
`1154`	`1154`	`{`
`1155`	`1155`	`struct mtk_pcie *pcie = dev_get_drvdata(dev);`
`1156`	`1156`	`struct mtk_pcie_port *port;`
`@@ -1174,7 +1174,7 @@ static int __maybe_unused mtk_pcie_suspend_noirq(struct device *dev)`
`1174`	`1174`	`return 0;`
`1175`	`1175`	`}`
`1176`	`1176`
`1177`		`-static int __maybe_unused mtk_pcie_resume_noirq(struct device *dev)`
	`1177`	`+static int mtk_pcie_resume_noirq(struct device *dev)`
`1178`	`1178`	`{`
`1179`	`1179`	`struct mtk_pcie *pcie = dev_get_drvdata(dev);`
`1180`	`1180`	`struct mtk_pcie_port port, tmp;`
`@@ -1195,8 +1195,8 @@ static int __maybe_unused mtk_pcie_resume_noirq(struct device *dev)`
`1195`	`1195`	`}`
`1196`	`1196`
`1197`	`1197`	`static const struct dev_pm_ops mtk_pcie_pm_ops = {`
`1198`		`- SET_NOIRQ_SYSTEM_SLEEP_PM_OPS(mtk_pcie_suspend_noirq,`
`1199`		`- mtk_pcie_resume_noirq)`
	`1198`	`+ NOIRQ_SYSTEM_SLEEP_PM_OPS(mtk_pcie_suspend_noirq,`
	`1199`	`+ mtk_pcie_resume_noirq)`
`1200`	`1200`	`};`
`1201`	`1201`
`1202`	`1202`	`static const struct mtk_pcie_soc mtk_pcie_soc_v1 = {`
Original file line number	Diff line number	Diff line change
`@@ -1072,7 +1072,7 @@ static int rcar_pcie_probe(struct platform_device *pdev)`
`1072`	`1072`	`return err;`
`1073`	`1073`	`}`
`1074`	`1074`
`1075`		`-static int __maybe_unused rcar_pcie_resume(struct device *dev)`
	`1075`	`+static int rcar_pcie_resume(struct device *dev)`
`1076`	`1076`	`{`
`1077`	`1077`	`struct rcar_pcie_host *host = dev_get_drvdata(dev);`
`1078`	`1078`	`struct rcar_pcie *pcie = &host->pcie;`
`@@ -1127,7 +1127,7 @@ static int rcar_pcie_resume_noirq(struct device *dev)`
`1127`	`1127`	`}`
`1128`	`1128`
`1129`	`1129`	`static const struct dev_pm_ops rcar_pcie_pm_ops = {`
`1130`		`- SET_SYSTEM_SLEEP_PM_OPS(NULL, rcar_pcie_resume)`
	`1130`	`+ SYSTEM_SLEEP_PM_OPS(NULL, rcar_pcie_resume)`
`1131`	`1131`	`.resume_noirq = rcar_pcie_resume_noirq,`
`1132`	`1132`	`};`
`1133`	`1133`
Original file line number	Diff line number	Diff line change
`@@ -864,7 +864,7 @@ static int rockchip_pcie_wait_l2(struct rockchip_pcie *rockchip)`
`864`	`864`	`return 0;`
`865`	`865`	`}`
`866`	`866`
`867`		`-static int __maybe_unused rockchip_pcie_suspend_noirq(struct device *dev)`
	`867`	`+static int rockchip_pcie_suspend_noirq(struct device *dev)`
`868`	`868`	`{`
`869`	`869`	`struct rockchip_pcie *rockchip = dev_get_drvdata(dev);`
`870`	`870`	`int ret;`
`@@ -889,7 +889,7 @@ static int __maybe_unused rockchip_pcie_suspend_noirq(struct device *dev)`
`889`	`889`	`return ret;`
`890`	`890`	`}`
`891`	`891`
`892`		`-static int __maybe_unused rockchip_pcie_resume_noirq(struct device *dev)`
	`892`	`+static int rockchip_pcie_resume_noirq(struct device *dev)`
`893`	`893`	`{`
`894`	`894`	`struct rockchip_pcie *rockchip = dev_get_drvdata(dev);`
`895`	`895`	`int err;`
`@@ -1035,8 +1035,8 @@ static int rockchip_pcie_remove(struct platform_device *pdev)`
`1035`	`1035`	`}`
`1036`	`1036`
`1037`	`1037`	`static const struct dev_pm_ops rockchip_pcie_pm_ops = {`
`1038`		`- SET_NOIRQ_SYSTEM_SLEEP_PM_OPS(rockchip_pcie_suspend_noirq,`
`1039`		`- rockchip_pcie_resume_noirq)`
	`1038`	`+ NOIRQ_SYSTEM_SLEEP_PM_OPS(rockchip_pcie_suspend_noirq,`
	`1039`	`+ rockchip_pcie_resume_noirq)`
`1040`	`1040`	`};`
`1041`	`1041`
`1042`	`1042`	`static const struct of_device_id rockchip_pcie_of_match[] = {`