diff options
author | Stephen Warren <swarren@nvidia.com> | 2012-08-01 13:40:48 -0400 |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-08-04 07:13:53 -0400 |
commit | ca142750f8ac3d01e45909e624ca783779894640 (patch) | |
tree | 34df50d342fbfd35d2eee6a581fd65b2793767c1 /drivers/base/regmap/regmap-irq.c | |
parent | 7ac140ec426ed304237205be77f99eedfc1186b5 (diff) |
regmap: name irq_chip based on regmap_irq_chip's name
This is intended to give each irq_chip a useful name, rather than hard-
coding them all as "regmap".
Signed-off-by: Stephen Warren <swarren@nvidia.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'drivers/base/regmap/regmap-irq.c')
-rw-r--r-- | drivers/base/regmap/regmap-irq.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/base/regmap/regmap-irq.c b/drivers/base/regmap/regmap-irq.c index 72a6f31e8223..bf1203cbd122 100644 --- a/drivers/base/regmap/regmap-irq.c +++ b/drivers/base/regmap/regmap-irq.c | |||
@@ -131,7 +131,6 @@ static int regmap_irq_set_wake(struct irq_data *data, unsigned int on) | |||
131 | } | 131 | } |
132 | 132 | ||
133 | static const struct irq_chip regmap_irq_chip = { | 133 | static const struct irq_chip regmap_irq_chip = { |
134 | .name = "regmap", | ||
135 | .irq_bus_lock = regmap_irq_lock, | 134 | .irq_bus_lock = regmap_irq_lock, |
136 | .irq_bus_sync_unlock = regmap_irq_sync_unlock, | 135 | .irq_bus_sync_unlock = regmap_irq_sync_unlock, |
137 | .irq_disable = regmap_irq_disable, | 136 | .irq_disable = regmap_irq_disable, |
@@ -287,6 +286,7 @@ int regmap_add_irq_chip(struct regmap *map, int irq, int irq_flags, | |||
287 | } | 286 | } |
288 | 287 | ||
289 | d->irq_chip = regmap_irq_chip; | 288 | d->irq_chip = regmap_irq_chip; |
289 | d->irq_chip.name = chip->name; | ||
290 | d->irq = irq; | 290 | d->irq = irq; |
291 | d->map = map; | 291 | d->map = map; |
292 | d->chip = chip; | 292 | d->chip = chip; |