regmap-irq: Remove inappropriate uses of regmap_irq_update_bits()

regmap_irq_update_bits() is misnamed and should only be used for
updating mask registers, since it checks the mask_writeonly flag.
However, it was also used for updating wake and type registers.

It's safe to replace these uses with regmap_update_bits() because
there are no users of the mask_writeonly flag.

Signed-off-by: Aidan MacDonald <aidanmacdonald.0x0@gmail.com>
Link: https://lore.kernel.org/r/20220623211420.918875-6-aidanmacdonald.0x0@gmail.com
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 fd7c4315d16b1865710ee583c5a45395f2186a26..cb20ce6f91e76ba41d83b874d25a2f617c06a476 100644 (file)
--- a/drivers/base/regmap/regmap-irq.c
+++ b/drivers/base/regmap/regmap-irq.c
@@ -158,11 +158,11 @@ static void regmap_irq_sync_unlock(struct irq_data *data)
                reg = sub_irq_reg(d, d->chip->wake_base, i);
                if (d->wake_buf) {
                        if (d->chip->wake_invert)
-                               ret = regmap_irq_update_bits(d, reg,
+                               ret = regmap_update_bits(d->map, reg,
                                                         d->mask_buf_def[i],
                                                         ~d->wake_buf[i]);
                        else
-                               ret = regmap_irq_update_bits(d, reg,
+                               ret = regmap_update_bits(d->map, reg,
                                                         d->mask_buf_def[i],
                                                         d->wake_buf[i]);
                        if (ret != 0)
@@ -205,10 +205,10 @@ static void regmap_irq_sync_unlock(struct irq_data *data)
                                continue;
                        reg = sub_irq_reg(d, d->chip->type_base, i);
                        if (d->chip->type_invert)
-                               ret = regmap_irq_update_bits(d, reg,
+                               ret = regmap_update_bits(d->map, reg,
                                        d->type_buf_def[i], ~d->type_buf[i]);
                        else
-                               ret = regmap_irq_update_bits(d, reg,
+                               ret = regmap_update_bits(d->map, reg,
                                        d->type_buf_def[i], d->type_buf[i]);
                        if (ret != 0)
                                dev_err(d->map->dev, "Failed to sync type in %x\n",
@@ -825,11 +825,11 @@ int regmap_add_irq_chip_fwnode(struct fwnode_handle *fwnode,
                        reg = sub_irq_reg(d, d->chip->wake_base, i);
 
                        if (chip->wake_invert)
-                               ret = regmap_irq_update_bits(d, reg,
+                               ret = regmap_update_bits(d->map, reg,
                                                         d->mask_buf_def[i],
                                                         0);
                        else
-                               ret = regmap_irq_update_bits(d, reg,
+                               ret = regmap_update_bits(d->map, reg,
                                                         d->mask_buf_def[i],
                                                         d->wake_buf[i]);
                        if (ret != 0) {