|
@@ -61,34 +61,34 @@ struct eic {
|
|
|
static struct eic *nmi_eic;
|
|
|
static bool nmi_enabled;
|
|
|
|
|
|
-static void eic_ack_irq(struct irq_chip *d)
|
|
|
+static void eic_ack_irq(struct irq_data *d)
|
|
|
{
|
|
|
- struct eic *eic = irq_data_get_irq_chip_data(data);
|
|
|
+ struct eic *eic = irq_data_get_irq_chip_data(d);
|
|
|
eic_writel(eic, ICR, 1 << (d->irq - eic->first_irq));
|
|
|
}
|
|
|
|
|
|
-static void eic_mask_irq(struct irq_chip *d)
|
|
|
+static void eic_mask_irq(struct irq_data *d)
|
|
|
{
|
|
|
- struct eic *eic = irq_data_get_irq_chip_data(data);
|
|
|
+ struct eic *eic = irq_data_get_irq_chip_data(d);
|
|
|
eic_writel(eic, IDR, 1 << (d->irq - eic->first_irq));
|
|
|
}
|
|
|
|
|
|
-static void eic_mask_ack_irq(struct irq_chip *d)
|
|
|
+static void eic_mask_ack_irq(struct irq_data *d)
|
|
|
{
|
|
|
- struct eic *eic = irq_data_get_irq_chip_data(data);
|
|
|
+ struct eic *eic = irq_data_get_irq_chip_data(d);
|
|
|
eic_writel(eic, ICR, 1 << (d->irq - eic->first_irq));
|
|
|
eic_writel(eic, IDR, 1 << (d->irq - eic->first_irq));
|
|
|
}
|
|
|
|
|
|
-static void eic_unmask_irq(struct irq_chip *d)
|
|
|
+static void eic_unmask_irq(struct irq_data *d)
|
|
|
{
|
|
|
- struct eic *eic = irq_data_get_irq_chip_data(data);
|
|
|
+ struct eic *eic = irq_data_get_irq_chip_data(d);
|
|
|
eic_writel(eic, IER, 1 << (d->irq - eic->first_irq));
|
|
|
}
|
|
|
|
|
|
-static int eic_set_irq_type(struct irq_chip *d, unsigned int flow_type)
|
|
|
+static int eic_set_irq_type(struct irq_data *d, unsigned int flow_type)
|
|
|
{
|
|
|
- struct eic *eic = irq_data_get_irq_chip_data(data);
|
|
|
+ struct eic *eic = irq_data_get_irq_chip_data(d);
|
|
|
unsigned int irq = d->irq;
|
|
|
unsigned int i = irq - eic->first_irq;
|
|
|
u32 mode, edge, level;
|
|
@@ -191,7 +191,7 @@ static int __init eic_probe(struct platform_device *pdev)
|
|
|
|
|
|
regs = platform_get_resource(pdev, IORESOURCE_MEM, 0);
|
|
|
int_irq = platform_get_irq(pdev, 0);
|
|
|
- if (!regs || !int_irq) {
|
|
|
+ if (!regs || (int)int_irq <= 0) {
|
|
|
dev_dbg(&pdev->dev, "missing regs and/or irq resource\n");
|
|
|
return -ENXIO;
|
|
|
}
|