Skip to content

Commit

Permalink
gpio: pl061: remove confusing naming
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Linus Walleij committed Feb 3, 2014
1 parent 438a2c9 commit 9ae7e9e
Showing 1 changed file with 2 additions and 3 deletions.
5 changes: 2 additions & 3 deletions drivers/gpio/gpio-pl061.c
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -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);

Expand Down

0 comments on commit 9ae7e9e

Please sign in to comment.