diff options
| author |   Feng Tang <feng.tang@intel.com> | 2010-12-31 09:48:20 +0800 |
|---|---|---|
| committer |   Matthew Garrett <mjg@redhat.com> | 2011-01-07 17:26:57 -0500 |
| commit | 456dc301cc3b547b2a674de3028f53fb1453e532 (patch) | |
| tree | 7d48a718af75e6506f318a23f241419e61cad9a4 /drivers/platform | |
| parent | ACPI Thinkpad: We must always call va_end() after va_start() but do not do so in thinkpad_acpi.c::acpi_evalf() (diff) | |
| download | linux-dev-456dc301cc3b547b2a674de3028f53fb1453e532.tar.xz linux-dev-456dc301cc3b547b2a674de3028f53fb1453e532.zip | |
[PATCH] intel_pmic_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 will make it support both the new
and old interface.
Cc: Alek Du <alek.du@intel.com>
Signed-off-by: Feng Tang <feng.tang@intel.com>
Signed-off-by: Matthew Garrett <mjg@redhat.com>
Diffstat (limited to 'drivers/platform')
| -rw-r--r-- | drivers/platform/x86/intel_pmic_gpio.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/drivers/platform/x86/intel_pmic_gpio.c b/drivers/platform/x86/intel_pmic_gpio.c index e61db9dfebef..930e62762365 100644 --- a/drivers/platform/x86/intel_pmic_gpio.c +++ b/drivers/platform/x86/intel_pmic_gpio.c @@ -244,7 +244,11 @@ static void pmic_irq_handler(unsigned irq, struct irq_desc *desc) generic_handle_irq(pg->irq_base + gpio); } } - desc->chip->eoi(irq); + + if (desc->chip->irq_eoi) + desc->chip->irq_eoi(irq_get_irq_data(irq)); + else + dev_warn(pg->chip.dev, "missing EOI handler for irq %d\n", irq); } static int __devinit platform_pmic_gpio_probe(struct platform_device *pdev) |