regmap-irq: Drop map from handle_mask_sync() parameters

Remove the map parameter from the struct regmap_irq_chip callback
handle_mask_sync() because it can be passed via the irq_drv_data
parameter instead. The gpio-104-dio-48e driver is the only consumer of
this callback and is thus updated accordingly.

Reviewed-by: Linus Walleij <linus.walleij@linaro.org
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/1f44fb0fbcd3dccea3371215b00f1b9a956c1a12.1679323449.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 b99bb2369fffb7252aa134001428432152c6f747..362926d155a4d5bb8d5f71ebf47784a0e8faa4ca 100644 (file)
--- a/drivers/base/regmap/regmap-irq.c
+++ b/drivers/base/regmap/regmap-irq.c
@@ -116,8 +116,7 @@ static void regmap_irq_sync_unlock(struct irq_data *data)
        for (i = 0; i < d->chip->num_regs; i++) {
                if (d->mask_base) {
                        if (d->chip->handle_mask_sync)
-                               d->chip->handle_mask_sync(d->map, i,
-                                                         d->mask_buf_def[i],
+                               d->chip->handle_mask_sync(i, d->mask_buf_def[i],
                                                          d->mask_buf[i],
                                                          d->chip->irq_drv_data);
                        else {
@@ -920,7 +919,7 @@ int regmap_add_irq_chip_fwnode(struct fwnode_handle *fwnode,
 
                if (d->mask_base) {
                        if (chip->handle_mask_sync) {
-                               ret = chip->handle_mask_sync(d->map, i,
+                               ret = chip->handle_mask_sync(i,
                                                             d->mask_buf_def[i],
                                                             d->mask_buf[i],
                                                             chip->irq_drv_data);

diff --git a/drivers/gpio/gpio-104-dio-48e.c b/drivers/gpio/gpio-104-dio-48e.c
index 63dce9532e9758724873af8ad22bc1d8953c4219..8ff5f4ff5958bc1a33d69a1405934ecca9e1590d 100644 (file)
--- a/drivers/gpio/gpio-104-dio-48e.c
+++ b/drivers/gpio/gpio-104-dio-48e.c
@@ -110,7 +110,7 @@ struct dio48e_gpio {
        unsigned int irq_mask;
 };
 
-static int dio48e_handle_mask_sync(struct regmap *const map, const int index,
+static int dio48e_handle_mask_sync(const int index,
                                   const unsigned int mask_buf_def,
                                   const unsigned int mask_buf,
                                   void *const irq_drv_data)

diff --git a/include/linux/regmap.h b/include/linux/regmap.h
index c2b9cc5db8241f614c5c2cf3c5baefea786dbdc8..f820bd44d16ffea335f06760336f6887c0e53795 100644 (file)
--- a/include/linux/regmap.h
+++ b/include/linux/regmap.h
@@ -1658,8 +1658,7 @@ struct regmap_irq_chip {
 
        int (*handle_pre_irq)(void *irq_drv_data);
        int (*handle_post_irq)(void *irq_drv_data);
-       int (*handle_mask_sync)(struct regmap *map, int index,
-                               unsigned int mask_buf_def,
+       int (*handle_mask_sync)(int index, unsigned int mask_buf_def,
                                unsigned int mask_buf, void *irq_drv_data);
        int (*set_type_virt)(unsigned int **buf, unsigned int type,
                             unsigned long hwirq, int reg);