Skip to content

Commit 24b390a

Browse files
committed
PCI: Remove unused "pci_probe" flags
The following flags are only used on x86, but they got copied to FR-V, MN10300, and SuperH: PCI_PROBE_BIOS PCI_PROBE_CONF1 PCI_PROBE_CONF2 PCI_ASSIGN_ROMS PCI_NO_CHECKS PCI_BIOS_IRQ_SCAN PCI_ASSIGN_ALL_BUSSES FR-V and MN10300 do test for PCI_ASSIGN_ROMS, but they never set it, so it's dead code. Remove the unused flags above. Signed-off-by: Bjorn Helgaas <[email protected]>
1 parent 7aa6ca4 commit 24b390a

File tree

5 files changed

+10
-43
lines changed

5 files changed

+10
-43
lines changed

arch/frv/mb93090-mb00/pci-frv.c

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -175,14 +175,6 @@ static void __init pcibios_assign_resources(void)
175175
if (!r->start && r->end)
176176
pci_assign_resource(dev, idx);
177177
}
178-
179-
if (pci_probe & PCI_ASSIGN_ROMS) {
180-
r = &dev->resource[PCI_ROM_RESOURCE];
181-
r->end -= r->start;
182-
r->start = 0;
183-
if (r->end)
184-
pci_assign_resource(dev, PCI_ROM_RESOURCE);
185-
}
186178
}
187179
}
188180

arch/frv/mb93090-mb00/pci-frv.h

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,6 @@
1414
#define DBG(x...)
1515
#endif
1616

17-
#define PCI_PROBE_BIOS 0x0001
18-
#define PCI_PROBE_CONF1 0x0002
19-
#define PCI_PROBE_CONF2 0x0004
20-
#define PCI_NO_CHECKS 0x0400
21-
#define PCI_ASSIGN_ROMS 0x1000
22-
#define PCI_BIOS_IRQ_SCAN 0x2000
23-
#define PCI_ASSIGN_ALL_BUSSES 0x4000
24-
2517
extern unsigned int __nongpreldata pci_probe;
2618

2719
/* pci-frv.c */

arch/mn10300/unit-asb2305/pci-asb2305.c

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -183,18 +183,16 @@ static int __init pcibios_assign_resources(void)
183183
struct pci_dev *dev = NULL;
184184
struct resource *r;
185185

186-
if (!(pci_probe & PCI_ASSIGN_ROMS)) {
187-
/* Try to use BIOS settings for ROMs, otherwise let
188-
pci_assign_unassigned_resources() allocate the new
189-
addresses. */
190-
for_each_pci_dev(dev) {
191-
r = &dev->resource[PCI_ROM_RESOURCE];
192-
if (!r->flags || !r->start)
193-
continue;
194-
if (pci_claim_resource(dev, PCI_ROM_RESOURCE) < 0) {
195-
r->end -= r->start;
196-
r->start = 0;
197-
}
186+
/* Try to use BIOS settings for ROMs, otherwise let
187+
pci_assign_unassigned_resources() allocate the new
188+
addresses. */
189+
for_each_pci_dev(dev) {
190+
r = &dev->resource[PCI_ROM_RESOURCE];
191+
if (!r->flags || !r->start)
192+
continue;
193+
if (pci_claim_resource(dev, PCI_ROM_RESOURCE) < 0) {
194+
r->end -= r->start;
195+
r->start = 0;
198196
}
199197
}
200198

arch/mn10300/unit-asb2305/pci-asb2305.h

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -20,13 +20,6 @@
2020
#define DBG(x...)
2121
#endif
2222

23-
#define PCI_PROBE_BIOS 1
24-
#define PCI_PROBE_CONF1 2
25-
#define PCI_PROBE_CONF2 4
26-
#define PCI_NO_CHECKS 0x400
27-
#define PCI_ASSIGN_ROMS 0x1000
28-
#define PCI_BIOS_IRQ_SCAN 0x2000
29-
3023
extern unsigned int pci_probe;
3124

3225
/* pci-asb2305.c */

arch/sh/drivers/pci/pci-sh4.h

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,6 @@
1111

1212
#include <asm/io.h>
1313

14-
/* startup values */
15-
#define PCI_PROBE_BIOS 1
16-
#define PCI_PROBE_CONF1 2
17-
#define PCI_PROBE_CONF2 4
18-
#define PCI_NO_CHECKS 0x400
19-
#define PCI_ASSIGN_ROMS 0x1000
20-
#define PCI_BIOS_IRQ_SCAN 0x2000
21-
2214
#define SH4_PCICR 0x100 /* PCI Control Register */
2315
#define SH4_PCICR_PREFIX 0xA5000000 /* CR prefix for write */
2416
#define SH4_PCICR_FTO 0x00000400 /* TRDY/IRDY Enable */

0 commit comments

Comments
 (0)