An inverted mask register can be represented more directly
as an unmask register. Drop the redundant mask_invert flag.
Signed-off-by: Aidan MacDonald <aidanmacdonald.0x0@xxxxxxxxx>
---
drivers/base/regmap/regmap-irq.c | 30 ++++++++----------------------
include/linux/regmap.h | 2 --
2 files changed, 8 insertions(+), 24 deletions(-)
diff --git a/drivers/base/regmap/regmap-irq.c b/drivers/base/regmap/regmap-irq.c
index 8a718615fd09..0a8edaee064a 100644
--- a/drivers/base/regmap/regmap-irq.c
+++ b/drivers/base/regmap/regmap-irq.c
@@ -30,9 +30,6 @@ struct regmap_irq_chip_data {
int irq;
int wake_count;
- unsigned int mask_base;
- unsigned int unmask_base;
-
void *status_reg_buf;
unsigned int *main_status_buf;
unsigned int *status_buf;
@@ -126,8 +123,8 @@ static void regmap_irq_sync_unlock(struct irq_data *data)
* suppress pointless writes.
*/
for (i = 0; i < d->chip->num_regs; i++) {
- if (d->mask_base) {
- reg = sub_irq_reg(d, d->mask_base, i);
+ if (d->chip->mask_base) {
+ reg = sub_irq_reg(d, d->chip->mask_base, i);
ret = regmap_irq_update_mask_bits(d, reg,
d->mask_buf_def[i], d->mask_buf[i]);
if (ret != 0)
@@ -135,8 +132,8 @@ static void regmap_irq_sync_unlock(struct irq_data *data)
reg);
}
- if (d->unmask_base) {
- reg = sub_irq_reg(d, d->unmask_base, i);
+ if (d->chip->unmask_base) {
+ reg = sub_irq_reg(d, d->chip->unmask_base, i);
ret = regmap_irq_update_mask_bits(d, reg,
d->mask_buf_def[i], ~d->mask_buf[i]);
if (ret != 0)
@@ -721,17 +718,6 @@ int regmap_add_irq_chip_fwnode(struct fwnode_handle *fwnode,
d->chip = chip;
d->irq_base = irq_base;
- /*
- * Swap role of mask_base and unmask_base if mask bits are inverted.
- */
- if (chip->mask_invert) {
- d->mask_base = chip->unmask_base;
- d->unmask_base = chip->mask_base;
- } else {
- d->mask_base = chip->mask_base;
- d->unmask_base = chip->unmask_base;
- }
-
if (chip->irq_reg_stride)
d->irq_reg_stride = chip->irq_reg_stride;
else
@@ -756,8 +742,8 @@ int regmap_add_irq_chip_fwnode(struct fwnode_handle *fwnode,
for (i = 0; i < chip->num_regs; i++) {
d->mask_buf[i] = d->mask_buf_def[i];
- if (d->mask_base) {
- reg = sub_irq_reg(d, d->mask_base, i);
+ if (d->chip->mask_base) {
+ reg = sub_irq_reg(d, d->chip->mask_base, i);
ret = regmap_irq_update_mask_bits(d, reg,
d->mask_buf_def[i], d->mask_buf[i]);
if (ret != 0) {
@@ -767,8 +753,8 @@ int regmap_add_irq_chip_fwnode(struct fwnode_handle *fwnode,
}
}
- if (d->unmask_base) {
- reg = sub_irq_reg(d, d->unmask_base, i);
+ if (d->chip->unmask_base) {
+ reg = sub_irq_reg(d, d->chip->unmask_base, i);
ret = regmap_irq_update_mask_bits(d, reg,
d->mask_buf_def[i], ~d->mask_buf[i]);
if (ret != 0) {
diff --git a/include/linux/regmap.h b/include/linux/regmap.h
index a3103c88e936..bb625a1edef9 100644
--- a/include/linux/regmap.h
+++ b/include/linux/regmap.h
@@ -1462,7 +1462,6 @@ struct regmap_irq_sub_irq_map {
* @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.
* @use_ack: Use @ack register even if it is zero.
* @ack_invert: Inverted ack register: cleared bits for ack.
* @clear_ack: Use this to set 1 and 0 or vice-versa to clear interrupts.
@@ -1514,7 +1513,6 @@ struct regmap_irq_chip {
unsigned int irq_reg_stride;
bool mask_writeonly:1;
bool init_ack_masked:1;
- bool mask_invert:1;
bool use_ack:1;
bool ack_invert:1;
bool clear_ack:1;
--
2.35.1
