From: Stephen Warren Date: Wed, 1 Aug 2012 17:40:48 +0000 (-0600) Subject: regmap: name irq_chip based on regmap_irq_chip's name X-Git-Url: http://rtime.felk.cvut.cz/gitweb/can-eth-gw-linux.git/commitdiff_plain/ca142750f8ac3d01e45909e624ca783779894640 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 Signed-off-by: Mark Brown --- 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) } static const struct irq_chip regmap_irq_chip = { - .name = "regmap", .irq_bus_lock = regmap_irq_lock, .irq_bus_sync_unlock = regmap_irq_sync_unlock, .irq_disable = regmap_irq_disable, @@ -287,6 +286,7 @@ int regmap_add_irq_chip(struct regmap *map, int irq, int irq_flags, } d->irq_chip = regmap_irq_chip; + d->irq_chip.name = chip->name; d->irq = irq; d->map = map; d->chip = chip;