From: Linus Walleij Date: Fri, 11 Oct 2013 17:27:02 +0000 (+0200) Subject: gpio: intel-mid: drop references to "virtual" IRQ X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=ba519dd46c46fb923b531ef833aac074cb0114b3;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git gpio: intel-mid: drop references to "virtual" IRQ Rename the argument "virq" to just "irq", this IRQ isn't any more "virtual" than any other Linux IRQ number, we use "hwirq" for the actual hw-numbers, "virq" is just bogus. Acked-by: David Cohen Signed-off-by: Linus Walleij --- diff --git a/drivers/gpio/gpio-intel-mid.c b/drivers/gpio/gpio-intel-mid.c index 612b54d3a3bf..be803af658ac 100644 --- a/drivers/gpio/gpio-intel-mid.c +++ b/drivers/gpio/gpio-intel-mid.c @@ -353,15 +353,15 @@ static void intel_mid_irq_init_hw(struct intel_mid_gpio *priv) } } -static int intel_gpio_irq_map(struct irq_domain *d, unsigned int virq, - irq_hw_number_t hw) +static int intel_gpio_irq_map(struct irq_domain *d, unsigned int irq, + irq_hw_number_t hwirq) { struct intel_mid_gpio *priv = d->host_data; - irq_set_chip_and_handler_name(virq, &intel_mid_irqchip, + irq_set_chip_and_handler_name(irq, &intel_mid_irqchip, handle_simple_irq, "demux"); - irq_set_chip_data(virq, priv); - irq_set_irq_type(virq, IRQ_TYPE_NONE); + irq_set_chip_data(irq, priv); + irq_set_irq_type(irq, IRQ_TYPE_NONE); return 0; }