Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 16032624 authored by Stephen Warren's avatar Stephen Warren Committed by Mark Brown
Browse files

regmap: fix some error messages to take account of irq_reg_stride 



A number of places in the code were printing error messages that included
the address of a register, but were not calculating the register address
in the same way as the access to the register. Use a temporary to solve
this.

Signed-off-by: default avatarStephen Warren <swarren@nvidia.com>
Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
parent 0d7614f0

drivers/base/regmap/regmap-irq.c

+15 −14
Original line number Diff line number Diff line
@@ -59,6 +59,7 @@ static void regmap_irq_sync_unlock(struct irq_data *data) 
	struct regmap_irq_chip_data *d = irq_data_get_irq_chip_data(data);

	struct regmap *map = d->map;

	int i, ret;

	u32 reg;



	/*

	 * If there's been a change in the mask write it back to the
@@ -66,13 +67,13 @@ static void regmap_irq_sync_unlock(struct irq_data *data) 
	 * suppress pointless writes.

	 */

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

		ret = regmap_update_bits(d->map, d->chip->mask_base +

						(i * map->reg_stride *

						d->irq_reg_stride),

		reg = d->chip->mask_base +

			(i * map->reg_stride * d->irq_reg_stride);

		ret = regmap_update_bits(d->map, reg,

					 d->mask_buf_def[i], d->mask_buf[i]);

		if (ret != 0)

			dev_err(d->map->dev, "Failed to sync masks in %x\n",

				d->chip->mask_base + (i * map->reg_stride));

				reg);

	}



	/* If we've changed our wakeup count propagate it to the parent */
@@ -144,6 +145,7 @@ static irqreturn_t regmap_irq_thread(int irq, void *d) 
	struct regmap *map = data->map;

	int ret, i;

	bool handled = false;

	u32 reg;



	/*

	 * Ignore masked IRQs and ack if we need to; we ack early so
@@ -166,14 +168,12 @@ static irqreturn_t regmap_irq_thread(int irq, void *d) 
		data->status_buf[i] &= ~data->mask_buf[i];



		if (data->status_buf[i] && chip->ack_base) {

			ret = regmap_write(map, chip->ack_base +

						(i * map->reg_stride *

						data->irq_reg_stride),

					   data->status_buf[i]);

			reg = chip->ack_base +

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

			ret = regmap_write(map, reg, data->status_buf[i]);

			if (ret != 0)

				dev_err(map->dev, "Failed to ack 0x%x: %d\n",

					chip->ack_base + (i * map->reg_stride),

					ret);

					reg, ret);

		}

	}
@@ -238,6 +238,7 @@ int regmap_add_irq_chip(struct regmap *map, int irq, int irq_flags, 
	struct regmap_irq_chip_data *d;

	int i;

	int ret = -ENOMEM;

	u32 reg;



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

		if (chip->irqs[i].reg_offset % map->reg_stride)
@@ -303,12 +304,12 @@ int regmap_add_irq_chip(struct regmap *map, int irq, int irq_flags, 
	/* Mask all the interrupts by default */

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

		d->mask_buf[i] = d->mask_buf_def[i];

		ret = regmap_write(map, chip->mask_base + (i * map->reg_stride

				   * d->irq_reg_stride),

				   d->mask_buf[i]);

		reg = chip->mask_base +

			(i * map->reg_stride * d->irq_reg_stride);

		ret = regmap_write(map, reg, d->mask_buf[i]);

		if (ret != 0) {

			dev_err(map->dev, "Failed to set masks in 0x%x: %d\n",

				chip->mask_base + (i * map->reg_stride), ret);

				reg, ret);

			goto err_alloc;

		}

	}