Skip to content

Commit

Permalink
x86/ioapic.c: clean up replace_pin_at_irq_node logic and comments
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Jeremy Fitzhardinge committed Jul 14, 2009
1 parent 535b642 commit 4eea6ff
Showing 1 changed file with 5 additions and 8 deletions.
13 changes: 5 additions & 8 deletions arch/x86/kernel/apic/io_apic.c
Original file line number Diff line number Diff line change
Expand Up @@ -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.
*/
static void __init replace_pin_at_irq_node(struct irq_cfg *cfg, int node,
int oldapic, int oldpin,
int newapic, int newpin)
int oldapic, int oldpin,
int newapic, int newpin)
{
struct irq_pin_list *entry;
int replaced = 0;

for (entry = cfg->irq_2_pin; entry != NULL; entry = entry->next) {
if (entry->apic == oldapic && entry->pin == oldpin) {
entry->apic = newapic;
entry->pin = newpin;
replaced = 1;
/* every one is different, right? */
break;
return;
}
}

/* why? call replace before add? */
if (!replaced)
add_pin_to_irq_node(cfg, node, newapic, newpin);
/* old apic/pin didn't exist, so just add new ones */
add_pin_to_irq_node(cfg, node, newapic, newpin);
}

static void io_apic_modify_irq(struct irq_cfg *cfg,
Expand Down

0 comments on commit 4eea6ff

Please sign in to comment.