lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Blackfin: convert error irq_chip to new functions

Browse Source 
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
This commit is contained in:
Thomas Gleixner
2011-02-06 18:23:31 +00:00
committed by Mike Frysinger
parent ff43a67f67
commit dabf64bcc5
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
arch/blackfin/mach-common/ints-priority.c
View File

@@ -334,25 +334,25 @@ static void bfin_handle_irq(unsigned irq)
#ifdef BF537_GENERIC_ERROR_INT_DEMUX #ifdef BF537_GENERIC_ERROR_INT_DEMUX
static int error_int_mask; static int error_int_mask;
static void bfin_generic_error_mask_irq(unsigned int irq) static void bfin_generic_error_mask_irq(struct irq_data *d)
{ {
error_int_mask &= ~(1L << (irq - IRQ_PPI_ERROR)); error_int_mask &= ~(1L << (d->irq - IRQ_PPI_ERROR));
if (!error_int_mask) if (!error_int_mask)
bfin_internal_mask_irq(IRQ_GENERIC_ERROR); bfin_internal_mask_irq(IRQ_GENERIC_ERROR);
} }
static void bfin_generic_error_unmask_irq(unsigned int irq) static void bfin_generic_error_unmask_irq(struct irq_data *d)
{ {
bfin_internal_unmask_irq(IRQ_GENERIC_ERROR); bfin_internal_unmask_irq(IRQ_GENERIC_ERROR);
error_int_mask |= 1L << (irq - IRQ_PPI_ERROR); error_int_mask |= 1L << (d->irq - IRQ_PPI_ERROR);
} }
static struct irq_chip bfin_generic_error_irqchip = { static struct irq_chip bfin_generic_error_irqchip = {
.name = "ERROR", .name = "ERROR",
.irq_ack = bfin_ack_noop, .irq_ack = bfin_ack_noop,
.mask_ack = bfin_generic_error_mask_irq, .irq_mask_ack = bfin_generic_error_mask_irq,
.mask = bfin_generic_error_mask_irq, .irq_mask = bfin_generic_error_mask_irq,
.unmask = bfin_generic_error_unmask_irq, .irq_unmask = bfin_generic_error_unmask_irq,
}; };
static void bfin_demux_error_irq(unsigned int int_err_irq, static void bfin_demux_error_irq(unsigned int int_err_irq,