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 <bhelgaas@google.com>
This commit is contained in:
parent
7aa6ca4d39
commit
24b390aad2
|
@ -175,14 +175,6 @@ static void __init pcibios_assign_resources(void)
|
||||||
if (!r->start && r->end)
|
if (!r->start && r->end)
|
||||||
pci_assign_resource(dev, idx);
|
pci_assign_resource(dev, idx);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (pci_probe & PCI_ASSIGN_ROMS) {
|
|
||||||
r = &dev->resource[PCI_ROM_RESOURCE];
|
|
||||||
r->end -= r->start;
|
|
||||||
r->start = 0;
|
|
||||||
if (r->end)
|
|
||||||
pci_assign_resource(dev, PCI_ROM_RESOURCE);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -14,14 +14,6 @@
|
||||||
#define DBG(x...)
|
#define DBG(x...)
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#define PCI_PROBE_BIOS 0x0001
|
|
||||||
#define PCI_PROBE_CONF1 0x0002
|
|
||||||
#define PCI_PROBE_CONF2 0x0004
|
|
||||||
#define PCI_NO_CHECKS 0x0400
|
|
||||||
#define PCI_ASSIGN_ROMS 0x1000
|
|
||||||
#define PCI_BIOS_IRQ_SCAN 0x2000
|
|
||||||
#define PCI_ASSIGN_ALL_BUSSES 0x4000
|
|
||||||
|
|
||||||
extern unsigned int __nongpreldata pci_probe;
|
extern unsigned int __nongpreldata pci_probe;
|
||||||
|
|
||||||
/* pci-frv.c */
|
/* pci-frv.c */
|
||||||
|
|
|
@ -183,18 +183,16 @@ static int __init pcibios_assign_resources(void)
|
||||||
struct pci_dev *dev = NULL;
|
struct pci_dev *dev = NULL;
|
||||||
struct resource *r;
|
struct resource *r;
|
||||||
|
|
||||||
if (!(pci_probe & PCI_ASSIGN_ROMS)) {
|
/* Try to use BIOS settings for ROMs, otherwise let
|
||||||
/* Try to use BIOS settings for ROMs, otherwise let
|
pci_assign_unassigned_resources() allocate the new
|
||||||
pci_assign_unassigned_resources() allocate the new
|
addresses. */
|
||||||
addresses. */
|
for_each_pci_dev(dev) {
|
||||||
for_each_pci_dev(dev) {
|
r = &dev->resource[PCI_ROM_RESOURCE];
|
||||||
r = &dev->resource[PCI_ROM_RESOURCE];
|
if (!r->flags || !r->start)
|
||||||
if (!r->flags || !r->start)
|
continue;
|
||||||
continue;
|
if (pci_claim_resource(dev, PCI_ROM_RESOURCE) < 0) {
|
||||||
if (pci_claim_resource(dev, PCI_ROM_RESOURCE) < 0) {
|
r->end -= r->start;
|
||||||
r->end -= r->start;
|
r->start = 0;
|
||||||
r->start = 0;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -20,13 +20,6 @@
|
||||||
#define DBG(x...)
|
#define DBG(x...)
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#define PCI_PROBE_BIOS 1
|
|
||||||
#define PCI_PROBE_CONF1 2
|
|
||||||
#define PCI_PROBE_CONF2 4
|
|
||||||
#define PCI_NO_CHECKS 0x400
|
|
||||||
#define PCI_ASSIGN_ROMS 0x1000
|
|
||||||
#define PCI_BIOS_IRQ_SCAN 0x2000
|
|
||||||
|
|
||||||
extern unsigned int pci_probe;
|
extern unsigned int pci_probe;
|
||||||
|
|
||||||
/* pci-asb2305.c */
|
/* pci-asb2305.c */
|
||||||
|
|
|
@ -11,14 +11,6 @@
|
||||||
|
|
||||||
#include <asm/io.h>
|
#include <asm/io.h>
|
||||||
|
|
||||||
/* startup values */
|
|
||||||
#define PCI_PROBE_BIOS 1
|
|
||||||
#define PCI_PROBE_CONF1 2
|
|
||||||
#define PCI_PROBE_CONF2 4
|
|
||||||
#define PCI_NO_CHECKS 0x400
|
|
||||||
#define PCI_ASSIGN_ROMS 0x1000
|
|
||||||
#define PCI_BIOS_IRQ_SCAN 0x2000
|
|
||||||
|
|
||||||
#define SH4_PCICR 0x100 /* PCI Control Register */
|
#define SH4_PCICR 0x100 /* PCI Control Register */
|
||||||
#define SH4_PCICR_PREFIX 0xA5000000 /* CR prefix for write */
|
#define SH4_PCICR_PREFIX 0xA5000000 /* CR prefix for write */
|
||||||
#define SH4_PCICR_FTO 0x00000400 /* TRDY/IRDY Enable */
|
#define SH4_PCICR_FTO 0x00000400 /* TRDY/IRDY Enable */
|
||||||
|
|
Loading…
Reference in New Issue