regmap-irq: Remove unused mask_invert flag

mask_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-2-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 e3092f5221073ee2a2b078a2890317976e5d0d5a..8c903b8c97146e3247c5bcf65bf18e24f6362dca 100644 (file)
--- a/drivers/base/regmap/regmap-irq.c
+++ b/drivers/base/regmap/regmap-irq.c
@@ -878,20 +878,6 @@ int regmap_add_irq_chip_fwnode(struct fwnode_handle *fwnode,
                 */
                dev_warn(map->dev, "mask_base and unmask_base are inverted, please fix it");
 
-               /* Might as well warn about mask_invert while we're at it... */
-               if (chip->mask_invert)
-                       dev_warn(map->dev, "mask_invert=true ignored");
-
-               d->mask_base = chip->unmask_base;
-               d->unmask_base = chip->mask_base;
-       } else if (chip->mask_invert) {
-               /*
-                * Swap the roles of mask_base and unmask_base if the bits are
-                * inverted. This is deprecated, drivers should use unmask_base
-                * directly.
-                */
-               dev_warn(map->dev, "mask_invert=true is deprecated; please switch to unmask_base");
-
                d->mask_base = chip->unmask_base;
                d->unmask_base = chip->mask_base;
        } else {

diff --git a/include/linux/regmap.h b/include/linux/regmap.h
index c2233aeb384326d8e70c51908c158ef0fe2bafa7..4d10790adeb0a6644aa8270c41a0f57d0c10c12b 100644 (file)
--- a/include/linux/regmap.h
+++ b/include/linux/regmap.h
@@ -1540,9 +1540,6 @@ struct regmap_irq_chip_data;
  * @config_base: Base address for IRQ type config regs. If null unsupported.
  * @irq_reg_stride:  Stride to use for chips where registers are not contiguous.
  * @init_ack_masked: Ack all masked interrupts once during initalization.
- * @mask_invert: Inverted mask register: cleared bits are masked out.
- *              Deprecated; prefer describing an inverted mask register as
- *              an unmask register.
  * @mask_unmask_non_inverted: Controls mask bit inversion for chips that set
  *     both @mask_base and @unmask_base. If false, mask and unmask bits are
  *     inverted (which is deprecated behavior); if true, bits will not be
@@ -1624,7 +1621,6 @@ struct regmap_irq_chip {
        const unsigned int *config_base;
        unsigned int irq_reg_stride;
        unsigned int init_ack_masked:1;
-       unsigned int mask_invert:1;
        unsigned int mask_unmask_non_inverted:1;
        unsigned int use_ack:1;
        unsigned int ack_invert:1;