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

x86/ioapic.c: clean up replace_pin_at_irq_node logic and comments

Browse source 
There's no need for a control variable in replace_pin_at_irq_node();
it can just return if it finds the old apic/pin to replace.

If the loop terminates, then it didn't find the old apic/pin, so it can
add the new ones.

Signed-off-by: Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>
This commit is contained in:
Jeremy Fitzhardinge 2009-06-08 03:32:15 -07:00
parent 535b64291a
commit 4eea6fff61
1 changed files with 5 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -512,25 +512,22 @@ static void add_pin_to_irq_node(struct irq_cfg *cfg, int node, int apic, int pin
* Reroute an IRQ to a different pin. * Reroute an IRQ to a different pin.
*/ */
static void __init replace_pin_at_irq_node(struct irq_cfg *cfg, int node, static void __init replace_pin_at_irq_node(struct irq_cfg *cfg, int node,
int oldapic, int oldpin, int oldapic, int oldpin,
int newapic, int newpin) int newapic, int newpin)
{ {
struct irq_pin_list *entry; struct irq_pin_list *entry;
int replaced = 0;
for (entry = cfg->irq_2_pin; entry != NULL; entry = entry->next) { for (entry = cfg->irq_2_pin; entry != NULL; entry = entry->next) {
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;
replaced = 1;
/* every one is different, right? */ /* every one is different, right? */
break; return;
} }
} }
/* why? call replace before add? */ /* old apic/pin didn't exist, so just add new ones */
if (!replaced) add_pin_to_irq_node(cfg, node, newapic, newpin);
add_pin_to_irq_node(cfg, node, newapic, newpin);
} }
static void io_apic_modify_irq(struct irq_cfg *cfg, static void io_apic_modify_irq(struct irq_cfg *cfg,