From de8576667a68394c3861e84d57055c2a6e932cb1 Mon Sep 17 00:00:00 2001 From: Sekhar Nori Date: Sun, 11 Mar 2012 18:16:12 +0530 Subject: [PATCH] --- yaml --- r: 296927 b: refs/heads/master c: 81b279d80a63628e580c71a31d30a8c3b3047ad4 h: refs/heads/master i: 296925: 9cb5a02c70df3c72db9383d17cd741ba89ef2ecc 296923: 8b478ab746ab65f156695492c3477c32da798b27 296919: c181b5c715d97293a97b37543bd0897a4a5136f1 296911: dcfd5ecd283e20db538bc306b2c56f1a4f064c75 296895: ddf26a46ab2d33dac1877a1e4ef0b51e519db187 v: v3 --- [refs] | 2 +- trunk/drivers/gpio/gpio-davinci.c | 11 ++++++----- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index 76da4b187145..dac1d8105e6b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ab2dde9924dd1ddb791fa8b14aa52e1df681e20c +refs/heads/master: 81b279d80a63628e580c71a31d30a8c3b3047ad4 diff --git a/trunk/drivers/gpio/gpio-davinci.c b/trunk/drivers/gpio/gpio-davinci.c index a6777e5e0ced..3d000169285d 100644 --- a/trunk/drivers/gpio/gpio-davinci.c +++ b/trunk/drivers/gpio/gpio-davinci.c @@ -386,7 +386,7 @@ static int __init davinci_gpio_irq_setup(void) * IRQ mux conflicts; gpio_irq_type_unbanked() is only for GPIOs. */ if (soc_info->gpio_unbanked) { - static struct irq_chip gpio_irqchip_unbanked; + static struct irq_chip_type gpio_unbanked; /* pass "bank 0" GPIO IRQs to AINTC */ chips[0].chip.to_irq = gpio_to_irq_unbanked; @@ -394,9 +394,10 @@ static int __init davinci_gpio_irq_setup(void) /* AINTC handles mask/unmask; GPIO handles triggering */ irq = bank_irq; - gpio_irqchip_unbanked = *irq_get_chip(irq); - gpio_irqchip_unbanked.name = "GPIO-AINTC"; - gpio_irqchip_unbanked.irq_set_type = gpio_irq_type_unbanked; + gpio_unbanked = *container_of(irq_get_chip(irq), + struct irq_chip_type, chip); + gpio_unbanked.chip.name = "GPIO-AINTC"; + gpio_unbanked.chip.irq_set_type = gpio_irq_type_unbanked; /* default trigger: both edges */ g = gpio2regs(0); @@ -405,7 +406,7 @@ static int __init davinci_gpio_irq_setup(void) /* set the direct IRQs up to use that irqchip */ for (gpio = 0; gpio < soc_info->gpio_unbanked; gpio++, irq++) { - irq_set_chip(irq, &gpio_irqchip_unbanked); + irq_set_chip(irq, &gpio_unbanked.chip); irq_set_handler_data(irq, &chips[gpio / 32]); irq_set_status_flags(irq, IRQ_TYPE_EDGE_BOTH); }