Skip to contentSkip to conversation

cleanup unused variable about msi driver

Cleanup bibo,mao 1 participant 1 message May 31, 2006 PCI

lore
Share & tools
lore

bibo,mao

author
#0 lore raw

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.

Thanks
Bibo,mao
---

drivers/pci/msi.c +0 -0
diff -Nruap 2.6.17-rc5-mm1.org/drivers/pci/msi.c 2.6.17-rc5-mm1/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");
include/asm-i386/msi.h +0 -0
diff -Nruap 2.6.17-rc5-mm1.org/include/asm-i386/msi.h 2.6.17-rc5-mm1/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;

include/asm-x86_64/msi.h +0 -0
diff -Nruap 2.6.17-rc5-mm1.org/include/asm-x86_64/msi.h 2.6.17-rc5-mm1/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;