diff options
author | Thomas Gleixner <tglx@linutronix.de> | 2011-03-24 14:47:46 +0100 |
---|---|---|
committer | Thomas Gleixner <tglx@linutronix.de> | 2011-03-29 14:48:13 +0200 |
commit | a821b2793ea958038687c481c1ea7f74c8fcccfd (patch) | |
tree | ce6855fe71c2087b93ad4043ff1970c4199bdc1e | |
parent | 433c9c67c53cc42b2824532d3abb7ac62970d3fb (diff) | |
download | linux-stable-a821b2793ea958038687c481c1ea7f74c8fcccfd.tar.gz linux-stable-a821b2793ea958038687c481c1ea7f74c8fcccfd.tar.bz2 linux-stable-a821b2793ea958038687c481c1ea7f74c8fcccfd.zip |
sh: Use the proper accessor functions
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
-rw-r--r-- | arch/sh/boards/mach-se/7206/irq.c | 3 | ||||
-rw-r--r-- | drivers/sh/intc/core.c | 9 |
2 files changed, 3 insertions, 9 deletions
diff --git a/arch/sh/boards/mach-se/7206/irq.c b/arch/sh/boards/mach-se/7206/irq.c index 9070d7e60704..3308816c127c 100644 --- a/arch/sh/boards/mach-se/7206/irq.c +++ b/arch/sh/boards/mach-se/7206/irq.c @@ -92,9 +92,8 @@ static void eoi_se7206_irq(struct irq_data *data) { unsigned short sts0,sts1; unsigned int irq = data->irq; - struct irq_desc *desc = irq_to_desc(irq); - if (!(desc->status & (IRQ_DISABLED|IRQ_INPROGRESS))) + if (!irqd_irq_disabled(data) && !irqd_irq_inprogress(data)) enable_se7206_irq(data); /* FPGA isr clear */ sts0 = __raw_readw(INTSTS0); diff --git a/drivers/sh/intc/core.c b/drivers/sh/intc/core.c index 5833afbf08d7..2578db524036 100644 --- a/drivers/sh/intc/core.c +++ b/drivers/sh/intc/core.c @@ -387,19 +387,16 @@ static int intc_suspend(void) /* enable wakeup irqs belonging to this intc controller */ for_each_active_irq(irq) { struct irq_data *data; - struct irq_desc *desc; struct irq_chip *chip; data = irq_get_irq_data(irq); chip = irq_data_get_irq_chip(data); if (chip != &d->chip) continue; - desc = irq_to_desc(irq); - if ((desc->status & IRQ_WAKEUP)) + if (irqd_is_wakeup_set(data)) chip->irq_enable(data); } } - return 0; } @@ -412,7 +409,6 @@ static void intc_resume(void) for_each_active_irq(irq) { struct irq_data *data; - struct irq_desc *desc; struct irq_chip *chip; data = irq_get_irq_data(irq); @@ -423,8 +419,7 @@ static void intc_resume(void) */ if (chip != &d->chip) continue; - desc = irq_to_desc(irq); - if (desc->status & IRQ_DISABLED) + if (irqd_irq_disabled(data)) chip->irq_disable(data); else chip->irq_enable(data); |