diff options
Diffstat (limited to 'arch/arm/kernel/ecard.c')
-rw-r--r-- | arch/arm/kernel/ecard.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/arch/arm/kernel/ecard.c b/arch/arm/kernel/ecard.c index b27513a0f11e..a786f769035d 100644 --- a/arch/arm/kernel/ecard.c +++ b/arch/arm/kernel/ecard.c | |||
@@ -529,7 +529,7 @@ static void ecard_dump_irq_state(void) | |||
529 | } | 529 | } |
530 | } | 530 | } |
531 | 531 | ||
532 | static void ecard_check_lockup(struct irqdesc *desc) | 532 | static void ecard_check_lockup(struct irq_desc *desc) |
533 | { | 533 | { |
534 | static unsigned long last; | 534 | static unsigned long last; |
535 | static int lockup; | 535 | static int lockup; |
@@ -567,7 +567,7 @@ static void ecard_check_lockup(struct irqdesc *desc) | |||
567 | } | 567 | } |
568 | 568 | ||
569 | static void | 569 | static void |
570 | ecard_irq_handler(unsigned int irq, struct irqdesc *desc) | 570 | ecard_irq_handler(unsigned int irq, struct irq_desc *desc) |
571 | { | 571 | { |
572 | ecard_t *ec; | 572 | ecard_t *ec; |
573 | int called = 0; | 573 | int called = 0; |
@@ -585,7 +585,7 @@ ecard_irq_handler(unsigned int irq, struct irqdesc *desc) | |||
585 | pending = ecard_default_ops.irqpending(ec); | 585 | pending = ecard_default_ops.irqpending(ec); |
586 | 586 | ||
587 | if (pending) { | 587 | if (pending) { |
588 | struct irqdesc *d = irq_desc + ec->irq; | 588 | struct irq_desc *d = irq_desc + ec->irq; |
589 | desc_handle_irq(ec->irq, d); | 589 | desc_handle_irq(ec->irq, d); |
590 | called ++; | 590 | called ++; |
591 | } | 591 | } |
@@ -609,7 +609,7 @@ static unsigned char first_set[] = | |||
609 | }; | 609 | }; |
610 | 610 | ||
611 | static void | 611 | static void |
612 | ecard_irqexp_handler(unsigned int irq, struct irqdesc *desc) | 612 | ecard_irqexp_handler(unsigned int irq, struct irq_desc *desc) |
613 | { | 613 | { |
614 | const unsigned int statusmask = 15; | 614 | const unsigned int statusmask = 15; |
615 | unsigned int status; | 615 | unsigned int status; |
@@ -1022,7 +1022,7 @@ ecard_probe(int slot, card_type_t type) | |||
1022 | if (slot < 8) { | 1022 | if (slot < 8) { |
1023 | ec->irq = 32 + slot; | 1023 | ec->irq = 32 + slot; |
1024 | set_irq_chip(ec->irq, &ecard_chip); | 1024 | set_irq_chip(ec->irq, &ecard_chip); |
1025 | set_irq_handler(ec->irq, do_level_IRQ); | 1025 | set_irq_handler(ec->irq, handle_level_irq); |
1026 | set_irq_flags(ec->irq, IRQF_VALID); | 1026 | set_irq_flags(ec->irq, IRQF_VALID); |
1027 | } | 1027 | } |
1028 | 1028 | ||