|
@@ -260,13 +260,13 @@ static int s3c64xx_irq_get_trigger(unsigned int type)
|
|
return trigger;
|
|
return trigger;
|
|
}
|
|
}
|
|
|
|
|
|
-static void s3c64xx_irq_set_handler(unsigned int irq, unsigned int type)
|
|
|
|
|
|
+static void s3c64xx_irq_set_handler(struct irq_data *d, unsigned int type)
|
|
{
|
|
{
|
|
/* Edge- and level-triggered interrupts need different handlers */
|
|
/* Edge- and level-triggered interrupts need different handlers */
|
|
if (type & IRQ_TYPE_EDGE_BOTH)
|
|
if (type & IRQ_TYPE_EDGE_BOTH)
|
|
- __irq_set_handler_locked(irq, handle_edge_irq);
|
|
|
|
|
|
+ irq_set_handler_locked(d, handle_edge_irq);
|
|
else
|
|
else
|
|
- __irq_set_handler_locked(irq, handle_level_irq);
|
|
|
|
|
|
+ irq_set_handler_locked(d, handle_level_irq);
|
|
}
|
|
}
|
|
|
|
|
|
static void s3c64xx_irq_set_function(struct samsung_pinctrl_drv_data *d,
|
|
static void s3c64xx_irq_set_function(struct samsung_pinctrl_drv_data *d,
|
|
@@ -356,7 +356,7 @@ static int s3c64xx_gpio_irq_set_type(struct irq_data *irqd, unsigned int type)
|
|
return -EINVAL;
|
|
return -EINVAL;
|
|
}
|
|
}
|
|
|
|
|
|
- s3c64xx_irq_set_handler(irqd->irq, type);
|
|
|
|
|
|
+ s3c64xx_irq_set_handler(irqd, type);
|
|
|
|
|
|
/* Set up interrupt trigger */
|
|
/* Set up interrupt trigger */
|
|
reg = d->virt_base + EINTCON_REG(bank->eint_offset);
|
|
reg = d->virt_base + EINTCON_REG(bank->eint_offset);
|
|
@@ -567,7 +567,7 @@ static int s3c64xx_eint0_irq_set_type(struct irq_data *irqd, unsigned int type)
|
|
return -EINVAL;
|
|
return -EINVAL;
|
|
}
|
|
}
|
|
|
|
|
|
- s3c64xx_irq_set_handler(irqd->irq, type);
|
|
|
|
|
|
+ s3c64xx_irq_set_handler(irqd, type);
|
|
|
|
|
|
/* Set up interrupt trigger */
|
|
/* Set up interrupt trigger */
|
|
reg = d->virt_base + EINT0CON0_REG;
|
|
reg = d->virt_base + EINT0CON0_REG;
|