From 7fa76b472a1737fb60ecb10abbdf351424cf4a9e Mon Sep 17 00:00:00 2001 From: Russell King Date: Thu, 1 Mar 2012 17:54:11 +0000 Subject: [PATCH] --- yaml --- r: 296261 b: refs/heads/master c: c402c110721ed53916595473aed1013acde95bab h: refs/heads/master i: 296259: 96898b259631f6002d55fe93dc64557b0be7b032 v: v3 --- [refs] | 2 +- trunk/arch/arm/mach-rpc/ecard.c | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 53eef8652050..df736f54e0eb 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6e747b4b83c2290b465aabd1ac006332430e2b2e +refs/heads/master: c402c110721ed53916595473aed1013acde95bab diff --git a/trunk/arch/arm/mach-rpc/ecard.c b/trunk/arch/arm/mach-rpc/ecard.c index 4dd0edab6a65..ec84cfde4ad7 100644 --- a/trunk/arch/arm/mach-rpc/ecard.c +++ b/trunk/arch/arm/mach-rpc/ecard.c @@ -445,7 +445,7 @@ static expansioncard_ops_t ecard_default_ops = { */ static void ecard_irq_unmask(struct irq_data *d) { - ecard_t *ec = slot_to_ecard(d->irq - 32); + ecard_t *ec = irq_data_get_irq_chip_data(d); if (ec) { if (!ec->ops) @@ -461,7 +461,7 @@ static void ecard_irq_unmask(struct irq_data *d) static void ecard_irq_mask(struct irq_data *d) { - ecard_t *ec = slot_to_ecard(d->irq - 32); + ecard_t *ec = irq_data_get_irq_chip_data(d); if (ec) { if (!ec->ops) @@ -1039,6 +1039,7 @@ ecard_probe(int slot, card_type_t type) ec->irq = 32 + slot; irq_set_chip_and_handler(ec->irq, &ecard_chip, handle_level_irq); + irq_set_chip_data(ec->irq, ec); set_irq_flags(ec->irq, IRQF_VALID); }