[PATCH 6/7] irqchip/irq-imx-gpcv2: Embed syscore_ops in chip context

[Thierry Reding]

From: Thierry Reding <tred...@nvidia.com>

This enables the syscore callbacks to obtain the IRQ chip context
without relying on a separate global variable.

Signed-off-by: Thierry Reding <tred...@nvidia.com>
---
 drivers/irqchip/irq-imx-gpcv2.c | 29 +++++++++++------------------
 1 file changed, 11 insertions(+), 18 deletions(-)

diff --git a/drivers/irqchip/irq-imx-gpcv2.c b/drivers/irqchip/irq-imx-gpcv2.c
index 83b009881e2a..61ba06a28fc4 100644
--- a/drivers/irqchip/irq-imx-gpcv2.c
+++ b/drivers/irqchip/irq-imx-gpcv2.c
@@ -19,6 +19,7 @@
 
 
 struct gpcv2_irqchip_data {
+       struct syscore_ops      syscore;
        struct raw_spinlock     rlock;
        void __iomem            *gpc_base;
        u32                     wakeup_sources[IMR_NUM];
@@ -26,7 +27,11 @@ struct gpcv2_irqchip_data {
        u32                     cpu2wakeup;
 };
 
-static struct gpcv2_irqchip_data *imx_gpcv2_instance __ro_after_init;
+static inline struct gpcv2_irqchip_data *
+from_syscore(struct syscore_ops *ops)
+{
+       return container_of(ops, struct gpcv2_irqchip_data, syscore);
+}
 
 static void __iomem *gpcv2_idx_to_reg(struct gpcv2_irqchip_data *cd, int i)
 {
@@ -35,14 +40,10 @@ static void __iomem *gpcv2_idx_to_reg(struct 
gpcv2_irqchip_data *cd, int i)
 
 static int gpcv2_wakeup_source_save(struct syscore_ops *ops)
 {
-       struct gpcv2_irqchip_data *cd;
+       struct gpcv2_irqchip_data *cd = from_syscore(ops);
        void __iomem *reg;
        int i;
 
-       cd = imx_gpcv2_instance;
-       if (!cd)
-               return 0;
-
        for (i = 0; i < IMR_NUM; i++) {
                reg = gpcv2_idx_to_reg(cd, i);
                cd->saved_irq_mask[i] = readl_relaxed(reg);
@@ -54,22 +55,13 @@ static int gpcv2_wakeup_source_save(struct syscore_ops *ops)
 
 static void gpcv2_wakeup_source_restore(struct syscore_ops *ops)
 {
-       struct gpcv2_irqchip_data *cd;
+       struct gpcv2_irqchip_data *cd = from_syscore(ops);
        int i;
 
-       cd = imx_gpcv2_instance;
-       if (!cd)
-               return;
-
        for (i = 0; i < IMR_NUM; i++)
                writel_relaxed(cd->saved_irq_mask[i], gpcv2_idx_to_reg(cd, i));
 }
 
-static struct syscore_ops imx_gpcv2_syscore_ops = {
-       .suspend        = gpcv2_wakeup_source_save,
-       .resume         = gpcv2_wakeup_source_restore,
-};
-
 static int imx_gpcv2_irq_set_wake(struct irq_data *d, unsigned int on)
 {
        struct gpcv2_irqchip_data *cd = d->chip_data;
@@ -275,8 +267,9 @@ static int __init imx_gpcv2_irqchip_init(struct device_node 
*node,
         */
        writel_relaxed(~0x1, cd->gpc_base + cd->cpu2wakeup);
 
-       imx_gpcv2_instance = cd;
-       register_syscore_ops(&imx_gpcv2_syscore_ops);
+       cd->syscore.suspend = gpcv2_wakeup_source_save;
+       cd->syscore.resume = gpcv2_wakeup_source_restore;
+       register_syscore_ops(&cd->syscore);
 
        /*
         * Clear the OF_POPULATED flag set in of_irq_init so that
-- 
2.48.1