Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

x86, ioapic: Introduce for_each_irq_pin() helper

Browse source 
This allow us to save a few lines of code.

Signed-off-by: Cyrill Gorcunov <gorcunov@openvz.org>
Cc: yinghai@kernel.org
LKML-Reference: <20090801075435.597863129@openvz.org>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
This commit is contained in:
Cyrill Gorcunov 2009-08-01 11:47:59 +04:00 committed by Ingo Molnar
parent 25f6e89bed
commit 2977fb3ffc
1 changed files with 15 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

43
arch/x86/kernel/apic/io_apic.c
View file

@ -66,6 +66,8 @@
#include <asm/apic.h> #include <asm/apic.h>
#define __apicdebuginit(type) static type __init #define __apicdebuginit(type) static type __init
#define for_each_irq_pin(entry, head) \
for (entry = head; entry; entry = entry->next)
/* /*
* Is the SiS APIC rmw bug present ? * Is the SiS APIC rmw bug present ?
@ -410,7 +412,7 @@ static bool io_apic_level_ack_pending(struct irq_cfg *cfg)
unsigned long flags; unsigned long flags;
spin_lock_irqsave(&ioapic_lock, flags); spin_lock_irqsave(&ioapic_lock, flags);
for (entry = cfg->irq_2_pin; entry != NULL; entry = entry->next) { for_each_irq_pin(entry, cfg->irq_2_pin) {
unsigned int reg; unsigned int reg;
int pin; int pin;
@ -490,22 +492,21 @@ static void ioapic_mask_entry(int apic, int pin)
*/ */
static void add_pin_to_irq_node(struct irq_cfg *cfg, int node, int apic, int pin) static void add_pin_to_irq_node(struct irq_cfg *cfg, int node, int apic, int pin)
{ {
struct irq_pin_list **entryp, *entry; struct irq_pin_list **last, *entry;
for (entryp = &cfg->irq_2_pin; /* don't allow duplicates */
*entryp != NULL; last = &cfg->irq_2_pin;
entryp = &(*entryp)->next) { for_each_irq_pin(entry, cfg->irq_2_pin) {
entry = *entryp;
/* not again, please */
if (entry->apic == apic && entry->pin == pin) if (entry->apic == apic && entry->pin == pin)
return; return;
last = &entry->next;
} }
entry = get_one_free_irq_2_pin(node); entry = get_one_free_irq_2_pin(node);
entry->apic = apic; entry->apic = apic;
entry->pin = pin; entry->pin = pin;
*entryp = entry; *last = entry;
} }
/* /*
@ -517,7 +518,7 @@ static void __init replace_pin_at_irq_node(struct irq_cfg *cfg, int node,
{ {
struct irq_pin_list *entry; struct irq_pin_list *entry;
for (entry = cfg->irq_2_pin; entry != NULL; entry = entry->next) { for_each_irq_pin(entry, cfg->irq_2_pin) {
if (entry->apic == oldapic && entry->pin == oldpin) { if (entry->apic == oldapic && entry->pin == oldpin) {
entry->apic = newapic; entry->apic = newapic;
entry->pin = newpin; entry->pin = newpin;
@ -537,7 +538,7 @@ static void io_apic_modify_irq(struct irq_cfg *cfg,
int pin; int pin;
struct irq_pin_list *entry; struct irq_pin_list *entry;
for (entry = cfg->irq_2_pin; entry != NULL; entry = entry->next) { for_each_irq_pin(entry, cfg->irq_2_pin) {
unsigned int reg; unsigned int reg;
pin = entry->pin; pin = entry->pin;
reg = io_apic_read(entry->apic, 0x10 + pin * 2); reg = io_apic_read(entry->apic, 0x10 + pin * 2);
@ -1669,12 +1670,8 @@ __apicdebuginit(void) print_IO_APIC(void)
if (!entry) if (!entry)
continue; continue;
printk(KERN_DEBUG "IRQ%d ", irq); printk(KERN_DEBUG "IRQ%d ", irq);
for (;;) { for_each_irq_pin(entry, cfg->irq_2_pin)
printk("-> %d:%d", entry->apic, entry->pin); printk("-> %d:%d", entry->apic, entry->pin);
if (!entry->next)
break;
entry = entry->next;
}
printk("\n"); printk("\n");
} }
@ -2227,7 +2224,7 @@ static void __target_IO_APIC_irq(unsigned int irq, unsigned int dest, struct irq
struct irq_pin_list *entry; struct irq_pin_list *entry;
u8 vector = cfg->vector; u8 vector = cfg->vector;
for (entry = cfg->irq_2_pin; entry != NULL; entry = entry->next) { for_each_irq_pin(entry, cfg->irq_2_pin) {
unsigned int reg; unsigned int reg;
apic = entry->apic; apic = entry->apic;
@ -2556,20 +2553,10 @@ static void ack_apic_level(unsigned int irq)
#ifdef CONFIG_INTR_REMAP #ifdef CONFIG_INTR_REMAP
static void __eoi_ioapic_irq(unsigned int irq, struct irq_cfg *cfg) static void __eoi_ioapic_irq(unsigned int irq, struct irq_cfg *cfg)
{ {
int apic, pin;
struct irq_pin_list *entry; struct irq_pin_list *entry;
entry = cfg->irq_2_pin; for_each_irq_pin(entry, cfg->irq_2_pin)
for (;;) { io_apic_eoi(entry->apic, entry->pin);
if (!entry)
break;
apic = entry->apic;
pin = entry->pin;
io_apic_eoi(apic, pin);
entry = entry->next;
}
} }
static void static void