|
@@ -134,9 +134,9 @@ static int eic_set_irq_type(struct irq_chip *d, unsigned int flow_type)
|
|
|
|
|
|
if (flow_type & (IRQ_TYPE_LEVEL_LOW | IRQ_TYPE_LEVEL_HIGH)) {
|
|
|
flow_type |= IRQ_LEVEL;
|
|
|
- __set_irq_handler_unlocked(irq, handle_level_irq);
|
|
|
+ __irq_set_handler_locked(irq, handle_level_irq);
|
|
|
} else
|
|
|
- __set_irq_handler_unlocked(irq, handle_edge_irq);
|
|
|
+ __irq_set_handler_locked(irq, handle_edge_irq);
|
|
|
desc->status &= ~(IRQ_TYPE_SENSE_MASK | IRQ_LEVEL);
|
|
|
desc->status |= flow_type;
|
|
|
}
|
|
@@ -155,7 +155,7 @@ static struct irq_chip eic_chip = {
|
|
|
|
|
|
static void demux_eic_irq(unsigned int irq, struct irq_desc *desc)
|
|
|
{
|
|
|
- struct eic *eic = get_irq_desc_data(desc);
|
|
|
+ struct eic *eic = irq_desc_get_handler_data(desc);
|
|
|
unsigned long status, pending;
|
|
|
unsigned int i;
|
|
|
|
|
@@ -235,13 +235,13 @@ static int __init eic_probe(struct platform_device *pdev)
|
|
|
eic->chip = &eic_chip;
|
|
|
|
|
|
for (i = 0; i < nr_of_irqs; i++) {
|
|
|
- set_irq_chip_and_handler(eic->first_irq + i, &eic_chip,
|
|
|
+ irq_set_chip_and_handler(eic->first_irq + i, &eic_chip,
|
|
|
handle_level_irq);
|
|
|
- set_irq_chip_data(eic->first_irq + i, eic);
|
|
|
+ irq_set_chip_data(eic->first_irq + i, eic);
|
|
|
}
|
|
|
|
|
|
- set_irq_chained_handler(int_irq, demux_eic_irq);
|
|
|
- set_irq_data(int_irq, eic);
|
|
|
+ irq_set_chained_handler(int_irq, demux_eic_irq);
|
|
|
+ irq_set_handler_data(int_irq, eic);
|
|
|
|
|
|
if (pdev->id == 0) {
|
|
|
nmi_eic = eic;
|