dect
/
linux-2.6
Archived
13
0
Fork 0
Code Releases Activity

Blackfin: convert mac irq_chip to new functions 

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:34 +00:00 committed by Mike Frysinger
parent dabf64bcc5
commit 172d2d1d84
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -462,8 +462,10 @@ static void bfin_mac_status_ack_irq(unsigned int irq)
} }
} }
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)); mac_stat_int_mask &= ~(1L << (irq - IRQ_MAC_PHYINT));
#ifdef BF537_GENERIC_ERROR_INT_DEMUX #ifdef BF537_GENERIC_ERROR_INT_DEMUX
switch (irq) { switch (irq) {
@ -480,8 +482,10 @@ static void bfin_mac_status_mask_irq(unsigned int irq)
bfin_mac_status_ack_irq(irq); 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 #ifdef BF537_GENERIC_ERROR_INT_DEMUX
switch (irq) { switch (irq) {
case IRQ_MAC_PHYINT: case IRQ_MAC_PHYINT:
@ -498,7 +502,7 @@ static void bfin_mac_status_unmask_irq(unsigned int irq)
} }
#ifdef CONFIG_PM #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 #ifdef BF537_GENERIC_ERROR_INT_DEMUX
return bfin_internal_set_wake(IRQ_GENERIC_ERROR, state); return bfin_internal_set_wake(IRQ_GENERIC_ERROR, state);
@ -511,11 +515,11 @@ int bfin_mac_status_set_wake(unsigned int irq, unsigned int state)
static struct irq_chip bfin_mac_status_irqchip = { static struct irq_chip bfin_mac_status_irqchip = {
.name = "MACST", .name = "MACST",
.irq_ack = bfin_ack_noop, .irq_ack = bfin_ack_noop,
.mask_ack = bfin_mac_status_mask_irq, .irq_mask_ack = bfin_mac_status_mask_irq,
.mask = bfin_mac_status_mask_irq, .irq_mask = bfin_mac_status_mask_irq,
.unmask = bfin_mac_status_unmask_irq, .irq_unmask = bfin_mac_status_unmask_irq,
#ifdef CONFIG_PM #ifdef CONFIG_PM
.set_wake = bfin_mac_status_set_wake, .irq_set_wake = bfin_mac_status_set_wake,
#endif #endif
}; };