Title: [9712] trunk/arch/blackfin/mach-common/ints-priority.c: blackfin: Convert error irq_chip to new functions
- Revision
- 9712
- Author
- vapier
- Date
- 2011-03-16 16:33:31 -0400 (Wed, 16 Mar 2011)
Log Message
blackfin: Convert error irq_chip to new functions
From: Thomas Gleixner <[email protected]>
Modified Paths
Diff
Modified: trunk/arch/blackfin/mach-common/ints-priority.c (9711 => 9712)
--- trunk/arch/blackfin/mach-common/ints-priority.c 2011-03-16 20:32:46 UTC (rev 9711)
+++ trunk/arch/blackfin/mach-common/ints-priority.c 2011-03-16 20:33:31 UTC (rev 9712)
@@ -319,25 +319,25 @@
#ifdef BF537_GENERIC_ERROR_INT_DEMUX
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)
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);
- 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 = {
.name = "ERROR",
.irq_ack = bfin_ack_noop,
- .mask_ack = bfin_generic_error_mask_irq,
- .mask = bfin_generic_error_mask_irq,
- .unmask = bfin_generic_error_unmask_irq,
+ .irq_mask_ack = bfin_generic_error_mask_irq,
+ .irq_mask = bfin_generic_error_mask_irq,
+ .irq_unmask = bfin_generic_error_unmask_irq,
};
static void bfin_demux_error_irq(unsigned int int_err_irq,
_______________________________________________
Linux-kernel-commits mailing list
[email protected]
https://blackfin.uclinux.org/mailman/listinfo/linux-kernel-commits
