[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <20220620200644.1961936-13-aidanmacdonald.0x0@gmail.com>
Date: Mon, 20 Jun 2022 21:06:07 +0100
From: Aidan MacDonald <aidanmacdonald.0x0@...il.com>
To: broonie@...nel.org
Cc: agross@...nel.org, bjorn.andersson@...aro.org,
srinivas.kandagatla@...aro.org, bgoswami@...eaurora.org,
gregkh@...uxfoundation.org, rafael@...nel.org,
cw00.choi@...sung.com, krzysztof.kozlowski@...aro.org,
b.zolnierkie@...sung.com, myungjoo.ham@...sung.com,
michael@...le.cc, linus.walleij@...aro.org, brgl@...ev.pl,
tglx@...utronix.de, maz@...nel.org, lee.jones@...aro.org,
mani@...nel.org, cristian.ciocaltea@...il.com, wens@...e.org,
tharvey@...eworks.com, rjones@...eworks.com,
mazziesaccount@...il.com, orsonzhai@...il.com,
baolin.wang7@...il.com, zhang.lyra@...il.com,
jernej.skrabec@...il.com, samuel@...lland.org, lgirdwood@...il.com,
perex@...ex.cz, tiwai@...e.com, linux-kernel@...r.kernel.org,
linux-gpio@...r.kernel.org, linux-actions@...ts.infradead.org,
linux-arm-msm@...r.kernel.org,
linux-arm-kernel@...ts.infradead.org, linux-sunxi@...ts.linux.dev,
alsa-devel@...a-project.org
Subject: [PATCH 12/49] 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@...il.com>
---
drivers/base/regmap/regmap-irq.c | 6 ------
include/linux/regmap.h | 3 ---
2 files changed, 9 deletions(-)
diff --git a/drivers/base/regmap/regmap-irq.c b/drivers/base/regmap/regmap-irq.c
index 85d7fd4e07d7..b24818ad36e6 100644
--- a/drivers/base/regmap/regmap-irq.c
+++ b/drivers/base/regmap/regmap-irq.c
@@ -40,7 +40,6 @@ struct regmap_irq_chip_data {
unsigned int **config_buf;
unsigned int irq_reg_stride;
- unsigned int type_reg_stride;
bool clear_status:1;
};
@@ -738,11 +737,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 879afdc81526..1966ad4d0fa5 100644
--- a/include/linux/regmap.h
+++ b/include/linux/regmap.h
@@ -1483,8 +1483,6 @@ struct regmap_irq_sub_irq_map {
* @irqs: Descriptors for individual IRQs. Interrupt numbers are
* assigned based on the index in the array of the interrupt.
* @num_irqs: Number of descriptors.
- * @type_reg_stride: Stride to use for chips where type registers are not
- * contiguous.
* @num_config_bases: Number of config base registers.
* @num_config_regs: Number of config registers for each config base register.
* @handle_pre_irq: Driver specific callback to handle interrupt from device
@@ -1535,7 +1533,6 @@ struct regmap_irq_chip {
int num_config_bases;
int num_config_regs;
- unsigned int type_reg_stride;
int (*handle_pre_irq)(void *irq_drv_data);
int (*handle_post_irq)(void *irq_drv_data);
--
2.35.1
Powered by blists - more mailing lists