Unverified Commit 72cc0f52 authored by Aidan MacDonald's avatar Aidan MacDonald Committed by Mark Brown
Browse files

regmap-irq: Remove support for not_fixed_stride 



No remaining users, use a custom .get_irq_reg() callback instead.

Signed-off-by: default avatarAidan MacDonald <aidanmacdonald.0x0@gmail.com>
Link: https://lore.kernel.org/r/20230511091342.26604-3-aidanmacdonald.0x0@gmail.com


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent f05cbadc

drivers/base/regmap/regmap-irq.c

+3 −40
Original line number Diff line number Diff line
@@ -328,15 +328,8 @@ static inline int read_sub_irq_data(struct regmap_irq_chip_data *data, 
			unsigned int offset = subreg->offset[i];

			unsigned int index = offset / map->reg_stride;



			if (chip->not_fixed_stride)

				ret = regmap_read(map,

						chip->status_base + offset,

						&data->status_buf[b]);

			else

				ret = regmap_read(map,

						chip->status_base + offset,

			ret = regmap_read(map, chip->status_base + offset,

					  &data->status_buf[index]);



			if (ret)

				break;

		}
@@ -391,17 +384,7 @@ static irqreturn_t regmap_irq_thread(int irq, void *d) 
		 * sake of simplicity. and add bulk reads only if needed

		 */

		for (i = 0; i < chip->num_main_regs; i++) {

			/*

			 * For not_fixed_stride, don't use ->get_irq_reg().

			 * It would produce an incorrect result.

			 */

			if (data->chip->not_fixed_stride)

				reg = chip->main_status +

					i * map->reg_stride * data->irq_reg_stride;

			else

				reg = data->get_irq_reg(data,

							chip->main_status, i);



			reg = data->get_irq_reg(data, chip->main_status, i);

			ret = regmap_read(map, reg, &data->main_status_buf[i]);

			if (ret) {

				dev_err(map->dev,
@@ -567,20 +550,8 @@ static const struct irq_domain_ops regmap_domain_ops = { 
unsigned int regmap_irq_get_irq_reg_linear(struct regmap_irq_chip_data *data,

					   unsigned int base, int index)

{

	const struct regmap_irq_chip *chip = data->chip;

	struct regmap *map = data->map;



	/*

	 * FIXME: This is for backward compatibility and should be removed

	 * when not_fixed_stride is dropped (it's only used by qcom-pm8008).

	 */

	if (chip->not_fixed_stride && chip->sub_reg_offsets) {

		struct regmap_irq_sub_irq_map *subreg;



		subreg = &chip->sub_reg_offsets[0];

		return base + subreg->offset[0];

	}



	return base + index * map->reg_stride * data->irq_reg_stride;

}

EXPORT_SYMBOL_GPL(regmap_irq_get_irq_reg_linear);
@@ -684,14 +655,6 @@ int regmap_add_irq_chip_fwnode(struct fwnode_handle *fwnode, 
			return -EINVAL;

	}



	if (chip->not_fixed_stride) {

		dev_warn(map->dev, "not_fixed_stride is deprecated; use ->get_irq_reg() instead");



		for (i = 0; i < chip->num_regs; i++)

			if (chip->sub_reg_offsets[i].num_regs != 1)

				return -EINVAL;

	}



	if (irq_base) {

		irq_base = irq_alloc_descs(irq_base, 0, chip->num_irqs, 0);

		if (irq_base < 0) {

include/linux/regmap.h

+0 −9
Original line number Diff line number Diff line
@@ -1528,9 +1528,6 @@ struct regmap_irq_chip_data; 
 *		     status_base. Should contain num_regs arrays.

 *		     Can be provided for chips with more complex mapping than

 *		     1.st bit to 1.st sub-reg, 2.nd bit to 2.nd sub-reg, ...

 *		     When used with not_fixed_stride, each one-element array

 *		     member contains offset calculated as address from each

 *		     peripheral to first peripheral.

 * @num_main_regs: Number of 'main status' irq registers for chips which have

 *		   main_status set.

 *
@@ -1567,11 +1564,6 @@ struct regmap_irq_chip_data; 
 *                   registers before unmasking interrupts to clear any bits

 *                   set when they were masked.

 * @runtime_pm:  Hold a runtime PM lock on the device when accessing it.

 * @not_fixed_stride: Used when chip peripherals are not laid out with fixed

 *		      stride. Must be used with sub_reg_offsets containing the

 *		      offsets to each peripheral. Deprecated; the same thing

 *		      can be accomplished with a @get_irq_reg callback, without

 *		      the need for a @sub_reg_offsets table.

 * @no_status: No status register: all interrupts assumed generated by device.

 *

 * @num_regs:    Number of registers in each control bank.
@@ -1628,7 +1620,6 @@ struct regmap_irq_chip { 
	unsigned int type_in_mask:1;

	unsigned int clear_on_unmask:1;

	unsigned int runtime_pm:1;

	unsigned int not_fixed_stride:1;

	unsigned int no_status:1;



	int num_regs;