aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbibo,mao <bibo.mao@intel.com>2006-05-31 18:17:33 +0800
committerGreg Kroah-Hartman <gregkh@suse.de>2006-06-21 12:00:00 -0700
commitb209a6ee49099b7500abf024f7b6b9648b5a3eac (patch)
tree6e6c614ae010aa92e9ded5e55c3a913f3c6c9dd3
parent99dc804d9bcc2c53f4c20c291bf4e185312a1a0c (diff)
[PATCH] PCI: cleanup unused variable about msi driver
In IA64 platform, msi driver does not use irq_vector variable, and in x86 platform LAST_DEVICE_VECTOR should one before FIRST_SYSTEM_VECTOR, this patch modify this. Signed-off-by: bibo, mao <bibo.mao@intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-rw-r--r--drivers/pci/msi.c5
-rw-r--r--include/asm-i386/msi.h2
-rw-r--r--include/asm-x86_64/msi.h2
3 files changed, 2 insertions, 7 deletions
diff --git a/drivers/pci/msi.c b/drivers/pci/msi.c
index 3ec558dc652..a81c5b99daf 100644
--- a/drivers/pci/msi.c
+++ b/drivers/pci/msi.c
@@ -35,7 +35,6 @@ static int nr_msix_devices;
#ifndef CONFIG_X86_IO_APIC
int vector_irq[NR_VECTORS] = { [0 ... NR_VECTORS - 1] = -1};
-u8 irq_vector[NR_IRQ_VECTORS];
#endif
static struct msi_ops *msi_ops;
@@ -383,10 +382,6 @@ static int msi_init(void)
return status;
}
-#ifndef CONFIG_X86_IO_APIC
- irq_vector[0] = FIRST_DEVICE_VECTOR;
-#endif
-
if (last_alloc_vector < 0) {
pci_msi_enable = 0;
printk(KERN_WARNING "PCI: No interrupt vectors available for MSI\n");
diff --git a/include/asm-i386/msi.h b/include/asm-i386/msi.h
index ed1014235e9..b11c4b7dfae 100644
--- a/include/asm-i386/msi.h
+++ b/include/asm-i386/msi.h
@@ -9,7 +9,7 @@
#include <asm/desc.h>
#include <mach_apic.h>
-#define LAST_DEVICE_VECTOR 232
+#define LAST_DEVICE_VECTOR (FIRST_SYSTEM_VECTOR - 1)
#define MSI_TARGET_CPU_SHIFT 12
extern struct msi_ops msi_apic_ops;
diff --git a/include/asm-x86_64/msi.h b/include/asm-x86_64/msi.h
index 8d6d6bf8fad..3ad2346624b 100644
--- a/include/asm-x86_64/msi.h
+++ b/include/asm-x86_64/msi.h
@@ -10,7 +10,7 @@
#include <asm/mach_apic.h>
#include <asm/smp.h>
-#define LAST_DEVICE_VECTOR 232
+#define LAST_DEVICE_VECTOR (FIRST_SYSTEM_VECTOR - 1)
#define MSI_TARGET_CPU_SHIFT 12
extern struct msi_ops msi_apic_ops;