diff options
| author | Stephen Warren <swarren@nvidia.com> | 2012-08-01 11:40:47 -0600 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-08-04 12:13:53 +0100 |
| commit | 7ac140ec426ed304237205be77f99eedfc1186b5 (patch) | |
| tree | 43a4a068d1fef340215301a05ea9ba93c9fe6ccc | |
| parent | 0eb46ad0c8d60943c1f46cef795fc537fbffd177 (diff) | |
| download | talos-obmc-linux-7ac140ec426ed304237205be77f99eedfc1186b5.tar.gz talos-obmc-linux-7ac140ec426ed304237205be77f99eedfc1186b5.zip | |
regmap: store irq_chip inside regmap_irq_chip_data
This will allow later patches to adjust portions of the irq_chip
individually for each regmap_irq_chip that is created.
Signed-off-by: Stephen Warren <swarren@nvidia.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
| -rw-r--r-- | drivers/base/regmap/regmap-irq.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/base/regmap/regmap-irq.c b/drivers/base/regmap/regmap-irq.c index 4a52743b60cd..72a6f31e8223 100644 --- a/drivers/base/regmap/regmap-irq.c +++ b/drivers/base/regmap/regmap-irq.c @@ -22,6 +22,7 @@ struct regmap_irq_chip_data { struct mutex lock; + struct irq_chip irq_chip; struct regmap *map; const struct regmap_irq_chip *chip; @@ -129,7 +130,7 @@ static int regmap_irq_set_wake(struct irq_data *data, unsigned int on) return 0; } -static struct irq_chip regmap_irq_chip = { +static const struct irq_chip regmap_irq_chip = { .name = "regmap", .irq_bus_lock = regmap_irq_lock, .irq_bus_sync_unlock = regmap_irq_sync_unlock, @@ -197,7 +198,7 @@ static int regmap_irq_map(struct irq_domain *h, unsigned int virq, struct regmap_irq_chip_data *data = h->host_data; irq_set_chip_data(virq, data); - irq_set_chip_and_handler(virq, ®map_irq_chip, handle_edge_irq); + irq_set_chip_and_handler(virq, &data->irq_chip, handle_edge_irq); irq_set_nested_thread(virq, 1); /* ARM needs us to explicitly flag the IRQ as valid @@ -285,6 +286,7 @@ int regmap_add_irq_chip(struct regmap *map, int irq, int irq_flags, goto err_alloc; } + d->irq_chip = regmap_irq_chip; d->irq = irq; d->map = map; d->chip = chip; |
