lkml.org 
[lkml]   [2009]   [Jun]   [16]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 14/16] x86/ioapic.c: clean up replace_pin_at_irq_node logic and comments
    Date
    From: Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>

    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>
    ---
    arch/x86/kernel/apic/io_apic.c | 13 +++++--------
    1 files changed, 5 insertions(+), 8 deletions(-)
    diff --git a/arch/x86/kernel/apic/io_apic.c b/arch/x86/kernel/apic/io_apic.c
    index b71d2a2..f466a1e 100644
    --- a/arch/x86/kernel/apic/io_apic.c
    +++ b/arch/x86/kernel/apic/io_apic.c
    @@ -509,25 +509,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,
    --
    1.6.2.2


    \
     
     \ /
      Last update: 2009-06-16 22:21    [W:0.094 / U:0.488 seconds]
    ©2003-2011 Jasper Spaans. Advertise on this site