Commit ed89d69a authored by Bjorn Helgaas's avatar Bjorn Helgaas
Browse files

Merge branch 'pci/ctrl/pm-ops' 

- 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
parents 56ebef0a 19b7858c

drivers/pci/controller/cadence/pcie-cadence.c

+2 −4
Original line number Diff line number Diff line
@@ -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,

	NOIRQ_SYSTEM_SLEEP_PM_OPS(cdns_pcie_suspend_noirq,

				  cdns_pcie_resume_noirq)

};

drivers/pci/controller/dwc/pci-dra7xx.c

+3 −5
Original line number Diff line number Diff line
@@ -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,8 +938,8 @@ 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,

	SYSTEM_SLEEP_PM_OPS(dra7xx_pcie_suspend, dra7xx_pcie_resume)

	NOIRQ_SYSTEM_SLEEP_PM_OPS(dra7xx_pcie_suspend_noirq,

				  dra7xx_pcie_resume_noirq)

};

drivers/pci/controller/dwc/pci-exynos.c

+4 −4
Original line number Diff line number Diff line
@@ -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,7 +420,7 @@ 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,

	NOIRQ_SYSTEM_SLEEP_PM_OPS(exynos_pcie_suspend_noirq,

				  exynos_pcie_resume_noirq)

};

drivers/pci/controller/dwc/pcie-intel-gw.c

+4 −4
Original line number Diff line number Diff line
@@ -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,7 +432,7 @@ 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,

	NOIRQ_SYSTEM_SLEEP_PM_OPS(intel_pcie_suspend_noirq,

				  intel_pcie_resume_noirq)

};

drivers/pci/controller/pci-mvebu.c

+1 −3
Original line number Diff line number Diff line
@@ -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 = {