Commit c4a30537 authored by Sergey Ryazanov's avatar Sergey Ryazanov Committed by Ralf Baechle

MIPS: MSP71xx: remove odd locking in PCI config space access code

Caller (generic PCI code) already do proper locking so no need to add
another one here.
Signed-off-by: default avatarSergey Ryazanov <ryazanov.s.a@gmail.com>
Cc: Linux MIPS <linux-mips@linux-mips.org>
Patchwork: https://patchwork.linux-mips.org/patch/7601/Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
parent 6ff9c2fc
...@@ -193,8 +193,6 @@ static void pci_proc_init(void) ...@@ -193,8 +193,6 @@ static void pci_proc_init(void)
} }
#endif /* CONFIG_PROC_FS && PCI_COUNTERS */ #endif /* CONFIG_PROC_FS && PCI_COUNTERS */
static DEFINE_SPINLOCK(bpci_lock);
/***************************************************************************** /*****************************************************************************
* *
* STRUCT: pci_io_resource * STRUCT: pci_io_resource
...@@ -368,7 +366,6 @@ int msp_pcibios_config_access(unsigned char access_type, ...@@ -368,7 +366,6 @@ int msp_pcibios_config_access(unsigned char access_type,
struct msp_pci_regs *preg = (void *)PCI_BASE_REG; struct msp_pci_regs *preg = (void *)PCI_BASE_REG;
unsigned char bus_num = bus->number; unsigned char bus_num = bus->number;
unsigned char dev_fn = (unsigned char)devfn; unsigned char dev_fn = (unsigned char)devfn;
unsigned long flags;
unsigned long intr; unsigned long intr;
unsigned long value; unsigned long value;
static char pciirqflag; static char pciirqflag;
...@@ -401,10 +398,7 @@ int msp_pcibios_config_access(unsigned char access_type, ...@@ -401,10 +398,7 @@ int msp_pcibios_config_access(unsigned char access_type,
} }
#if defined(CONFIG_PMC_MSP7120_GW) || defined(CONFIG_PMC_MSP7120_EVAL) #if defined(CONFIG_PMC_MSP7120_GW) || defined(CONFIG_PMC_MSP7120_EVAL)
local_irq_save(flags);
vpe_status = dvpe(); vpe_status = dvpe();
#else
spin_lock_irqsave(&bpci_lock, flags);
#endif #endif
/* /*
...@@ -457,9 +451,6 @@ int msp_pcibios_config_access(unsigned char access_type, ...@@ -457,9 +451,6 @@ int msp_pcibios_config_access(unsigned char access_type,
#if defined(CONFIG_PMC_MSP7120_GW) || defined(CONFIG_PMC_MSP7120_EVAL) #if defined(CONFIG_PMC_MSP7120_GW) || defined(CONFIG_PMC_MSP7120_EVAL)
evpe(vpe_status); evpe(vpe_status);
local_irq_restore(flags);
#else
spin_unlock_irqrestore(&bpci_lock, flags);
#endif #endif
return -1; return -1;
...@@ -467,9 +458,6 @@ int msp_pcibios_config_access(unsigned char access_type, ...@@ -467,9 +458,6 @@ int msp_pcibios_config_access(unsigned char access_type,
#if defined(CONFIG_PMC_MSP7120_GW) || defined(CONFIG_PMC_MSP7120_EVAL) #if defined(CONFIG_PMC_MSP7120_GW) || defined(CONFIG_PMC_MSP7120_EVAL)
evpe(vpe_status); evpe(vpe_status);
local_irq_restore(flags);
#else
spin_unlock_irqrestore(&bpci_lock, flags);
#endif #endif
return PCIBIOS_SUCCESSFUL; return PCIBIOS_SUCCESSFUL;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment