diff options
author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2005-09-08 11:04:41 -0400 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2005-09-08 11:04:41 -0400 |
commit | 6df29debb7fc04ac3f92038c57437f40bab4e72d (patch) | |
tree | fbf9c8697c39c587471cbf18736c3692b55d3605 /arch/arm | |
parent | caf39e87cc1182f7dae84eefc43ca14d54c78ef9 (diff) |
[SERIAL] Use an enum for serial8250 platform device IDs
Rather than hard-coding the platform device IDs, enumerate them.
We don't particularly care about the actual ID we get, just as
long as they're unique.
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm')
-rw-r--r-- | arch/arm/mach-clps7500/core.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-ebsa110/core.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-epxa10db/arch.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-footbridge/isa.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-h720x/cpu-h7202.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-ixp2000/core.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-ixp4xx/coyote-setup.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-ixp4xx/gtwx5715-setup.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-ixp4xx/ixdp425-setup.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-omap1/board-voiceblue.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-omap1/serial.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-rpc/riscpc.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-s3c2410/mach-bast.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-s3c2410/mach-vr1000.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-shark/core.c | 2 |
15 files changed, 15 insertions, 15 deletions
diff --git a/arch/arm/mach-clps7500/core.c b/arch/arm/mach-clps7500/core.c index 112f1d68fb2b..e216ab8b9e8f 100644 --- a/arch/arm/mach-clps7500/core.c +++ b/arch/arm/mach-clps7500/core.c | |||
@@ -354,7 +354,7 @@ static struct plat_serial8250_port serial_platform_data[] = { | |||
354 | 354 | ||
355 | static struct platform_device serial_device = { | 355 | static struct platform_device serial_device = { |
356 | .name = "serial8250", | 356 | .name = "serial8250", |
357 | .id = 0, | 357 | .id = PLAT8250_DEV_PLATFORM, |
358 | .dev = { | 358 | .dev = { |
359 | .platform_data = serial_platform_data, | 359 | .platform_data = serial_platform_data, |
360 | }, | 360 | }, |
diff --git a/arch/arm/mach-ebsa110/core.c b/arch/arm/mach-ebsa110/core.c index 23c4da10101b..5aeadfd72143 100644 --- a/arch/arm/mach-ebsa110/core.c +++ b/arch/arm/mach-ebsa110/core.c | |||
@@ -219,7 +219,7 @@ static struct plat_serial8250_port serial_platform_data[] = { | |||
219 | 219 | ||
220 | static struct platform_device serial_device = { | 220 | static struct platform_device serial_device = { |
221 | .name = "serial8250", | 221 | .name = "serial8250", |
222 | .id = 0, | 222 | .id = PLAT8250_DEV_PLATFORM, |
223 | .dev = { | 223 | .dev = { |
224 | .platform_data = serial_platform_data, | 224 | .platform_data = serial_platform_data, |
225 | }, | 225 | }, |
diff --git a/arch/arm/mach-epxa10db/arch.c b/arch/arm/mach-epxa10db/arch.c index 7daa021676d0..44c56571d183 100644 --- a/arch/arm/mach-epxa10db/arch.c +++ b/arch/arm/mach-epxa10db/arch.c | |||
@@ -52,7 +52,7 @@ static struct plat_serial8250_port serial_platform_data[] = { | |||
52 | 52 | ||
53 | static struct platform_device serial_device = { | 53 | static struct platform_device serial_device = { |
54 | .name = "serial8250", | 54 | .name = "serial8250", |
55 | .id = 0, | 55 | .id = PLAT8250_DEV_PLATFORM, |
56 | .dev = { | 56 | .dev = { |
57 | .platform_data = serial_platform_data, | 57 | .platform_data = serial_platform_data, |
58 | }, | 58 | }, |
diff --git a/arch/arm/mach-footbridge/isa.c b/arch/arm/mach-footbridge/isa.c index aa3a1fef563e..28846c7edaaf 100644 --- a/arch/arm/mach-footbridge/isa.c +++ b/arch/arm/mach-footbridge/isa.c | |||
@@ -34,7 +34,7 @@ static struct plat_serial8250_port serial_platform_data[] = { | |||
34 | 34 | ||
35 | static struct platform_device serial_device = { | 35 | static struct platform_device serial_device = { |
36 | .name = "serial8250", | 36 | .name = "serial8250", |
37 | .id = 0, | 37 | .id = PLAT8250_DEV_PLATFORM, |
38 | .dev = { | 38 | .dev = { |
39 | .platform_data = serial_platform_data, | 39 | .platform_data = serial_platform_data, |
40 | }, | 40 | }, |
diff --git a/arch/arm/mach-h720x/cpu-h7202.c b/arch/arm/mach-h720x/cpu-h7202.c index 4b3199319e68..a4a7c0125d03 100644 --- a/arch/arm/mach-h720x/cpu-h7202.c +++ b/arch/arm/mach-h720x/cpu-h7202.c | |||
@@ -90,7 +90,7 @@ static struct plat_serial8250_port serial_platform_data[] = { | |||
90 | 90 | ||
91 | static struct platform_device serial_device = { | 91 | static struct platform_device serial_device = { |
92 | .name = "serial8250", | 92 | .name = "serial8250", |
93 | .id = 0, | 93 | .id = PLAT8250_DEV_PLATFORM, |
94 | .dev = { | 94 | .dev = { |
95 | .platform_data = serial_platform_data, | 95 | .platform_data = serial_platform_data, |
96 | }, | 96 | }, |
diff --git a/arch/arm/mach-ixp2000/core.c b/arch/arm/mach-ixp2000/core.c index 098c817a7fb8..74bd2fd602d4 100644 --- a/arch/arm/mach-ixp2000/core.c +++ b/arch/arm/mach-ixp2000/core.c | |||
@@ -174,7 +174,7 @@ static struct resource ixp2000_uart_resource = { | |||
174 | 174 | ||
175 | static struct platform_device ixp2000_serial_device = { | 175 | static struct platform_device ixp2000_serial_device = { |
176 | .name = "serial8250", | 176 | .name = "serial8250", |
177 | .id = 0, | 177 | .id = PLAT8250_DEV_PLATFORM, |
178 | .dev = { | 178 | .dev = { |
179 | .platform_data = ixp2000_serial_port, | 179 | .platform_data = ixp2000_serial_port, |
180 | }, | 180 | }, |
diff --git a/arch/arm/mach-ixp4xx/coyote-setup.c b/arch/arm/mach-ixp4xx/coyote-setup.c index 8b2f25322452..050c92768913 100644 --- a/arch/arm/mach-ixp4xx/coyote-setup.c +++ b/arch/arm/mach-ixp4xx/coyote-setup.c | |||
@@ -66,7 +66,7 @@ static struct plat_serial8250_port coyote_uart_data[] = { | |||
66 | 66 | ||
67 | static struct platform_device coyote_uart = { | 67 | static struct platform_device coyote_uart = { |
68 | .name = "serial8250", | 68 | .name = "serial8250", |
69 | .id = 0, | 69 | .id = PLAT8250_DEV_PLATFORM, |
70 | .dev = { | 70 | .dev = { |
71 | .platform_data = coyote_uart_data, | 71 | .platform_data = coyote_uart_data, |
72 | }, | 72 | }, |
diff --git a/arch/arm/mach-ixp4xx/gtwx5715-setup.c b/arch/arm/mach-ixp4xx/gtwx5715-setup.c index 3fd92c5cbaa8..29a6d02fa851 100644 --- a/arch/arm/mach-ixp4xx/gtwx5715-setup.c +++ b/arch/arm/mach-ixp4xx/gtwx5715-setup.c | |||
@@ -93,7 +93,7 @@ static struct plat_serial8250_port gtwx5715_uart_platform_data[] = { | |||
93 | 93 | ||
94 | static struct platform_device gtwx5715_uart_device = { | 94 | static struct platform_device gtwx5715_uart_device = { |
95 | .name = "serial8250", | 95 | .name = "serial8250", |
96 | .id = 0, | 96 | .id = PLAT8250_DEV_PLATFORM, |
97 | .dev = { | 97 | .dev = { |
98 | .platform_data = gtwx5715_uart_platform_data, | 98 | .platform_data = gtwx5715_uart_platform_data, |
99 | }, | 99 | }, |
diff --git a/arch/arm/mach-ixp4xx/ixdp425-setup.c b/arch/arm/mach-ixp4xx/ixdp425-setup.c index 6c14ff3c23a0..ae1fa099d5fa 100644 --- a/arch/arm/mach-ixp4xx/ixdp425-setup.c +++ b/arch/arm/mach-ixp4xx/ixdp425-setup.c | |||
@@ -96,7 +96,7 @@ static struct plat_serial8250_port ixdp425_uart_data[] = { | |||
96 | 96 | ||
97 | static struct platform_device ixdp425_uart = { | 97 | static struct platform_device ixdp425_uart = { |
98 | .name = "serial8250", | 98 | .name = "serial8250", |
99 | .id = 0, | 99 | .id = PLAT8250_DEV_PLATFORM, |
100 | .dev.platform_data = ixdp425_uart_data, | 100 | .dev.platform_data = ixdp425_uart_data, |
101 | .num_resources = 2, | 101 | .num_resources = 2, |
102 | .resource = ixdp425_uart_resources | 102 | .resource = ixdp425_uart_resources |
diff --git a/arch/arm/mach-omap1/board-voiceblue.c b/arch/arm/mach-omap1/board-voiceblue.c index e42281988990..76176dd518ba 100644 --- a/arch/arm/mach-omap1/board-voiceblue.c +++ b/arch/arm/mach-omap1/board-voiceblue.c | |||
@@ -74,7 +74,7 @@ static struct plat_serial8250_port voiceblue_ports[] = { | |||
74 | 74 | ||
75 | static struct platform_device serial_device = { | 75 | static struct platform_device serial_device = { |
76 | .name = "serial8250", | 76 | .name = "serial8250", |
77 | .id = 1, | 77 | .id = PLAT8250_DEV_PLATFORM1, |
78 | .dev = { | 78 | .dev = { |
79 | .platform_data = voiceblue_ports, | 79 | .platform_data = voiceblue_ports, |
80 | }, | 80 | }, |
diff --git a/arch/arm/mach-omap1/serial.c b/arch/arm/mach-omap1/serial.c index 214e5d17c8b5..1446bf332e4c 100644 --- a/arch/arm/mach-omap1/serial.c +++ b/arch/arm/mach-omap1/serial.c | |||
@@ -94,7 +94,7 @@ static struct plat_serial8250_port serial_platform_data[] = { | |||
94 | 94 | ||
95 | static struct platform_device serial_device = { | 95 | static struct platform_device serial_device = { |
96 | .name = "serial8250", | 96 | .name = "serial8250", |
97 | .id = 0, | 97 | .id = PLAT8250_DEV_PLATFORM, |
98 | .dev = { | 98 | .dev = { |
99 | .platform_data = serial_platform_data, | 99 | .platform_data = serial_platform_data, |
100 | }, | 100 | }, |
diff --git a/arch/arm/mach-rpc/riscpc.c b/arch/arm/mach-rpc/riscpc.c index a10268618f74..e3587efec4bf 100644 --- a/arch/arm/mach-rpc/riscpc.c +++ b/arch/arm/mach-rpc/riscpc.c | |||
@@ -140,7 +140,7 @@ static struct plat_serial8250_port serial_platform_data[] = { | |||
140 | 140 | ||
141 | static struct platform_device serial_device = { | 141 | static struct platform_device serial_device = { |
142 | .name = "serial8250", | 142 | .name = "serial8250", |
143 | .id = 0, | 143 | .id = PLAT8250_DEV_PLATFORM, |
144 | .dev = { | 144 | .dev = { |
145 | .platform_data = serial_platform_data, | 145 | .platform_data = serial_platform_data, |
146 | }, | 146 | }, |
diff --git a/arch/arm/mach-s3c2410/mach-bast.c b/arch/arm/mach-s3c2410/mach-bast.c index e9182242da95..1a3367da6408 100644 --- a/arch/arm/mach-s3c2410/mach-bast.c +++ b/arch/arm/mach-s3c2410/mach-bast.c | |||
@@ -381,7 +381,7 @@ static struct plat_serial8250_port bast_sio_data[] = { | |||
381 | 381 | ||
382 | static struct platform_device bast_sio = { | 382 | static struct platform_device bast_sio = { |
383 | .name = "serial8250", | 383 | .name = "serial8250", |
384 | .id = 0, | 384 | .id = PLAT8250_DEV_PLATFORM, |
385 | .dev = { | 385 | .dev = { |
386 | .platform_data = &bast_sio_data, | 386 | .platform_data = &bast_sio_data, |
387 | }, | 387 | }, |
diff --git a/arch/arm/mach-s3c2410/mach-vr1000.c b/arch/arm/mach-s3c2410/mach-vr1000.c index 924e8464c212..8f9ab2893df4 100644 --- a/arch/arm/mach-s3c2410/mach-vr1000.c +++ b/arch/arm/mach-s3c2410/mach-vr1000.c | |||
@@ -221,7 +221,7 @@ static struct plat_serial8250_port serial_platform_data[] = { | |||
221 | 221 | ||
222 | static struct platform_device serial_device = { | 222 | static struct platform_device serial_device = { |
223 | .name = "serial8250", | 223 | .name = "serial8250", |
224 | .id = 0, | 224 | .id = PLAT8250_DEV_PLATFORM, |
225 | .dev = { | 225 | .dev = { |
226 | .platform_data = serial_platform_data, | 226 | .platform_data = serial_platform_data, |
227 | }, | 227 | }, |
diff --git a/arch/arm/mach-shark/core.c b/arch/arm/mach-shark/core.c index e737eae4521f..946c0d11c73b 100644 --- a/arch/arm/mach-shark/core.c +++ b/arch/arm/mach-shark/core.c | |||
@@ -41,7 +41,7 @@ static struct plat_serial8250_port serial_platform_data[] = { | |||
41 | 41 | ||
42 | static struct platform_device serial_device = { | 42 | static struct platform_device serial_device = { |
43 | .name = "serial8250", | 43 | .name = "serial8250", |
44 | .id = 0, | 44 | .id = PLAT8250_DEV_PLATFORM, |
45 | .dev = { | 45 | .dev = { |
46 | .platform_data = serial_platform_data, | 46 | .platform_data = serial_platform_data, |
47 | }, | 47 | }, |