diff options
-rw-r--r-- | arch/frv/mb93090-mb00/pci-frv.c | 30 | ||||
-rw-r--r-- | arch/m68knommu/kernel/comempci.c | 9 | ||||
-rw-r--r-- | arch/mips/pmc-sierra/yosemite/ht.c | 36 | ||||
-rw-r--r-- | arch/sh/drivers/pci/pci.c | 32 |
4 files changed, 0 insertions, 107 deletions
diff --git a/arch/frv/mb93090-mb00/pci-frv.c b/arch/frv/mb93090-mb00/pci-frv.c index 4f165c93be42..edae117fcc2b 100644 --- a/arch/frv/mb93090-mb00/pci-frv.c +++ b/arch/frv/mb93090-mb00/pci-frv.c | |||
@@ -19,36 +19,6 @@ | |||
19 | 19 | ||
20 | #include "pci-frv.h" | 20 | #include "pci-frv.h" |
21 | 21 | ||
22 | #if 0 | ||
23 | void | ||
24 | pcibios_update_resource(struct pci_dev *dev, struct resource *root, | ||
25 | struct resource *res, int resource) | ||
26 | { | ||
27 | u32 new, check; | ||
28 | int reg; | ||
29 | |||
30 | new = res->start | (res->flags & PCI_REGION_FLAG_MASK); | ||
31 | if (resource < 6) { | ||
32 | reg = PCI_BASE_ADDRESS_0 + 4*resource; | ||
33 | } else if (resource == PCI_ROM_RESOURCE) { | ||
34 | res->flags |= IORESOURCE_ROM_ENABLE; | ||
35 | new |= PCI_ROM_ADDRESS_ENABLE; | ||
36 | reg = dev->rom_base_reg; | ||
37 | } else { | ||
38 | /* Somebody might have asked allocation of a non-standard resource */ | ||
39 | return; | ||
40 | } | ||
41 | |||
42 | pci_write_config_dword(dev, reg, new); | ||
43 | pci_read_config_dword(dev, reg, &check); | ||
44 | if ((new ^ check) & ((new & PCI_BASE_ADDRESS_SPACE_IO) ? PCI_BASE_ADDRESS_IO_MASK : PCI_BASE_ADDRESS_MEM_MASK)) { | ||
45 | printk(KERN_ERR "PCI: Error while updating region " | ||
46 | "%s/%d (%08x != %08x)\n", pci_name(dev), resource, | ||
47 | new, check); | ||
48 | } | ||
49 | } | ||
50 | #endif | ||
51 | |||
52 | /* | 22 | /* |
53 | * We need to avoid collisions with `mirrored' VGA ports | 23 | * We need to avoid collisions with `mirrored' VGA ports |
54 | * and other strange ISA hardware, so we always want the | 24 | * and other strange ISA hardware, so we always want the |
diff --git a/arch/m68knommu/kernel/comempci.c b/arch/m68knommu/kernel/comempci.c index 6ee00effbad2..0a68b5a85f86 100644 --- a/arch/m68knommu/kernel/comempci.c +++ b/arch/m68knommu/kernel/comempci.c | |||
@@ -375,15 +375,6 @@ int pcibios_enable_device(struct pci_dev *dev, int mask) | |||
375 | 375 | ||
376 | /*****************************************************************************/ | 376 | /*****************************************************************************/ |
377 | 377 | ||
378 | void pcibios_update_resource(struct pci_dev *dev, struct resource *root, struct resource *r, int resource) | ||
379 | { | ||
380 | printk(KERN_WARNING "%s(%d): no support for changing PCI resources...\n", | ||
381 | __FILE__, __LINE__); | ||
382 | } | ||
383 | |||
384 | |||
385 | /*****************************************************************************/ | ||
386 | |||
387 | /* | 378 | /* |
388 | * Local routines to interrcept the standard I/O and vector handling | 379 | * Local routines to interrcept the standard I/O and vector handling |
389 | * code. Don't include this 'till now - initialization code above needs | 380 | * code. Don't include this 'till now - initialization code above needs |
diff --git a/arch/mips/pmc-sierra/yosemite/ht.c b/arch/mips/pmc-sierra/yosemite/ht.c index 6380662bbf3c..678388fd34b1 100644 --- a/arch/mips/pmc-sierra/yosemite/ht.c +++ b/arch/mips/pmc-sierra/yosemite/ht.c | |||
@@ -345,42 +345,6 @@ int pcibios_enable_device(struct pci_dev *dev, int mask) | |||
345 | return pcibios_enable_resources(dev); | 345 | return pcibios_enable_resources(dev); |
346 | } | 346 | } |
347 | 347 | ||
348 | |||
349 | |||
350 | void pcibios_update_resource(struct pci_dev *dev, struct resource *root, | ||
351 | struct resource *res, int resource) | ||
352 | { | ||
353 | u32 new, check; | ||
354 | int reg; | ||
355 | |||
356 | return; | ||
357 | |||
358 | new = res->start | (res->flags & PCI_REGION_FLAG_MASK); | ||
359 | if (resource < 6) { | ||
360 | reg = PCI_BASE_ADDRESS_0 + 4 * resource; | ||
361 | } else if (resource == PCI_ROM_RESOURCE) { | ||
362 | res->flags |= IORESOURCE_ROM_ENABLE; | ||
363 | reg = dev->rom_base_reg; | ||
364 | } else { | ||
365 | /* | ||
366 | * Somebody might have asked allocation of a non-standard | ||
367 | * resource | ||
368 | */ | ||
369 | return; | ||
370 | } | ||
371 | |||
372 | pci_write_config_dword(dev, reg, new); | ||
373 | pci_read_config_dword(dev, reg, &check); | ||
374 | if ((new ^ check) & | ||
375 | ((new & PCI_BASE_ADDRESS_SPACE_IO) ? PCI_BASE_ADDRESS_IO_MASK : | ||
376 | PCI_BASE_ADDRESS_MEM_MASK)) { | ||
377 | printk(KERN_ERR "PCI: Error while updating region " | ||
378 | "%s/%d (%08x != %08x)\n", pci_name(dev), resource, | ||
379 | new, check); | ||
380 | } | ||
381 | } | ||
382 | |||
383 | |||
384 | void pcibios_align_resource(void *data, struct resource *res, | 348 | void pcibios_align_resource(void *data, struct resource *res, |
385 | resource_size_t size, resource_size_t align) | 349 | resource_size_t size, resource_size_t align) |
386 | { | 350 | { |
diff --git a/arch/sh/drivers/pci/pci.c b/arch/sh/drivers/pci/pci.c index 08d2e7325252..f57095a2617c 100644 --- a/arch/sh/drivers/pci/pci.c +++ b/arch/sh/drivers/pci/pci.c | |||
@@ -76,38 +76,6 @@ void __devinit __weak pcibios_fixup_bus(struct pci_bus *bus) | |||
76 | pci_read_bridge_bases(bus); | 76 | pci_read_bridge_bases(bus); |
77 | } | 77 | } |
78 | 78 | ||
79 | void | ||
80 | pcibios_update_resource(struct pci_dev *dev, struct resource *root, | ||
81 | struct resource *res, int resource) | ||
82 | { | ||
83 | u32 new, check; | ||
84 | int reg; | ||
85 | |||
86 | new = res->start | (res->flags & PCI_REGION_FLAG_MASK); | ||
87 | if (resource < 6) { | ||
88 | reg = PCI_BASE_ADDRESS_0 + 4*resource; | ||
89 | } else if (resource == PCI_ROM_RESOURCE) { | ||
90 | res->flags |= IORESOURCE_ROM_ENABLE; | ||
91 | new |= PCI_ROM_ADDRESS_ENABLE; | ||
92 | reg = dev->rom_base_reg; | ||
93 | } else { | ||
94 | /* | ||
95 | * Somebody might have asked allocation of a non-standard | ||
96 | * resource | ||
97 | */ | ||
98 | return; | ||
99 | } | ||
100 | |||
101 | pci_write_config_dword(dev, reg, new); | ||
102 | pci_read_config_dword(dev, reg, &check); | ||
103 | if ((new ^ check) & ((new & PCI_BASE_ADDRESS_SPACE_IO) ? | ||
104 | PCI_BASE_ADDRESS_IO_MASK : PCI_BASE_ADDRESS_MEM_MASK)) { | ||
105 | printk(KERN_ERR "PCI: Error while updating region " | ||
106 | "%s/%d (%08x != %08x)\n", pci_name(dev), resource, | ||
107 | new, check); | ||
108 | } | ||
109 | } | ||
110 | |||
111 | void pcibios_align_resource(void *data, struct resource *res, | 79 | void pcibios_align_resource(void *data, struct resource *res, |
112 | resource_size_t size, resource_size_t align) | 80 | resource_size_t size, resource_size_t align) |
113 | __attribute__ ((weak)); | 81 | __attribute__ ((weak)); |