Skip to content

Commit 483e6ea

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

File tree

2 files changed

+2
-12
lines changed

2 files changed

+2
-12
lines changed

drivers/base/regmap/regmap-irq.c

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -189,12 +189,8 @@ static void regmap_irq_sync_unlock(struct irq_data *data)
189189
if (!d->type_buf_def[i])
190190
continue;
191191
reg = d->get_irq_reg(d, d->chip->type_base, i);
192-
if (d->chip->type_invert)
193-
ret = regmap_update_bits(d->map, reg,
194-
d->type_buf_def[i], ~d->type_buf[i]);
195-
else
196-
ret = regmap_update_bits(d->map, reg,
197-
d->type_buf_def[i], d->type_buf[i]);
192+
ret = regmap_update_bits(d->map, reg,
193+
d->type_buf_def[i], d->type_buf[i]);
198194
if (ret != 0)
199195
dev_err(d->map->dev, "Failed to sync type in %x\n",
200196
reg);
@@ -1028,9 +1024,6 @@ int regmap_add_irq_chip_fwnode(struct fwnode_handle *fwnode,
10281024

10291025
ret = regmap_read(map, reg, &d->type_buf_def[i]);
10301026

1031-
if (d->chip->type_invert)
1032-
d->type_buf_def[i] = ~d->type_buf_def[i];
1033-
10341027
if (ret) {
10351028
dev_err(map->dev, "Failed to get type defaults at 0x%x: %d\n",
10361029
reg, ret);

include/linux/regmap.h

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1555,8 +1555,6 @@ struct regmap_irq_chip_data;
15551555
* @ack_invert: Inverted ack register: cleared bits for ack.
15561556
* @clear_ack: Use this to set 1 and 0 or vice-versa to clear interrupts.
15571557
* @wake_invert: Inverted wake register: cleared bits are wake enabled.
1558-
* @type_invert: Invert the type flags. Deprecated, use config registers
1559-
* instead.
15601558
* @type_in_mask: Use the mask registers for controlling irq type. Use this if
15611559
* the hardware provides separate bits for rising/falling edge
15621560
* or low/high level interrupts and they should be combined into
@@ -1633,7 +1631,6 @@ struct regmap_irq_chip {
16331631
unsigned int clear_ack:1;
16341632
unsigned int wake_invert:1;
16351633
unsigned int runtime_pm:1;
1636-
unsigned int type_invert:1;
16371634
unsigned int type_in_mask:1;
16381635
unsigned int clear_on_unmask:1;
16391636
unsigned int not_fixed_stride:1;

0 commit comments

Comments
 (0)