regmap: fix compile errors in regmap-irq.c due to stride changes
Stephen Warren [Wed, 11 Apr 2012 05:37:22 +0000 (23:37 -0600)]
Commit f01ee60fffa4 ("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>
(cherry picked from commit 56806555de5485d6786bf0f8df01b8ed9fc5d006)

Change-Id: I1b0787c81695ddbfb081a1342690a44162474574
Signed-off-by: Laxman Dewangan <ldewangan@nvidia.com>
Reviewed-on: http://git-master/r/96511
Reviewed-by: Simone Willett <swillett@nvidia.com>
Tested-by: Simone Willett <swillett@nvidia.com>

drivers/base/regmap/regmap-irq.c

index 761f545..cc7b4f7 100644 (file)
@@ -49,6 +49,7 @@ static void regmap_irq_lock(struct irq_data *data)
 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;
 
        /*
@@ -58,7 +59,7 @@ static void regmap_irq_sync_unlock(struct irq_data *data)
         */
        for (i = 0; i < d->chip->num_regs; i++) {
                ret = regmap_update_bits(d->map, d->chip->mask_base +
-                                               (i * map->map->reg_stride),
+                                               (i * map->reg_stride),
                                         d->mask_buf_def[i], d->mask_buf[i]);
                if (ret != 0)
                        dev_err(d->map->dev, "Failed to sync masks in %x\n",
@@ -71,6 +72,7 @@ static void regmap_irq_sync_unlock(struct irq_data *data)
 static void regmap_irq_enable(struct irq_data *data)
 {
        struct regmap_irq_chip_data *d = irq_data_get_irq_chip_data(data);
+       struct regmap *map = d->map;
        const struct regmap_irq *irq_data = irq_to_regmap_irq(d, data->irq);
 
        d->mask_buf[irq_data->reg_offset / map->reg_stride] &= ~irq_data->mask;
@@ -79,6 +81,7 @@ static void regmap_irq_enable(struct irq_data *data)
 static void regmap_irq_disable(struct irq_data *data)
 {
        struct regmap_irq_chip_data *d = irq_data_get_irq_chip_data(data);
+       struct regmap *map = d->map;
        const struct regmap_irq *irq_data = irq_to_regmap_irq(d, data->irq);
 
        d->mask_buf[irq_data->reg_offset / map->reg_stride] |= irq_data->mask;