diff options
Diffstat (limited to 'drivers/pcmcia/soc_common.c')
-rw-r--r-- | drivers/pcmcia/soc_common.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/pcmcia/soc_common.c b/drivers/pcmcia/soc_common.c index 420a77540f41..8c21446996f2 100644 --- a/drivers/pcmcia/soc_common.c +++ b/drivers/pcmcia/soc_common.c | |||
@@ -149,10 +149,10 @@ soc_common_pcmcia_config_skt(struct soc_pcmcia_socket *skt, socket_state_t *stat | |||
149 | */ | 149 | */ |
150 | if (skt->irq_state != 1 && state->io_irq) { | 150 | if (skt->irq_state != 1 && state->io_irq) { |
151 | skt->irq_state = 1; | 151 | skt->irq_state = 1; |
152 | set_irq_type(skt->irq, IRQT_FALLING); | 152 | set_irq_type(skt->irq, IRQ_TYPE_EDGE_FALLING); |
153 | } else if (skt->irq_state == 1 && state->io_irq == 0) { | 153 | } else if (skt->irq_state == 1 && state->io_irq == 0) { |
154 | skt->irq_state = 0; | 154 | skt->irq_state = 0; |
155 | set_irq_type(skt->irq, IRQT_NOEDGE); | 155 | set_irq_type(skt->irq, IRQ_TYPE_NONE); |
156 | } | 156 | } |
157 | 157 | ||
158 | skt->cs_state = *state; | 158 | skt->cs_state = *state; |
@@ -527,7 +527,7 @@ int soc_pcmcia_request_irqs(struct soc_pcmcia_socket *skt, | |||
527 | IRQF_DISABLED, irqs[i].str, skt); | 527 | IRQF_DISABLED, irqs[i].str, skt); |
528 | if (res) | 528 | if (res) |
529 | break; | 529 | break; |
530 | set_irq_type(irqs[i].irq, IRQT_NOEDGE); | 530 | set_irq_type(irqs[i].irq, IRQ_TYPE_NONE); |
531 | } | 531 | } |
532 | 532 | ||
533 | if (res) { | 533 | if (res) { |
@@ -560,7 +560,7 @@ void soc_pcmcia_disable_irqs(struct soc_pcmcia_socket *skt, | |||
560 | 560 | ||
561 | for (i = 0; i < nr; i++) | 561 | for (i = 0; i < nr; i++) |
562 | if (irqs[i].sock == skt->nr) | 562 | if (irqs[i].sock == skt->nr) |
563 | set_irq_type(irqs[i].irq, IRQT_NOEDGE); | 563 | set_irq_type(irqs[i].irq, IRQ_TYPE_NONE); |
564 | } | 564 | } |
565 | EXPORT_SYMBOL(soc_pcmcia_disable_irqs); | 565 | EXPORT_SYMBOL(soc_pcmcia_disable_irqs); |
566 | 566 | ||
@@ -571,8 +571,8 @@ void soc_pcmcia_enable_irqs(struct soc_pcmcia_socket *skt, | |||
571 | 571 | ||
572 | for (i = 0; i < nr; i++) | 572 | for (i = 0; i < nr; i++) |
573 | if (irqs[i].sock == skt->nr) { | 573 | if (irqs[i].sock == skt->nr) { |
574 | set_irq_type(irqs[i].irq, IRQT_RISING); | 574 | set_irq_type(irqs[i].irq, IRQ_TYPE_EDGE_RISING); |
575 | set_irq_type(irqs[i].irq, IRQT_BOTHEDGE); | 575 | set_irq_type(irqs[i].irq, IRQ_TYPE_EDGE_BOTH); |
576 | } | 576 | } |
577 | } | 577 | } |
578 | EXPORT_SYMBOL(soc_pcmcia_enable_irqs); | 578 | EXPORT_SYMBOL(soc_pcmcia_enable_irqs); |