Skip to content

Commit

Permalink
MIPS: MSP71xx: remove odd locking in PCI config space access code
Browse files Browse the repository at this point in the history
Caller (generic PCI code) already do proper locking so no need to add
another one here.

Signed-off-by: Sergey 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: Ralf Baechle <ralf@linux-mips.org>
  • Loading branch information
Sergey Ryazanov authored and Ralf Baechle committed Nov 24, 2014
1 parent 6ff9c2f commit c4a3053
Showing 1 changed file with 0 additions and 12 deletions.
12 changes: 0 additions & 12 deletions arch/mips/pci/ops-pmcmsp.c
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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

/*
Expand Down Expand Up @@ -457,19 +451,13 @@ 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;
}

#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;
Expand Down

0 comments on commit c4a3053

Please sign in to comment.