Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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

authored by

Sergey Ryazanov and committed by
Ralf Baechle
c4a30537 6ff9c2fc

-12
-12
arch/mips/pci/ops-pmcmsp.c
··· 193 193 } 194 194 #endif /* CONFIG_PROC_FS && PCI_COUNTERS */ 195 195 196 - static DEFINE_SPINLOCK(bpci_lock); 197 - 198 196 /***************************************************************************** 199 197 * 200 198 * STRUCT: pci_io_resource ··· 366 368 struct msp_pci_regs *preg = (void *)PCI_BASE_REG; 367 369 unsigned char bus_num = bus->number; 368 370 unsigned char dev_fn = (unsigned char)devfn; 369 - unsigned long flags; 370 371 unsigned long intr; 371 372 unsigned long value; 372 373 static char pciirqflag; ··· 398 401 } 399 402 400 403 #if defined(CONFIG_PMC_MSP7120_GW) || defined(CONFIG_PMC_MSP7120_EVAL) 401 - local_irq_save(flags); 402 404 vpe_status = dvpe(); 403 - #else 404 - spin_lock_irqsave(&bpci_lock, flags); 405 405 #endif 406 406 407 407 /* ··· 451 457 452 458 #if defined(CONFIG_PMC_MSP7120_GW) || defined(CONFIG_PMC_MSP7120_EVAL) 453 459 evpe(vpe_status); 454 - local_irq_restore(flags); 455 - #else 456 - spin_unlock_irqrestore(&bpci_lock, flags); 457 460 #endif 458 461 459 462 return -1; ··· 458 467 459 468 #if defined(CONFIG_PMC_MSP7120_GW) || defined(CONFIG_PMC_MSP7120_EVAL) 460 469 evpe(vpe_status); 461 - local_irq_restore(flags); 462 - #else 463 - spin_unlock_irqrestore(&bpci_lock, flags); 464 470 #endif 465 471 466 472 return PCIBIOS_SUCCESSFUL;