diff options
| author | Aidan MacDonald <aidanmacdonald.0x0@gmail.com> | 2023-02-16 22:31:59 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2023-02-17 00:08:43 +0000 |
| commit | 483e6ea1b35aaeffd9b6e6e660d756be49c2a9f5 (patch) | |
| tree | 802ba260de070864db3660adcb26d84eaef1c315 | |
| parent | 7464145862d606cf9835f24080341a397cbc0669 (diff) | |
| download | lwn-483e6ea1b35aaeffd9b6e6e660d756be49c2a9f5.tar.gz lwn-483e6ea1b35aaeffd9b6e6e660d756be49c2a9f5.zip | |
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>
| -rw-r--r-- | drivers/base/regmap/regmap-irq.c | 11 | ||||
| -rw-r--r-- | include/linux/regmap.h | 3 |
2 files changed, 2 insertions, 12 deletions
diff --git a/drivers/base/regmap/regmap-irq.c b/drivers/base/regmap/regmap-irq.c index a8f185430a07..e3092f522107 100644 --- 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 f26432dc02ef..c2233aeb3843 100644 --- 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; |