regmap-irq: Remove unused type_invert flag

type_invert is deprecated and no longer used; it can now be removed.

Signed-off-by: Aidan MacDonald <aidanmacdonald.0x0@gmail.com>
Link: https://lore.kernel.org/r/20230216223200.150679-1-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 a8f185430a0741ad74e1b4665a84f4440befb0cd..e3092f5221073ee2a2b078a2890317976e5d0d5a 100644 (file)
--- a/drivers/base/regmap/regmap-irq.c
+++ b/drivers/base/regmap/regmap-irq.c
@@ -189,12 +189,8 @@ static void regmap_irq_sync_unlock(struct irq_data *data)
                        if (!d->type_buf_def[i])
                                continue;
                        reg = d->get_irq_reg(d, d->chip->type_base, i);
-                       if (d->chip->type_invert)
-                               ret = regmap_update_bits(d->map, reg,
-                                       d->type_buf_def[i], ~d->type_buf[i]);
-                       else
-                               ret = regmap_update_bits(d->map, reg,
-                                       d->type_buf_def[i], d->type_buf[i]);
+                       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",
                                        reg);
@@ -1028,9 +1024,6 @@ int regmap_add_irq_chip_fwnode(struct fwnode_handle *fwnode,
 
                        ret = regmap_read(map, reg, &d->type_buf_def[i]);
 
-                       if (d->chip->type_invert)
-                               d->type_buf_def[i] = ~d->type_buf_def[i];
-
                        if (ret) {
                                dev_err(map->dev, "Failed to get type defaults at 0x%x: %d\n",
                                        reg, ret);

diff --git a/include/linux/regmap.h b/include/linux/regmap.h
index f26432dc02efb63010bbc38394011a6e6725a007..c2233aeb384326d8e70c51908c158ef0fe2bafa7 100644 (file)
--- a/include/linux/regmap.h
+++ b/include/linux/regmap.h
@@ -1555,8 +1555,6 @@ struct regmap_irq_chip_data;
  * @ack_invert:  Inverted ack register: cleared bits for ack.
  * @clear_ack:  Use this to set 1 and 0 or vice-versa to clear interrupts.
  * @wake_invert: Inverted wake register: cleared bits are wake enabled.
- * @type_invert: Invert the type flags. Deprecated, use config registers
- *              instead.
  * @type_in_mask: Use the mask registers for controlling irq type. Use this if
  *               the hardware provides separate bits for rising/falling edge
  *               or low/high level interrupts and they should be combined into
@@ -1633,7 +1631,6 @@ struct regmap_irq_chip {
        unsigned int clear_ack:1;
        unsigned int wake_invert:1;
        unsigned int runtime_pm:1;
-       unsigned int type_invert:1;
        unsigned int type_in_mask:1;
        unsigned int clear_on_unmask:1;
        unsigned int not_fixed_stride:1;