Skip to content

Commit c74e7af

Browse files
Aidan MacDonaldbroonie
authored andcommitted
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 <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Mark Brown <[email protected]>
1 parent 483e6ea commit c74e7af

File tree

2 files changed

+0
-18
lines changed

2 files changed

+0
-18
lines changed

drivers/base/regmap/regmap-irq.c

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -878,20 +878,6 @@ int regmap_add_irq_chip_fwnode(struct fwnode_handle *fwnode,
878878
*/
879879
dev_warn(map->dev, "mask_base and unmask_base are inverted, please fix it");
880880

881-
/* Might as well warn about mask_invert while we're at it... */
882-
if (chip->mask_invert)
883-
dev_warn(map->dev, "mask_invert=true ignored");
884-
885-
d->mask_base = chip->unmask_base;
886-
d->unmask_base = chip->mask_base;
887-
} else if (chip->mask_invert) {
888-
/*
889-
* Swap the roles of mask_base and unmask_base if the bits are
890-
* inverted. This is deprecated, drivers should use unmask_base
891-
* directly.
892-
*/
893-
dev_warn(map->dev, "mask_invert=true is deprecated; please switch to unmask_base");
894-
895881
d->mask_base = chip->unmask_base;
896882
d->unmask_base = chip->mask_base;
897883
} else {

include/linux/regmap.h

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1540,9 +1540,6 @@ struct regmap_irq_chip_data;
15401540
* @config_base: Base address for IRQ type config regs. If null unsupported.
15411541
* @irq_reg_stride: Stride to use for chips where registers are not contiguous.
15421542
* @init_ack_masked: Ack all masked interrupts once during initalization.
1543-
* @mask_invert: Inverted mask register: cleared bits are masked out.
1544-
* Deprecated; prefer describing an inverted mask register as
1545-
* an unmask register.
15461543
* @mask_unmask_non_inverted: Controls mask bit inversion for chips that set
15471544
* both @mask_base and @unmask_base. If false, mask and unmask bits are
15481545
* inverted (which is deprecated behavior); if true, bits will not be
@@ -1624,7 +1621,6 @@ struct regmap_irq_chip {
16241621
const unsigned int *config_base;
16251622
unsigned int irq_reg_stride;
16261623
unsigned int init_ack_masked:1;
1627-
unsigned int mask_invert:1;
16281624
unsigned int mask_unmask_non_inverted:1;
16291625
unsigned int use_ack:1;
16301626
unsigned int ack_invert:1;

0 commit comments

Comments
 (0)