regmap-irq: Remove unused type_reg_stride field

It appears that no chip ever required a nonzero type_reg_stride
and commit 1066cfbdfa3f ("regmap-irq: Extend sub-irq to support
non-fixed reg strides") broke support. Just remove the field.

Signed-off-by: Aidan MacDonald <aidanmacdonald.0x0@gmail.com>
Link: https://lore.kernel.org/r/20220623211420.918875-3-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 a58b29e9c7c76b20ae9749750a82aec791d3244f..475a959e2b8be26876734d4d5d7c231da02b9de4 100644 (file)
--- a/drivers/base/regmap/regmap-irq.c
+++ b/drivers/base/regmap/regmap-irq.c
@@ -41,7 +41,6 @@ struct regmap_irq_chip_data {
        unsigned int **virt_buf;
 
        unsigned int irq_reg_stride;
-       unsigned int type_reg_stride;
 
        unsigned int clear_status:1;
 };
@@ -743,11 +742,6 @@ int regmap_add_irq_chip_fwnode(struct fwnode_handle *fwnode,
        else
                d->irq_reg_stride = 1;
 
-       if (chip->type_reg_stride)
-               d->type_reg_stride = chip->type_reg_stride;
-       else
-               d->type_reg_stride = 1;
-
        if (!map->use_single_read && map->reg_stride == 1 &&
            d->irq_reg_stride == 1) {
                d->status_reg_buf = kmalloc_array(chip->num_regs,

diff --git a/include/linux/regmap.h b/include/linux/regmap.h
index bcbc5d4ffd30ead87b3de3eab2ebbb96b5b065fe..58db2206f193a71fabccd604f7fd3ab123af68fa 100644 (file)
--- a/include/linux/regmap.h
+++ b/include/linux/regmap.h
@@ -1503,8 +1503,6 @@ struct regmap_irq_sub_irq_map {
  * @num_type_reg:    Number of type registers.
  * @num_virt_regs:   Number of non-standard irq configuration registers.
  *                  If zero unsupported.
- * @type_reg_stride: Stride to use for chips where type registers are not
- *                     contiguous.
  * @handle_pre_irq:  Driver specific callback to handle interrupt from device
  *                  before regmap_irq_handler process the interrupts.
  * @handle_post_irq: Driver specific callback to handle interrupt from device
@@ -1555,7 +1553,6 @@ struct regmap_irq_chip {
 
        int num_type_reg;
        int num_virt_regs;
-       unsigned int type_reg_stride;
 
        int (*handle_pre_irq)(void *irq_drv_data);
        int (*handle_post_irq)(void *irq_drv_data);