diff options
Diffstat (limited to 'arch/mips/pci')
-rw-r--r-- | arch/mips/pci/fixup-vr4133.c | 2 | ||||
-rw-r--r-- | arch/mips/pci/ops-ddb5477.c | 4 | ||||
-rw-r--r-- | arch/mips/pci/ops-tx4938.c | 16 | ||||
-rw-r--r-- | arch/mips/pci/pci-bcm1480.c | 2 | ||||
-rw-r--r-- | arch/mips/pci/pci-bcm1480ht.c | 2 | ||||
-rw-r--r-- | arch/mips/pci/pci-ip27.c | 12 |
6 files changed, 19 insertions, 19 deletions
diff --git a/arch/mips/pci/fixup-vr4133.c b/arch/mips/pci/fixup-vr4133.c index 03a0ff2fc993..a8a47b494b23 100644 --- a/arch/mips/pci/fixup-vr4133.c +++ b/arch/mips/pci/fixup-vr4133.c | |||
@@ -45,7 +45,7 @@ int pcibios_plat_dev_init(struct pci_dev *dev) | |||
45 | 45 | ||
46 | /* | 46 | /* |
47 | * we have to open the bridges' windows down to 0 because otherwise | 47 | * we have to open the bridges' windows down to 0 because otherwise |
48 | * we cannot access ISA south bridge I/O registers that get mapped from | 48 | * we cannot access ISA south bridge I/O registers that get mapped from |
49 | * 0. for example, 8259 PIC would be unaccessible without that | 49 | * 0. for example, 8259 PIC would be unaccessible without that |
50 | */ | 50 | */ |
51 | if(dev->vendor == PCI_VENDOR_ID_INTEL && dev->device == PCI_DEVICE_ID_INTEL_S21152BB) { | 51 | if(dev->vendor == PCI_VENDOR_ID_INTEL && dev->device == PCI_DEVICE_ID_INTEL_S21152BB) { |
diff --git a/arch/mips/pci/ops-ddb5477.c b/arch/mips/pci/ops-ddb5477.c index 0406b50a37d8..8e57d4c5d90f 100644 --- a/arch/mips/pci/ops-ddb5477.c +++ b/arch/mips/pci/ops-ddb5477.c | |||
@@ -253,9 +253,9 @@ static int write_config_byte(struct pci_config_swap *swap, | |||
253 | static int prefix##_##rw##_config(struct pci_bus *bus, unsigned int devfn, int where, int size, u32 star val) \ | 253 | static int prefix##_##rw##_config(struct pci_bus *bus, unsigned int devfn, int where, int size, u32 star val) \ |
254 | { \ | 254 | { \ |
255 | if (size == 1) \ | 255 | if (size == 1) \ |
256 | return rw##_config_byte(pciswap, bus, devfn, where, (u8 star)val); \ | 256 | return rw##_config_byte(pciswap, bus, devfn, where, (u8 star)val); \ |
257 | else if (size == 2) \ | 257 | else if (size == 2) \ |
258 | return rw##_config_word(pciswap, bus, devfn, where, (u16 star)val); \ | 258 | return rw##_config_word(pciswap, bus, devfn, where, (u16 star)val); \ |
259 | /* Size must be 4 */ \ | 259 | /* Size must be 4 */ \ |
260 | return rw##_config_dword(pciswap, bus, devfn, where, val); \ | 260 | return rw##_config_dword(pciswap, bus, devfn, where, val); \ |
261 | } | 261 | } |
diff --git a/arch/mips/pci/ops-tx4938.c b/arch/mips/pci/ops-tx4938.c index 4c0dcfce5297..0ff083489efd 100644 --- a/arch/mips/pci/ops-tx4938.c +++ b/arch/mips/pci/ops-tx4938.c | |||
@@ -34,16 +34,16 @@ struct resource pci_mem_resource = { | |||
34 | }; | 34 | }; |
35 | 35 | ||
36 | struct resource tx4938_pcic1_pci_io_resource = { | 36 | struct resource tx4938_pcic1_pci_io_resource = { |
37 | .name = "PCI1 IO", | 37 | .name = "PCI1 IO", |
38 | .start = 0, | 38 | .start = 0, |
39 | .end = 0, | 39 | .end = 0, |
40 | .flags = IORESOURCE_IO | 40 | .flags = IORESOURCE_IO |
41 | }; | 41 | }; |
42 | struct resource tx4938_pcic1_pci_mem_resource = { | 42 | struct resource tx4938_pcic1_pci_mem_resource = { |
43 | .name = "PCI1 mem", | 43 | .name = "PCI1 mem", |
44 | .start = 0, | 44 | .start = 0, |
45 | .end = 0, | 45 | .end = 0, |
46 | .flags = IORESOURCE_MEM | 46 | .flags = IORESOURCE_MEM |
47 | }; | 47 | }; |
48 | 48 | ||
49 | static int mkaddr(int bus, int dev_fn, int where, int *flagsp) | 49 | static int mkaddr(int bus, int dev_fn, int where, int *flagsp) |
diff --git a/arch/mips/pci/pci-bcm1480.c b/arch/mips/pci/pci-bcm1480.c index ca975e7d32ff..f4ef1a35ca18 100644 --- a/arch/mips/pci/pci-bcm1480.c +++ b/arch/mips/pci/pci-bcm1480.c | |||
@@ -100,7 +100,7 @@ static int bcm1480_pci_can_access(struct pci_bus *bus, int devfn) | |||
100 | 100 | ||
101 | if (bus->number == 0) { | 101 | if (bus->number == 0) { |
102 | devno = PCI_SLOT(devfn); | 102 | devno = PCI_SLOT(devfn); |
103 | if (bcm1480_bus_status & PCI_DEVICE_MODE) | 103 | if (bcm1480_bus_status & PCI_DEVICE_MODE) |
104 | return 0; | 104 | return 0; |
105 | else | 105 | else |
106 | return 1; | 106 | return 1; |
diff --git a/arch/mips/pci/pci-bcm1480ht.c b/arch/mips/pci/pci-bcm1480ht.c index aca4a2e7a1c6..a3eebe5890a7 100644 --- a/arch/mips/pci/pci-bcm1480ht.c +++ b/arch/mips/pci/pci-bcm1480ht.c | |||
@@ -95,7 +95,7 @@ static int bcm1480ht_can_access(struct pci_bus *bus, int devfn) | |||
95 | 95 | ||
96 | if (bus->number == 0) { | 96 | if (bus->number == 0) { |
97 | devno = PCI_SLOT(devfn); | 97 | devno = PCI_SLOT(devfn); |
98 | if (bcm1480ht_bus_status & PCI_DEVICE_MODE) | 98 | if (bcm1480ht_bus_status & PCI_DEVICE_MODE) |
99 | return 0; | 99 | return 0; |
100 | } | 100 | } |
101 | return 1; | 101 | return 1; |
diff --git a/arch/mips/pci/pci-ip27.c b/arch/mips/pci/pci-ip27.c index efc96ce99eeb..6002d2a6a262 100644 --- a/arch/mips/pci/pci-ip27.c +++ b/arch/mips/pci/pci-ip27.c | |||
@@ -379,18 +379,18 @@ int __init bridge_probe(nasid_t nasid, int widget_id, int masterwid) | |||
379 | bridge = (bridge_t *) RAW_NODE_SWIN_BASE(nasid, widget_id); | 379 | bridge = (bridge_t *) RAW_NODE_SWIN_BASE(nasid, widget_id); |
380 | 380 | ||
381 | /* | 381 | /* |
382 | * Clear all pending interrupts. | 382 | * Clear all pending interrupts. |
383 | */ | 383 | */ |
384 | bridge->b_int_rst_stat = BRIDGE_IRR_ALL_CLR; | 384 | bridge->b_int_rst_stat = BRIDGE_IRR_ALL_CLR; |
385 | 385 | ||
386 | /* | 386 | /* |
387 | * Until otherwise set up, assume all interrupts are from slot 0 | 387 | * Until otherwise set up, assume all interrupts are from slot 0 |
388 | */ | 388 | */ |
389 | bridge->b_int_device = 0x0; | 389 | bridge->b_int_device = 0x0; |
390 | 390 | ||
391 | /* | 391 | /* |
392 | * swap pio's to pci mem and io space (big windows) | 392 | * swap pio's to pci mem and io space (big windows) |
393 | */ | 393 | */ |
394 | bridge->b_wid_control |= BRIDGE_CTRL_IO_SWAP | | 394 | bridge->b_wid_control |= BRIDGE_CTRL_IO_SWAP | |
395 | BRIDGE_CTRL_MEM_SWAP; | 395 | BRIDGE_CTRL_MEM_SWAP; |
396 | 396 | ||