diff options
author | Thomas Gleixner <tglx@linutronix.de> | 2010-09-28 13:09:51 -0400 |
---|---|---|
committer | Thomas Gleixner <tglx@linutronix.de> | 2010-10-12 10:53:34 -0400 |
commit | 39431acb1a4c464e62471cb3058b8ffffb9244db (patch) | |
tree | ae655b4763f5a801b67b98d9131df534bcdd58d8 /arch | |
parent | 1c9db52534a2c0e9776788cd34ccc193289fc18c (diff) |
pci: Cleanup the irq_desc mess in msi
Handing down irq_desc to msi just so that msi can access
irq_desc.irq_data.msi_desc is a pretty stupid idea. The calling code
can hand down a pointer to msi_desc so msi code does not need to know
about the irq descriptor at all.
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Reviewed-by: Ingo Molnar <mingo@elte.hu>
Acked-by: Jesse Barnes <jbarnes@virtuousgeek.org>
Diffstat (limited to 'arch')
-rw-r--r-- | arch/x86/kernel/apic/io_apic.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/kernel/apic/io_apic.c b/arch/x86/kernel/apic/io_apic.c index b79938ff9bde..74bb027b517e 100644 --- a/arch/x86/kernel/apic/io_apic.c +++ b/arch/x86/kernel/apic/io_apic.c | |||
@@ -3383,14 +3383,14 @@ static int set_msi_irq_affinity(unsigned int irq, const struct cpumask *mask) | |||
3383 | 3383 | ||
3384 | cfg = desc->chip_data; | 3384 | cfg = desc->chip_data; |
3385 | 3385 | ||
3386 | get_cached_msi_msg_desc(desc, &msg); | 3386 | __get_cached_msi_msg(desc->irq_data.msi_desc, &msg); |
3387 | 3387 | ||
3388 | msg.data &= ~MSI_DATA_VECTOR_MASK; | 3388 | msg.data &= ~MSI_DATA_VECTOR_MASK; |
3389 | msg.data |= MSI_DATA_VECTOR(cfg->vector); | 3389 | msg.data |= MSI_DATA_VECTOR(cfg->vector); |
3390 | msg.address_lo &= ~MSI_ADDR_DEST_ID_MASK; | 3390 | msg.address_lo &= ~MSI_ADDR_DEST_ID_MASK; |
3391 | msg.address_lo |= MSI_ADDR_DEST_ID(dest); | 3391 | msg.address_lo |= MSI_ADDR_DEST_ID(dest); |
3392 | 3392 | ||
3393 | write_msi_msg_desc(desc, &msg); | 3393 | __write_msi_msg(desc->irq_data.msi_desc, &msg); |
3394 | 3394 | ||
3395 | return 0; | 3395 | return 0; |
3396 | } | 3396 | } |