regmap: Pass irq_drv_data as a parameter for set_type_config()

Allow the struct regmap_irq_chip set_type_config() callback to access
irq_drv_data by passing it as a parameter.

Signed-off-by: William Breathitt Gray <william.gray@linaro.org>
Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Link: https://lore.kernel.org/r/20e15cd3afae80922b7e0577c7741df86b3390c5.1680708357.git.william.gray@linaro.org
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/drivers/base/regmap/regmap-irq.c b/drivers/base/regmap/regmap-irq.c
index 8c903b8c97146e3247c5bcf65bf18e24f6362dca..e489b235b36bd2d9548a55c6a8b7cb85acdde750 100644 (file)
--- a/drivers/base/regmap/regmap-irq.c
+++ b/drivers/base/regmap/regmap-irq.c
@@ -329,8 +329,8 @@ static int regmap_irq_set_type(struct irq_data *data, unsigned int type)
        }
 
        if (d->chip->set_type_config) {
-               ret = d->chip->set_type_config(d->config_buf, type,
-                                              irq_data, reg);
+               ret = d->chip->set_type_config(d->config_buf, type, irq_data,
+                                              reg, d->chip->irq_drv_data);
                if (ret)
                        return ret;
        }
@@ -651,13 +651,15 @@ EXPORT_SYMBOL_GPL(regmap_irq_get_irq_reg_linear);
  * @type: The requested IRQ type.
  * @irq_data: The IRQ being configured.
  * @idx: Index of the irq's config registers within each array `buf[i]`
+ * @irq_drv_data: Driver specific IRQ data
  *
  * This is a &struct regmap_irq_chip->set_type_config callback suitable for
  * chips with one config register. Register values are updated according to
  * the &struct regmap_irq_type data associated with an IRQ.
  */
 int regmap_irq_set_type_config_simple(unsigned int **buf, unsigned int type,
-                                     const struct regmap_irq *irq_data, int idx)
+                                     const struct regmap_irq *irq_data,
+                                     int idx, void *irq_drv_data)
 {
        const struct regmap_irq_type *t = &irq_data->type;
 

diff --git a/include/linux/regmap.h b/include/linux/regmap.h
index 4d10790adeb0a6644aa8270c41a0f57d0c10c12b..fb92d0ac13af00c348a703b5e153fa13c50bc3ff 100644 (file)
--- a/include/linux/regmap.h
+++ b/include/linux/regmap.h
@@ -1650,7 +1650,8 @@ struct regmap_irq_chip {
        int (*set_type_virt)(unsigned int **buf, unsigned int type,
                             unsigned long hwirq, int reg);
        int (*set_type_config)(unsigned int **buf, unsigned int type,
-                              const struct regmap_irq *irq_data, int idx);
+                              const struct regmap_irq *irq_data, int idx,
+                              void *irq_drv_data);
        unsigned int (*get_irq_reg)(struct regmap_irq_chip_data *data,
                                    unsigned int base, int index);
        void *irq_drv_data;
@@ -1659,7 +1660,8 @@ struct regmap_irq_chip {
 unsigned int regmap_irq_get_irq_reg_linear(struct regmap_irq_chip_data *data,
                                           unsigned int base, int index);
 int regmap_irq_set_type_config_simple(unsigned int **buf, unsigned int type,
-                                     const struct regmap_irq *irq_data, int idx);
+                                     const struct regmap_irq *irq_data,
+                                     int idx, void *irq_drv_data);
 
 int regmap_add_irq_chip(struct regmap *map, int irq, int irq_flags,
                        int irq_base, const struct regmap_irq_chip *chip,