diff options
Diffstat (limited to 'arch/mips/pci/ops-nile4.c')
-rw-r--r-- | arch/mips/pci/ops-nile4.c | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/arch/mips/pci/ops-nile4.c b/arch/mips/pci/ops-nile4.c index a1a7c9f4096e..b9d1fd0ff7e2 100644 --- a/arch/mips/pci/ops-nile4.c +++ b/arch/mips/pci/ops-nile4.c | |||
@@ -13,8 +13,6 @@ | |||
13 | 13 | ||
14 | volatile unsigned long *const vrc_pciregs = (void *) Vrc5074_BASE; | 14 | volatile unsigned long *const vrc_pciregs = (void *) Vrc5074_BASE; |
15 | 15 | ||
16 | static DEFINE_SPINLOCK(nile4_pci_lock); | ||
17 | |||
18 | static int nile4_pcibios_config_access(unsigned char access_type, | 16 | static int nile4_pcibios_config_access(unsigned char access_type, |
19 | struct pci_bus *bus, unsigned int devfn, int where, u32 *val) | 17 | struct pci_bus *bus, unsigned int devfn, int where, u32 *val) |
20 | { | 18 | { |
@@ -76,7 +74,6 @@ static int nile4_pcibios_config_access(unsigned char access_type, | |||
76 | static int nile4_pcibios_read(struct pci_bus *bus, unsigned int devfn, | 74 | static int nile4_pcibios_read(struct pci_bus *bus, unsigned int devfn, |
77 | int where, int size, u32 *val) | 75 | int where, int size, u32 *val) |
78 | { | 76 | { |
79 | unsigned long flags; | ||
80 | u32 data = 0; | 77 | u32 data = 0; |
81 | int err; | 78 | int err; |
82 | 79 | ||
@@ -85,11 +82,8 @@ static int nile4_pcibios_read(struct pci_bus *bus, unsigned int devfn, | |||
85 | else if ((size == 4) && (where & 3)) | 82 | else if ((size == 4) && (where & 3)) |
86 | return PCIBIOS_BAD_REGISTER_NUMBER; | 83 | return PCIBIOS_BAD_REGISTER_NUMBER; |
87 | 84 | ||
88 | spin_lock_irqsave(&nile4_pci_lock, flags); | ||
89 | err = nile4_pcibios_config_access(PCI_ACCESS_READ, bus, devfn, where, | 85 | err = nile4_pcibios_config_access(PCI_ACCESS_READ, bus, devfn, where, |
90 | &data); | 86 | &data); |
91 | spin_unlock_irqrestore(&nile4_pci_lock, flags); | ||
92 | |||
93 | if (err) | 87 | if (err) |
94 | return err; | 88 | return err; |
95 | 89 | ||
@@ -106,7 +100,6 @@ static int nile4_pcibios_read(struct pci_bus *bus, unsigned int devfn, | |||
106 | static int nile4_pcibios_write(struct pci_bus *bus, unsigned int devfn, | 100 | static int nile4_pcibios_write(struct pci_bus *bus, unsigned int devfn, |
107 | int where, int size, u32 val) | 101 | int where, int size, u32 val) |
108 | { | 102 | { |
109 | unsigned long flags; | ||
110 | u32 data = 0; | 103 | u32 data = 0; |
111 | int err; | 104 | int err; |
112 | 105 | ||
@@ -115,11 +108,8 @@ static int nile4_pcibios_write(struct pci_bus *bus, unsigned int devfn, | |||
115 | else if ((size == 4) && (where & 3)) | 108 | else if ((size == 4) && (where & 3)) |
116 | return PCIBIOS_BAD_REGISTER_NUMBER; | 109 | return PCIBIOS_BAD_REGISTER_NUMBER; |
117 | 110 | ||
118 | spin_lock_irqsave(&nile4_pci_lock, flags); | ||
119 | err = nile4_pcibios_config_access(PCI_ACCESS_READ, bus, devfn, where, | 111 | err = nile4_pcibios_config_access(PCI_ACCESS_READ, bus, devfn, where, |
120 | &data); | 112 | &data); |
121 | spin_unlock_irqrestore(&nile4_pci_lock, flags); | ||
122 | |||
123 | if (err) | 113 | if (err) |
124 | return err; | 114 | return err; |
125 | 115 | ||