Merge branch 'upstream' of git://git.infradead.org/users/pcmoore/audit

[cascardo/linux.git] / arch / mips / pci / ops-pmcmsp.c

diff --git a/arch/mips/pci/ops-pmcmsp.c b/arch/mips/pci/ops-pmcmsp.c
index 50034f9..dd2d9f7 100644 (file)
--- a/arch/mips/pci/ops-pmcmsp.c
+++ b/arch/mips/pci/ops-pmcmsp.c
@@ -193,8 +193,6 @@ static void pci_proc_init(void)
 }
 #endif /* CONFIG_PROC_FS && PCI_COUNTERS */
 
-static DEFINE_SPINLOCK(bpci_lock);
-
 /*****************************************************************************
  *
  *  STRUCT: pci_io_resource
@@ -368,7 +366,6 @@ int msp_pcibios_config_access(unsigned char access_type,
        struct msp_pci_regs *preg = (void *)PCI_BASE_REG;
        unsigned char bus_num = bus->number;
        unsigned char dev_fn = (unsigned char)devfn;
-       unsigned long flags;
        unsigned long intr;
        unsigned long value;
        static char pciirqflag;
@@ -401,10 +398,7 @@ int msp_pcibios_config_access(unsigned char access_type,
        }
 
 #if defined(CONFIG_PMC_MSP7120_GW) || defined(CONFIG_PMC_MSP7120_EVAL)
-       local_irq_save(flags);
        vpe_status = dvpe();
-#else
-       spin_lock_irqsave(&bpci_lock, flags);
 #endif
 
        /*
@@ -457,9 +451,6 @@ int msp_pcibios_config_access(unsigned char access_type,
 
 #if defined(CONFIG_PMC_MSP7120_GW) || defined(CONFIG_PMC_MSP7120_EVAL)
                evpe(vpe_status);
-               local_irq_restore(flags);
-#else
-               spin_unlock_irqrestore(&bpci_lock, flags);
 #endif
 
                return -1;
@@ -467,9 +458,6 @@ int msp_pcibios_config_access(unsigned char access_type,
 
 #if defined(CONFIG_PMC_MSP7120_GW) || defined(CONFIG_PMC_MSP7120_EVAL)
        evpe(vpe_status);
-       local_irq_restore(flags);
-#else
-       spin_unlock_irqrestore(&bpci_lock, flags);
 #endif
 
        return PCIBIOS_SUCCESSFUL;