diff options
author | Feng Tang <feng.tang@intel.com> | 2011-01-25 18:07:15 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-01-25 19:49:59 -0500 |
commit | 0766d20fdb9178b908f0268c16b464c11822c5c2 (patch) | |
tree | 4f38a8ba810d1413b5a1423990741e5ec7269ffc /drivers/gpio | |
parent | d8cc667be8fad9ad0bb3a95116be9f80a3b3efcf (diff) |
langwell_gpio: modify EOI handling following change of kernel irq subsystem
Latest kernel has many changes in IRQ subsystem and its interfaces, like
adding "irq_eoi" for struct irq_chip, this patch is a follow up change
for that.
Also remove the unnecessary cast for a "void *".
Signed-off-by: Feng Tang <feng.tang@intel.com>
Cc: Alek Du <alek.du@intel.com>
Cc: Alan Cox <alan@lxorguk.ukuu.org.uk>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/gpio')
-rw-r--r-- | drivers/gpio/langwell_gpio.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/drivers/gpio/langwell_gpio.c b/drivers/gpio/langwell_gpio.c index d81cc748e77f..54d70a47afc1 100644 --- a/drivers/gpio/langwell_gpio.c +++ b/drivers/gpio/langwell_gpio.c | |||
@@ -187,7 +187,7 @@ MODULE_DEVICE_TABLE(pci, lnw_gpio_ids); | |||
187 | 187 | ||
188 | static void lnw_irq_handler(unsigned irq, struct irq_desc *desc) | 188 | static void lnw_irq_handler(unsigned irq, struct irq_desc *desc) |
189 | { | 189 | { |
190 | struct lnw_gpio *lnw = (struct lnw_gpio *)get_irq_data(irq); | 190 | struct lnw_gpio *lnw = get_irq_data(irq); |
191 | u32 base, gpio; | 191 | u32 base, gpio; |
192 | void __iomem *gedr; | 192 | void __iomem *gedr; |
193 | u32 gedr_v; | 193 | u32 gedr_v; |
@@ -206,7 +206,12 @@ static void lnw_irq_handler(unsigned irq, struct irq_desc *desc) | |||
206 | /* clear the edge detect status bit */ | 206 | /* clear the edge detect status bit */ |
207 | writel(gedr_v, gedr); | 207 | writel(gedr_v, gedr); |
208 | } | 208 | } |
209 | desc->chip->eoi(irq); | 209 | |
210 | if (desc->chip->irq_eoi) | ||
211 | desc->chip->irq_eoi(irq_get_irq_data(irq)); | ||
212 | else | ||
213 | dev_warn(lnw->chip.dev, "missing EOI handler for irq %d\n", irq); | ||
214 | |||
210 | } | 215 | } |
211 | 216 | ||
212 | static int __devinit lnw_gpio_probe(struct pci_dev *pdev, | 217 | static int __devinit lnw_gpio_probe(struct pci_dev *pdev, |