gpio: pl061: remove confusing naming

Drop the " gpio" suffix after the pl061 irq_chip name:
this is only confusing: an irqchip name should be a single,
short, simple string that looks nice in /proc/interrupts.

Drop the nameing of each individual IRQ to "pl061" - I
think this naming function is for naming the IRQ line,
not for boilerplating them all with the name of the
parent controller, which is already known from the
.name field of the irq_chip.

Cc: Haojian Zhuang <haojian.zhuang@linaro.org>
Cc: Deepak Sikri <deepak.sikri@st.com>
Acked-by: Baruch Siach <baruch@tkos.co.il>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>

diff --git a/drivers/gpio/gpio-pl061.c b/drivers/gpio/gpio-pl061.c
index a934881279e8052ccc875e925a71d90e190e4d07..062a1be7492944a5b97bed2696302ff03df2693e 100644 (file)
--- a/drivers/gpio/gpio-pl061.c
+++ b/drivers/gpio/gpio-pl061.c
@@ -254,7 +254,7 @@ static void pl061_irq_shutdown(struct irq_data *d)
 }
 
 static struct irq_chip pl061_irqchip = {
-       .name           = "pl061 gpio",
+       .name           = "pl061",
        .irq_mask       = pl061_irq_mask,
        .irq_unmask     = pl061_irq_unmask,
        .irq_set_type   = pl061_irq_type,
@@ -267,8 +267,7 @@ static int pl061_irq_map(struct irq_domain *d, unsigned int irq,
 {
        struct pl061_gpio *chip = d->host_data;
 
-       irq_set_chip_and_handler_name(irq, &pl061_irqchip, handle_simple_irq,
-                                     "pl061");
+       irq_set_chip_and_handler(irq, &pl061_irqchip, handle_simple_irq);
        irq_set_chip_data(irq, chip);
        irq_set_irq_type(irq, IRQ_TYPE_NONE);