Title: [9713] trunk/arch/blackfin/mach-common/ints-priority.c: blackfin: Convert mac irq_chip to new functions
- Revision
- 9713
- Author
- vapier
- Date
- 2011-03-16 16:34:24 -0400 (Wed, 16 Mar 2011)
Log Message
blackfin: Convert mac irq_chip to new functions
From: Thomas Gleixner <[email protected]>
Modified Paths
Diff
Modified: trunk/arch/blackfin/mach-common/ints-priority.c (9712 => 9713)
--- trunk/arch/blackfin/mach-common/ints-priority.c 2011-03-16 20:33:31 UTC (rev 9712)
+++ trunk/arch/blackfin/mach-common/ints-priority.c 2011-03-16 20:34:24 UTC (rev 9713)
@@ -447,8 +447,10 @@
}
}
-static void bfin_mac_status_mask_irq(unsigned int irq)
+static void bfin_mac_status_mask_irq(struct irq_data *d)
{
+ unsigned int irq = d->irq;
+
mac_stat_int_mask &= ~(1L << (irq - IRQ_MAC_PHYINT));
#ifdef BF537_GENERIC_ERROR_INT_DEMUX
switch (irq) {
@@ -465,8 +467,10 @@
bfin_mac_status_ack_irq(irq);
}
-static void bfin_mac_status_unmask_irq(unsigned int irq)
+static void bfin_mac_status_unmask_irq(struct irq_data *d)
{
+ unsigned int irq = d->irq;
+
#ifdef BF537_GENERIC_ERROR_INT_DEMUX
switch (irq) {
case IRQ_MAC_PHYINT:
@@ -483,7 +487,7 @@
}
#ifdef CONFIG_PM
-int bfin_mac_status_set_wake(unsigned int irq, unsigned int state)
+int bfin_mac_status_set_wake(struct irq_data *d, unsigned int state)
{
#ifdef BF537_GENERIC_ERROR_INT_DEMUX
return bfin_internal_set_wake(IRQ_GENERIC_ERROR, state);
@@ -496,11 +500,11 @@
static struct irq_chip bfin_mac_status_irqchip = {
.name = "MACST",
.irq_ack = bfin_ack_noop,
- .mask_ack = bfin_mac_status_mask_irq,
- .mask = bfin_mac_status_mask_irq,
- .unmask = bfin_mac_status_unmask_irq,
+ .irq_mask_ack = bfin_mac_status_mask_irq,
+ .irq_mask = bfin_mac_status_mask_irq,
+ .irq_unmask = bfin_mac_status_unmask_irq,
#ifdef CONFIG_PM
- .set_wake = bfin_mac_status_set_wake,
+ .irq_set_wake = bfin_mac_status_set_wake,
#endif
};
_______________________________________________
Linux-kernel-commits mailing list
[email protected]
https://blackfin.uclinux.org/mailman/listinfo/linux-kernel-commits
