Skip to content

Commit 5680655

Browse files
nvswarrenbroonie
authored andcommitted
regmap: fix compile errors in regmap-irq.c due to stride changes
Commit f01ee60 ("regmap: implement register striding") caused the compile errors below. Fix them. drivers/base/regmap/regmap-irq.c: In function 'regmap_irq_sync_unlock': drivers/base/regmap/regmap-irq.c:62:12: error: 'map' undeclared (first use in this function) drivers/base/regmap/regmap-irq.c:62:12: note: each undeclared identifier is reported only once for each function it appears in drivers/base/regmap/regmap-irq.c: In function 'regmap_irq_enable': drivers/base/regmap/regmap-irq.c:77:37: error: 'map' undeclared (first use in this function) drivers/base/regmap/regmap-irq.c: In function 'regmap_irq_disable': drivers/base/regmap/regmap-irq.c:85:37: error: 'map' undeclared (first use in this function) Signed-off-by: Stephen Warren <swarren@nvidia.com> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
1 parent f01ee60 commit 5680655

File tree

1 file changed

+4
-1
lines changed

1 file changed

+4
-1
lines changed

drivers/base/regmap/regmap-irq.c

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@ static void regmap_irq_lock(struct irq_data *data)
5050
static void regmap_irq_sync_unlock(struct irq_data *data)
5151
{
5252
struct regmap_irq_chip_data *d = irq_data_get_irq_chip_data(data);
53+
struct regmap *map = d->map;
5354
int i, ret;
5455

5556
/*
@@ -59,7 +60,7 @@ static void regmap_irq_sync_unlock(struct irq_data *data)
5960
*/
6061
for (i = 0; i < d->chip->num_regs; i++) {
6162
ret = regmap_update_bits(d->map, d->chip->mask_base +
62-
(i * map->map->reg_stride),
63+
(i * map->reg_stride),
6364
d->mask_buf_def[i], d->mask_buf[i]);
6465
if (ret != 0)
6566
dev_err(d->map->dev, "Failed to sync masks in %x\n",
@@ -72,6 +73,7 @@ static void regmap_irq_sync_unlock(struct irq_data *data)
7273
static void regmap_irq_enable(struct irq_data *data)
7374
{
7475
struct regmap_irq_chip_data *d = irq_data_get_irq_chip_data(data);
76+
struct regmap *map = d->map;
7577
const struct regmap_irq *irq_data = irq_to_regmap_irq(d, data->irq);
7678

7779
d->mask_buf[irq_data->reg_offset / map->reg_stride] &= ~irq_data->mask;
@@ -80,6 +82,7 @@ static void regmap_irq_enable(struct irq_data *data)
8082
static void regmap_irq_disable(struct irq_data *data)
8183
{
8284
struct regmap_irq_chip_data *d = irq_data_get_irq_chip_data(data);
85+
struct regmap *map = d->map;
8386
const struct regmap_irq *irq_data = irq_to_regmap_irq(d, data->irq);
8487

8588
d->mask_buf[irq_data->reg_offset / map->reg_stride] |= irq_data->mask;

0 commit comments

Comments
 (0)