* [PATCH 1/2] PCI: mvebu: constify mvebu_pcie_pm_ops structure
2016-03-16 9:59 [PATCH 0/2] PCI: mvebu: trivial cleanup Jisheng Zhang
@ 2016-03-16 9:59 ` Jisheng Zhang
2016-03-16 10:07 ` Thomas Petazzoni
2016-03-16 9:59 ` [PATCH 2/2] PCI: mvebu: use SET_NOIRQ_SYSTEM_SLEEP_PM_OPS for mvebu_pcie_pm_ops Jisheng Zhang
2016-04-07 16:54 ` [PATCH 0/2] PCI: mvebu: trivial cleanup Bjorn Helgaas
2 siblings, 1 reply; 6+ messages in thread
From: Jisheng Zhang @ 2016-03-16 9:59 UTC (permalink / raw)
To: thomas.petazzoni, jason, bhelgaas
Cc: linux-pci, linux-arm-kernel, linux-kernel, Jisheng Zhang
The mvebu_pcie_pm_ops structure is never modified, so declare it as
const.
Signed-off-by: Jisheng Zhang <jszhang@marvell.com>
---
drivers/pci/host/pci-mvebu.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/pci/host/pci-mvebu.c b/drivers/pci/host/pci-mvebu.c
index 53b79c5..6c43cb8 100644
--- a/drivers/pci/host/pci-mvebu.c
+++ b/drivers/pci/host/pci-mvebu.c
@@ -1298,7 +1298,7 @@ static const struct of_device_id mvebu_pcie_of_match_table[] = {
};
MODULE_DEVICE_TABLE(of, mvebu_pcie_of_match_table);
-static struct dev_pm_ops mvebu_pcie_pm_ops = {
+static const struct dev_pm_ops mvebu_pcie_pm_ops = {
.suspend_noirq = mvebu_pcie_suspend,
.resume_noirq = mvebu_pcie_resume,
};
--
2.7.0
^ permalink raw reply related [flat|nested] 6+ messages in thread* Re: [PATCH 1/2] PCI: mvebu: constify mvebu_pcie_pm_ops structure
2016-03-16 9:59 ` [PATCH 1/2] PCI: mvebu: constify mvebu_pcie_pm_ops structure Jisheng Zhang
@ 2016-03-16 10:07 ` Thomas Petazzoni
0 siblings, 0 replies; 6+ messages in thread
From: Thomas Petazzoni @ 2016-03-16 10:07 UTC (permalink / raw)
To: Jisheng Zhang; +Cc: jason, bhelgaas, linux-pci, linux-arm-kernel, linux-kernel
Dear Jisheng Zhang,
On Wed, 16 Mar 2016 17:59:40 +0800, Jisheng Zhang wrote:
> The mvebu_pcie_pm_ops structure is never modified, so declare it as
> const.
>
> Signed-off-by: Jisheng Zhang <jszhang@marvell.com>
> ---
> drivers/pci/host/pci-mvebu.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
Reviewed-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Thanks!
Thomas
--
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH 2/2] PCI: mvebu: use SET_NOIRQ_SYSTEM_SLEEP_PM_OPS for mvebu_pcie_pm_ops
2016-03-16 9:59 [PATCH 0/2] PCI: mvebu: trivial cleanup Jisheng Zhang
2016-03-16 9:59 ` [PATCH 1/2] PCI: mvebu: constify mvebu_pcie_pm_ops structure Jisheng Zhang
@ 2016-03-16 9:59 ` Jisheng Zhang
2016-03-16 10:08 ` Thomas Petazzoni
2016-04-07 16:54 ` [PATCH 0/2] PCI: mvebu: trivial cleanup Bjorn Helgaas
2 siblings, 1 reply; 6+ messages in thread
From: Jisheng Zhang @ 2016-03-16 9:59 UTC (permalink / raw)
To: thomas.petazzoni, jason, bhelgaas
Cc: linux-pci, linux-arm-kernel, linux-kernel, Jisheng Zhang
use SET_NOIRQ_SYSTEM_SLEEP_PM_OPS helper macro for mvebu_pcie_pm_ops.
The macro also setups freeze_noirq, thaw_noirq and poweroff_noirq,
restore_noirq accordingly.
Signed-off-by: Jisheng Zhang <jszhang@marvell.com>
---
drivers/pci/host/pci-mvebu.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/drivers/pci/host/pci-mvebu.c b/drivers/pci/host/pci-mvebu.c
index 6c43cb8..6b451df 100644
--- a/drivers/pci/host/pci-mvebu.c
+++ b/drivers/pci/host/pci-mvebu.c
@@ -1003,6 +1003,7 @@ static void mvebu_pcie_msi_enable(struct mvebu_pcie *pcie)
pcie->msi->dev = &pcie->pdev->dev;
}
+#ifdef CONFIG_PM_SLEEP
static int mvebu_pcie_suspend(struct device *dev)
{
struct mvebu_pcie *pcie;
@@ -1031,6 +1032,7 @@ static int mvebu_pcie_resume(struct device *dev)
return 0;
}
+#endif
static void mvebu_pcie_port_clk_put(void *data)
{
@@ -1299,8 +1301,7 @@ static const struct of_device_id mvebu_pcie_of_match_table[] = {
MODULE_DEVICE_TABLE(of, mvebu_pcie_of_match_table);
static const struct dev_pm_ops mvebu_pcie_pm_ops = {
- .suspend_noirq = mvebu_pcie_suspend,
- .resume_noirq = mvebu_pcie_resume,
+ SET_NOIRQ_SYSTEM_SLEEP_PM_OPS(mvebu_pcie_suspend, mvebu_pcie_resume)
};
static struct platform_driver mvebu_pcie_driver = {
--
2.7.0
^ permalink raw reply related [flat|nested] 6+ messages in thread* Re: [PATCH 2/2] PCI: mvebu: use SET_NOIRQ_SYSTEM_SLEEP_PM_OPS for mvebu_pcie_pm_ops
2016-03-16 9:59 ` [PATCH 2/2] PCI: mvebu: use SET_NOIRQ_SYSTEM_SLEEP_PM_OPS for mvebu_pcie_pm_ops Jisheng Zhang
@ 2016-03-16 10:08 ` Thomas Petazzoni
0 siblings, 0 replies; 6+ messages in thread
From: Thomas Petazzoni @ 2016-03-16 10:08 UTC (permalink / raw)
To: Jisheng Zhang; +Cc: jason, bhelgaas, linux-pci, linux-arm-kernel, linux-kernel
Dear Jisheng Zhang,
On Wed, 16 Mar 2016 17:59:41 +0800, Jisheng Zhang wrote:
> use SET_NOIRQ_SYSTEM_SLEEP_PM_OPS helper macro for mvebu_pcie_pm_ops.
> The macro also setups freeze_noirq, thaw_noirq and poweroff_noirq,
> restore_noirq accordingly.
>
> Signed-off-by: Jisheng Zhang <jszhang@marvell.com>
> ---
> drivers/pci/host/pci-mvebu.c | 5 +++--
> 1 file changed, 3 insertions(+), 2 deletions(-)
Reviewed-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Thanks!
Thomas
--
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH 0/2] PCI: mvebu: trivial cleanup
2016-03-16 9:59 [PATCH 0/2] PCI: mvebu: trivial cleanup Jisheng Zhang
2016-03-16 9:59 ` [PATCH 1/2] PCI: mvebu: constify mvebu_pcie_pm_ops structure Jisheng Zhang
2016-03-16 9:59 ` [PATCH 2/2] PCI: mvebu: use SET_NOIRQ_SYSTEM_SLEEP_PM_OPS for mvebu_pcie_pm_ops Jisheng Zhang
@ 2016-04-07 16:54 ` Bjorn Helgaas
2 siblings, 0 replies; 6+ messages in thread
From: Bjorn Helgaas @ 2016-04-07 16:54 UTC (permalink / raw)
To: Jisheng Zhang
Cc: thomas.petazzoni, jason, bhelgaas, linux-pci, linux-arm-kernel,
linux-kernel
On Wed, Mar 16, 2016 at 05:59:39PM +0800, Jisheng Zhang wrote:
> trivial clean ups to pci-mvebu.c
>
> Jisheng Zhang (2):
> PCI: mvebu: constify mvebu_pcie_pm_ops structure
> PCI: mvebu: use SET_NOIRQ_SYSTEM_SLEEP_PM_OPS for mvebu_pcie_pm_ops
Applied with Thomas' ack to pci/host-mvebu for v4.7, thanks!
^ permalink raw reply [flat|nested] 6+ messages in thread