tjh.dev
Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Blackfin: convert error irq_chip to new functions
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
authored by
Thomas Gleixner
and committed by
Mike Frysinger
dabf64bc
ff43a67f
+7
-7
+7
-7
arch/blackfin/mach-common/ints-priority.c
+7
-7
arch/blackfin/mach-common/ints-priority.c
···
334
334
#ifdef BF537_GENERIC_ERROR_INT_DEMUX
335
335
static int error_int_mask;
336
336
337
-
static void bfin_generic_error_mask_irq(unsigned int irq)
337
+
static void bfin_generic_error_mask_irq(struct irq_data *d)
338
338
{
339
-
error_int_mask &= ~(1L << (irq - IRQ_PPI_ERROR));
339
+
error_int_mask &= ~(1L << (d->irq - IRQ_PPI_ERROR));
340
340
if (!error_int_mask)
341
341
bfin_internal_mask_irq(IRQ_GENERIC_ERROR);
342
342
}
343
343
344
-
static void bfin_generic_error_unmask_irq(unsigned int irq)
344
+
static void bfin_generic_error_unmask_irq(struct irq_data *d)
345
345
{
346
346
bfin_internal_unmask_irq(IRQ_GENERIC_ERROR);
347
-
error_int_mask |= 1L << (irq - IRQ_PPI_ERROR);
347
+
error_int_mask |= 1L << (d->irq - IRQ_PPI_ERROR);
348
348
}
349
349
350
350
static struct irq_chip bfin_generic_error_irqchip = {
351
351
.name = "ERROR",
352
352
.irq_ack = bfin_ack_noop,
353
-
.mask_ack = bfin_generic_error_mask_irq,
354
-
.mask = bfin_generic_error_mask_irq,
355
-
.unmask = bfin_generic_error_unmask_irq,
353
+
.irq_mask_ack = bfin_generic_error_mask_irq,
354
+
.irq_mask = bfin_generic_error_mask_irq,
355
+
.irq_unmask = bfin_generic_error_unmask_irq,
356
356
};
357
357
358
358
static void bfin_demux_error_irq(unsigned int int_err_irq,