[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>

diff --git a/drivers/pci/msi.c b/drivers/pci/msi.c
index 3ec558dc6523362a4bc2b86c0f64724624d1a1e3..a81c5b99daf3d205fc3a40e6025b5cc87a2f31e8 100644 (file)
--- 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 ed1014235e9c58bd7d57f1e94ed23cf5e131c92e..b11c4b7dfaeffce9833a264cadb0f484e38fee2f 100644 (file)
--- 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 8d6d6bf8fad5640ba6001d6de535f1efb077c994..3ad2346624b21bf02d807a4623c501498293e32d 100644 (file)
--- 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;