diff options
author | Ralf Baechle <ralf@linux-mips.org> | 2006-06-04 18:14:05 -0400 |
---|---|---|
committer | Ralf Baechle <ralf@linux-mips.org> | 2006-06-19 12:39:20 -0400 |
commit | 5e46c3aefe60d1398488410a0c39b4cd87738614 (patch) | |
tree | 982f9820e63cee8aacc4a6132f124d1cef4fe901 /arch/mips/pci | |
parent | cbb306962ec4b30e03423137e22d605281a8f598 (diff) |
[MIPS] C99-ify struct resource initialization.
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Diffstat (limited to 'arch/mips/pci')
-rw-r--r-- | arch/mips/pci/ops-it8172.c | 34 | ||||
-rw-r--r-- | arch/mips/pci/pci-ddb5074.c | 16 | ||||
-rw-r--r-- | arch/mips/pci/pci-ddb5476.c | 16 | ||||
-rw-r--r-- | arch/mips/pci/pci-ddb5477.c | 32 | ||||
-rw-r--r-- | arch/mips/pci/pci-jmr3927.c | 16 | ||||
-rw-r--r-- | arch/mips/pci/pci-ocelot.c | 8 | ||||
-rw-r--r-- | arch/mips/pci/pci-yosemite.c | 10 |
7 files changed, 68 insertions, 64 deletions
diff --git a/arch/mips/pci/ops-it8172.c b/arch/mips/pci/ops-it8172.c index b7a8b9a6f9db..ba8328505a0a 100644 --- a/arch/mips/pci/ops-it8172.c +++ b/arch/mips/pci/ops-it8172.c | |||
@@ -50,30 +50,28 @@ | |||
50 | static struct resource pci_mem_resource_1; | 50 | static struct resource pci_mem_resource_1; |
51 | 51 | ||
52 | static struct resource pci_io_resource = { | 52 | static struct resource pci_io_resource = { |
53 | "io pci IO space", | 53 | .start = 0x14018000, |
54 | 0x14018000, | 54 | .end = 0x17FFFFFF, |
55 | 0x17FFFFFF, | 55 | .name = "io pci IO space", |
56 | IORESOURCE_IO | 56 | .flags = IORESOURCE_IO |
57 | }; | 57 | }; |
58 | 58 | ||
59 | static struct resource pci_mem_resource_0 = { | 59 | static struct resource pci_mem_resource_0 = { |
60 | "ext pci memory space 0/1", | 60 | .start = 0x10101000, |
61 | 0x10101000, | 61 | .end = 0x13FFFFFF, |
62 | 0x13FFFFFF, | 62 | .name = "ext pci memory space 0/1", |
63 | IORESOURCE_MEM, | 63 | .flags = IORESOURCE_MEM, |
64 | &pci_mem_resource_0, | 64 | .parent = &pci_mem_resource_0, |
65 | NULL, | 65 | .sibling = NULL, |
66 | &pci_mem_resource_1 | 66 | .child = &pci_mem_resource_1 |
67 | }; | 67 | }; |
68 | 68 | ||
69 | static struct resource pci_mem_resource_1 = { | 69 | static struct resource pci_mem_resource_1 = { |
70 | "ext pci memory space 2/3", | 70 | .start = 0x1A000000, |
71 | 0x1A000000, | 71 | .end = 0x1FBFFFFF, |
72 | 0x1FBFFFFF, | 72 | .name = "ext pci memory space 2/3", |
73 | IORESOURCE_MEM, | 73 | .flags = IORESOURCE_MEM, |
74 | &pci_mem_resource_0, | 74 | .parent = &pci_mem_resource_0 |
75 | NULL, | ||
76 | NULL | ||
77 | }; | 75 | }; |
78 | 76 | ||
79 | extern struct pci_ops it8172_pci_ops; | 77 | extern struct pci_ops it8172_pci_ops; |
diff --git a/arch/mips/pci/pci-ddb5074.c b/arch/mips/pci/pci-ddb5074.c index 73f9ceeb2f55..b74158d9b4b1 100644 --- a/arch/mips/pci/pci-ddb5074.c +++ b/arch/mips/pci/pci-ddb5074.c | |||
@@ -8,17 +8,17 @@ | |||
8 | #include <asm/ddb5xxx/ddb5xxx.h> | 8 | #include <asm/ddb5xxx/ddb5xxx.h> |
9 | 9 | ||
10 | static struct resource extpci_io_resource = { | 10 | static struct resource extpci_io_resource = { |
11 | "pci IO space", | 11 | .start = 0x1000, /* leave some room for ISA bus */ |
12 | 0x1000, /* leave some room for ISA bus */ | 12 | .end = DDB_PCI_IO_SIZE - 1, |
13 | DDB_PCI_IO_SIZE - 1, | 13 | .name = "pci IO space", |
14 | IORESOURCE_IO | 14 | .flags = IORESOURCE_IO |
15 | }; | 15 | }; |
16 | 16 | ||
17 | static struct resource extpci_mem_resource = { | 17 | static struct resource extpci_mem_resource = { |
18 | "pci memory space", | 18 | .start = DDB_PCI_MEM_BASE + 0x00100000, /* leave 1 MB for RTC */ |
19 | DDB_PCI_MEM_BASE + 0x00100000, /* leave 1 MB for RTC */ | 19 | .end = DDB_PCI_MEM_BASE + DDB_PCI_MEM_SIZE - 1, |
20 | DDB_PCI_MEM_BASE + DDB_PCI_MEM_SIZE - 1, | 20 | .name = "pci memory space", |
21 | IORESOURCE_MEM | 21 | .flags = IORESOURCE_MEM |
22 | }; | 22 | }; |
23 | 23 | ||
24 | extern struct pci_ops ddb5476_ext_pci_ops; | 24 | extern struct pci_ops ddb5476_ext_pci_ops; |
diff --git a/arch/mips/pci/pci-ddb5476.c b/arch/mips/pci/pci-ddb5476.c index 90dd49509800..2f44c0b783d9 100644 --- a/arch/mips/pci/pci-ddb5476.c +++ b/arch/mips/pci/pci-ddb5476.c | |||
@@ -8,17 +8,17 @@ | |||
8 | #include <asm/ddb5xxx/ddb5xxx.h> | 8 | #include <asm/ddb5xxx/ddb5xxx.h> |
9 | 9 | ||
10 | static struct resource extpci_io_resource = { | 10 | static struct resource extpci_io_resource = { |
11 | "pci IO space", | 11 | .start = 0x1000, /* leave some room for ISA bus */ |
12 | 0x1000, /* leave some room for ISA bus */ | 12 | .end = DDB_PCI_IO_SIZE - 1, |
13 | DDB_PCI_IO_SIZE - 1, | 13 | .name = "pci IO space", |
14 | IORESOURCE_IO | 14 | .flags = IORESOURCE_IO |
15 | }; | 15 | }; |
16 | 16 | ||
17 | static struct resource extpci_mem_resource = { | 17 | static struct resource extpci_mem_resource = { |
18 | "pci memory space", | 18 | .start = DDB_PCI_MEM_BASE + 0x00100000, /* leave 1 MB for RTC */ |
19 | DDB_PCI_MEM_BASE + 0x00100000, /* leave 1 MB for RTC */ | 19 | .end = DDB_PCI_MEM_BASE + DDB_PCI_MEM_SIZE - 1, |
20 | DDB_PCI_MEM_BASE + DDB_PCI_MEM_SIZE - 1, | 20 | .name = "pci memory space", |
21 | IORESOURCE_MEM | 21 | .flags = IORESOURCE_MEM |
22 | }; | 22 | }; |
23 | 23 | ||
24 | extern struct pci_ops ddb5476_ext_pci_ops; | 24 | extern struct pci_ops ddb5476_ext_pci_ops; |
diff --git a/arch/mips/pci/pci-ddb5477.c b/arch/mips/pci/pci-ddb5477.c index 826d653184e5..d071bc375b11 100644 --- a/arch/mips/pci/pci-ddb5477.c +++ b/arch/mips/pci/pci-ddb5477.c | |||
@@ -22,31 +22,31 @@ | |||
22 | #include <asm/ddb5xxx/ddb5xxx.h> | 22 | #include <asm/ddb5xxx/ddb5xxx.h> |
23 | 23 | ||
24 | static struct resource extpci_io_resource = { | 24 | static struct resource extpci_io_resource = { |
25 | "ext pci IO space", | 25 | .start = DDB_PCI0_IO_BASE - DDB_PCI_IO_BASE + 0x4000, |
26 | DDB_PCI0_IO_BASE - DDB_PCI_IO_BASE + 0x4000, | 26 | .end = DDB_PCI0_IO_BASE - DDB_PCI_IO_BASE + DDB_PCI0_IO_SIZE - 1, |
27 | DDB_PCI0_IO_BASE - DDB_PCI_IO_BASE + DDB_PCI0_IO_SIZE - 1, | 27 | .name = "ext pci IO space", |
28 | IORESOURCE_IO | 28 | .flags = IORESOURCE_IO |
29 | }; | 29 | }; |
30 | 30 | ||
31 | static struct resource extpci_mem_resource = { | 31 | static struct resource extpci_mem_resource = { |
32 | "ext pci memory space", | 32 | .start = DDB_PCI0_MEM_BASE + 0x100000, |
33 | DDB_PCI0_MEM_BASE + 0x100000, | 33 | .end = DDB_PCI0_MEM_BASE + DDB_PCI0_MEM_SIZE - 1, |
34 | DDB_PCI0_MEM_BASE + DDB_PCI0_MEM_SIZE - 1, | 34 | .name = "ext pci memory space", |
35 | IORESOURCE_MEM | 35 | .flags = IORESOURCE_MEM |
36 | }; | 36 | }; |
37 | 37 | ||
38 | static struct resource iopci_io_resource = { | 38 | static struct resource iopci_io_resource = { |
39 | "io pci IO space", | 39 | .start = DDB_PCI1_IO_BASE - DDB_PCI_IO_BASE, |
40 | DDB_PCI1_IO_BASE - DDB_PCI_IO_BASE, | 40 | .end = DDB_PCI1_IO_BASE - DDB_PCI_IO_BASE + DDB_PCI1_IO_SIZE - 1, |
41 | DDB_PCI1_IO_BASE - DDB_PCI_IO_BASE + DDB_PCI1_IO_SIZE - 1, | 41 | .name = "io pci IO space", |
42 | IORESOURCE_IO | 42 | .flags = IORESOURCE_IO |
43 | }; | 43 | }; |
44 | 44 | ||
45 | static struct resource iopci_mem_resource = { | 45 | static struct resource iopci_mem_resource = { |
46 | "ext pci memory space", | 46 | .start = DDB_PCI1_MEM_BASE, |
47 | DDB_PCI1_MEM_BASE, | 47 | .end = DDB_PCI1_MEM_BASE + DDB_PCI1_MEM_SIZE - 1, |
48 | DDB_PCI1_MEM_BASE + DDB_PCI1_MEM_SIZE - 1, | 48 | .name = "ext pci memory space", |
49 | IORESOURCE_MEM | 49 | .flags = IORESOURCE_MEM |
50 | }; | 50 | }; |
51 | 51 | ||
52 | extern struct pci_ops ddb5477_ext_pci_ops; | 52 | extern struct pci_ops ddb5477_ext_pci_ops; |
diff --git a/arch/mips/pci/pci-jmr3927.c b/arch/mips/pci/pci-jmr3927.c index f02ef6e36b02..cb84f4e8ccae 100644 --- a/arch/mips/pci/pci-jmr3927.c +++ b/arch/mips/pci/pci-jmr3927.c | |||
@@ -35,17 +35,17 @@ | |||
35 | #include <asm/debug.h> | 35 | #include <asm/debug.h> |
36 | 36 | ||
37 | struct resource pci_io_resource = { | 37 | struct resource pci_io_resource = { |
38 | "IO MEM", | 38 | .name = "IO MEM", |
39 | 0x1000, /* reserve regacy I/O space */ | 39 | .start = 0x1000, /* reserve regacy I/O space */ |
40 | 0x1000 + JMR3927_PCIIO_SIZE - 1, | 40 | .end = 0x1000 + JMR3927_PCIIO_SIZE - 1, |
41 | IORESOURCE_IO | 41 | .flags = IORESOURCE_IO |
42 | }; | 42 | }; |
43 | 43 | ||
44 | struct resource pci_mem_resource = { | 44 | struct resource pci_mem_resource = { |
45 | "PCI MEM", | 45 | .name = "PCI MEM", |
46 | JMR3927_PCIMEM, | 46 | .start = JMR3927_PCIMEM, |
47 | JMR3927_PCIMEM + JMR3927_PCIMEM_SIZE - 1, | 47 | .end = JMR3927_PCIMEM + JMR3927_PCIMEM_SIZE - 1, |
48 | IORESOURCE_MEM | 48 | .flags = IORESOURCE_MEM |
49 | }; | 49 | }; |
50 | 50 | ||
51 | extern struct pci_ops jmr3927_pci_ops; | 51 | extern struct pci_ops jmr3927_pci_ops; |
diff --git a/arch/mips/pci/pci-ocelot.c b/arch/mips/pci/pci-ocelot.c index 3da8a4ee6baa..2b9495dce6ba 100644 --- a/arch/mips/pci/pci-ocelot.c +++ b/arch/mips/pci/pci-ocelot.c | |||
@@ -71,13 +71,13 @@ static inline void pci0WriteConfigReg(unsigned int offset, unsigned int data) | |||
71 | } | 71 | } |
72 | 72 | ||
73 | static struct resource ocelot_mem_resource = { | 73 | static struct resource ocelot_mem_resource = { |
74 | iomem_resource.start = GT_PCI_MEM_BASE; | 74 | start = GT_PCI_MEM_BASE; |
75 | iomem_resource.end = GT_PCI_MEM_BASE + GT_PCI_MEM_BASE - 1; | 75 | end = GT_PCI_MEM_BASE + GT_PCI_MEM_BASE - 1; |
76 | }; | 76 | }; |
77 | 77 | ||
78 | static struct resource ocelot_io_resource = { | 78 | static struct resource ocelot_io_resource = { |
79 | ioport_resource.start = GT_PCI_IO_BASE; | 79 | start = GT_PCI_IO_BASE; |
80 | ioport_resource.end = GT_PCI_IO_BASE + GT_PCI_IO_SIZE - 1; | 80 | end = GT_PCI_IO_BASE + GT_PCI_IO_SIZE - 1; |
81 | }; | 81 | }; |
82 | 82 | ||
83 | static struct pci_controller ocelot_pci_controller = { | 83 | static struct pci_controller ocelot_pci_controller = { |
diff --git a/arch/mips/pci/pci-yosemite.c b/arch/mips/pci/pci-yosemite.c index dac9ed4b0ccf..0357946f30e6 100644 --- a/arch/mips/pci/pci-yosemite.c +++ b/arch/mips/pci/pci-yosemite.c | |||
@@ -14,7 +14,10 @@ | |||
14 | extern struct pci_ops titan_pci_ops; | 14 | extern struct pci_ops titan_pci_ops; |
15 | 15 | ||
16 | static struct resource py_mem_resource = { | 16 | static struct resource py_mem_resource = { |
17 | "Titan PCI MEM", 0xe0000000UL, 0xe3ffffffUL, IORESOURCE_MEM | 17 | .start = 0xe0000000UL, |
18 | .end = 0xe3ffffffUL, | ||
19 | .name = "Titan PCI MEM", | ||
20 | .flags = IORESOURCE_MEM | ||
18 | }; | 21 | }; |
19 | 22 | ||
20 | /* | 23 | /* |
@@ -26,7 +29,10 @@ static struct resource py_mem_resource = { | |||
26 | #define TITAN_IO_BASE 0xe8000000UL | 29 | #define TITAN_IO_BASE 0xe8000000UL |
27 | 30 | ||
28 | static struct resource py_io_resource = { | 31 | static struct resource py_io_resource = { |
29 | "Titan IO MEM", 0x00001000UL, TITAN_IO_SIZE - 1, IORESOURCE_IO, | 32 | .start = 0x00001000UL, |
33 | .end = TITAN_IO_SIZE - 1, | ||
34 | .name = "Titan IO MEM", | ||
35 | .flags = IORESOURCE_IO, | ||
30 | }; | 36 | }; |
31 | 37 | ||
32 | static struct pci_controller py_controller = { | 38 | static struct pci_controller py_controller = { |