diff options
Diffstat (limited to 'arch/mips/pci/ops-pmcmsp.c')
-rw-r--r-- | arch/mips/pci/ops-pmcmsp.c | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/arch/mips/pci/ops-pmcmsp.c b/arch/mips/pci/ops-pmcmsp.c index 50034f985be1..dd2d9f7e9412 100644 --- a/arch/mips/pci/ops-pmcmsp.c +++ b/arch/mips/pci/ops-pmcmsp.c | |||
@@ -193,8 +193,6 @@ static void pci_proc_init(void) | |||
193 | } | 193 | } |
194 | #endif /* CONFIG_PROC_FS && PCI_COUNTERS */ | 194 | #endif /* CONFIG_PROC_FS && PCI_COUNTERS */ |
195 | 195 | ||
196 | static DEFINE_SPINLOCK(bpci_lock); | ||
197 | |||
198 | /***************************************************************************** | 196 | /***************************************************************************** |
199 | * | 197 | * |
200 | * STRUCT: pci_io_resource | 198 | * STRUCT: pci_io_resource |
@@ -368,7 +366,6 @@ int msp_pcibios_config_access(unsigned char access_type, | |||
368 | struct msp_pci_regs *preg = (void *)PCI_BASE_REG; | 366 | struct msp_pci_regs *preg = (void *)PCI_BASE_REG; |
369 | unsigned char bus_num = bus->number; | 367 | unsigned char bus_num = bus->number; |
370 | unsigned char dev_fn = (unsigned char)devfn; | 368 | unsigned char dev_fn = (unsigned char)devfn; |
371 | unsigned long flags; | ||
372 | unsigned long intr; | 369 | unsigned long intr; |
373 | unsigned long value; | 370 | unsigned long value; |
374 | static char pciirqflag; | 371 | static char pciirqflag; |
@@ -401,10 +398,7 @@ int msp_pcibios_config_access(unsigned char access_type, | |||
401 | } | 398 | } |
402 | 399 | ||
403 | #if defined(CONFIG_PMC_MSP7120_GW) || defined(CONFIG_PMC_MSP7120_EVAL) | 400 | #if defined(CONFIG_PMC_MSP7120_GW) || defined(CONFIG_PMC_MSP7120_EVAL) |
404 | local_irq_save(flags); | ||
405 | vpe_status = dvpe(); | 401 | vpe_status = dvpe(); |
406 | #else | ||
407 | spin_lock_irqsave(&bpci_lock, flags); | ||
408 | #endif | 402 | #endif |
409 | 403 | ||
410 | /* | 404 | /* |
@@ -457,9 +451,6 @@ int msp_pcibios_config_access(unsigned char access_type, | |||
457 | 451 | ||
458 | #if defined(CONFIG_PMC_MSP7120_GW) || defined(CONFIG_PMC_MSP7120_EVAL) | 452 | #if defined(CONFIG_PMC_MSP7120_GW) || defined(CONFIG_PMC_MSP7120_EVAL) |
459 | evpe(vpe_status); | 453 | evpe(vpe_status); |
460 | local_irq_restore(flags); | ||
461 | #else | ||
462 | spin_unlock_irqrestore(&bpci_lock, flags); | ||
463 | #endif | 454 | #endif |
464 | 455 | ||
465 | return -1; | 456 | return -1; |
@@ -467,9 +458,6 @@ int msp_pcibios_config_access(unsigned char access_type, | |||
467 | 458 | ||
468 | #if defined(CONFIG_PMC_MSP7120_GW) || defined(CONFIG_PMC_MSP7120_EVAL) | 459 | #if defined(CONFIG_PMC_MSP7120_GW) || defined(CONFIG_PMC_MSP7120_EVAL) |
469 | evpe(vpe_status); | 460 | evpe(vpe_status); |
470 | local_irq_restore(flags); | ||
471 | #else | ||
472 | spin_unlock_irqrestore(&bpci_lock, flags); | ||
473 | #endif | 461 | #endif |
474 | 462 | ||
475 | return PCIBIOS_SUCCESSFUL; | 463 | return PCIBIOS_SUCCESSFUL; |