mirror of
https://github.com/torvalds/linux.git
synced 2024-10-25 22:44:30 +00:00
sh: Use the proper accessor functions
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
This commit is contained in:
parent
433c9c67c5
commit
a821b2793e
|
@ -92,9 +92,8 @@ static void eoi_se7206_irq(struct irq_data *data)
|
||||||
{
|
{
|
||||||
unsigned short sts0,sts1;
|
unsigned short sts0,sts1;
|
||||||
unsigned int irq = data->irq;
|
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);
|
enable_se7206_irq(data);
|
||||||
/* FPGA isr clear */
|
/* FPGA isr clear */
|
||||||
sts0 = __raw_readw(INTSTS0);
|
sts0 = __raw_readw(INTSTS0);
|
||||||
|
|
|
@ -387,19 +387,16 @@ static int intc_suspend(void)
|
||||||
/* enable wakeup irqs belonging to this intc controller */
|
/* enable wakeup irqs belonging to this intc controller */
|
||||||
for_each_active_irq(irq) {
|
for_each_active_irq(irq) {
|
||||||
struct irq_data *data;
|
struct irq_data *data;
|
||||||
struct irq_desc *desc;
|
|
||||||
struct irq_chip *chip;
|
struct irq_chip *chip;
|
||||||
|
|
||||||
data = irq_get_irq_data(irq);
|
data = irq_get_irq_data(irq);
|
||||||
chip = irq_data_get_irq_chip(data);
|
chip = irq_data_get_irq_chip(data);
|
||||||
if (chip != &d->chip)
|
if (chip != &d->chip)
|
||||||
continue;
|
continue;
|
||||||
desc = irq_to_desc(irq);
|
if (irqd_is_wakeup_set(data))
|
||||||
if ((desc->status & IRQ_WAKEUP))
|
|
||||||
chip->irq_enable(data);
|
chip->irq_enable(data);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -412,7 +409,6 @@ static void intc_resume(void)
|
||||||
|
|
||||||
for_each_active_irq(irq) {
|
for_each_active_irq(irq) {
|
||||||
struct irq_data *data;
|
struct irq_data *data;
|
||||||
struct irq_desc *desc;
|
|
||||||
struct irq_chip *chip;
|
struct irq_chip *chip;
|
||||||
|
|
||||||
data = irq_get_irq_data(irq);
|
data = irq_get_irq_data(irq);
|
||||||
|
@ -423,8 +419,7 @@ static void intc_resume(void)
|
||||||
*/
|
*/
|
||||||
if (chip != &d->chip)
|
if (chip != &d->chip)
|
||||||
continue;
|
continue;
|
||||||
desc = irq_to_desc(irq);
|
if (irqd_irq_disabled(data))
|
||||||
if (desc->status & IRQ_DISABLED)
|
|
||||||
chip->irq_disable(data);
|
chip->irq_disable(data);
|
||||||
else
|
else
|
||||||
chip->irq_enable(data);
|
chip->irq_enable(data);
|
||||||
|
|
Loading…
Reference in New Issue
Block a user