a7y18lte-ubports/android_kernel_samsung_universal7885
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[SERIAL] Use an enum for serial8250 platform device IDs

Browse Source 
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>
This commit is contained in:
Russell King 2005-09-08 16:04:41 +01:00 committed by Russell King
parent caf39e87cc
commit 6df29debb7
26 changed files with 41 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/arm/mach-clps7500/core.c
View File

@ -354,7 +354,7 @@ static struct plat_serial8250_port serial_platform_data[] = {
static struct platform_device serial_device = { static struct platform_device serial_device = {
.name = "serial8250", .name = "serial8250",
.id = 0, .id = PLAT8250_DEV_PLATFORM,
.dev = { .dev = {
.platform_data = serial_platform_data, .platform_data = serial_platform_data,
}, },

2
arch/arm/mach-ebsa110/core.c
View File

@ -219,7 +219,7 @@ static struct plat_serial8250_port serial_platform_data[] = {
static struct platform_device serial_device = { static struct platform_device serial_device = {
.name = "serial8250", .name = "serial8250",
.id = 0, .id = PLAT8250_DEV_PLATFORM,
.dev = { .dev = {
.platform_data = serial_platform_data, .platform_data = serial_platform_data,
}, },

2
arch/arm/mach-epxa10db/arch.c
View File

@ -52,7 +52,7 @@ static struct plat_serial8250_port serial_platform_data[] = {
static struct platform_device serial_device = { static struct platform_device serial_device = {
.name = "serial8250", .name = "serial8250",
.id = 0, .id = PLAT8250_DEV_PLATFORM,
.dev = { .dev = {
.platform_data = serial_platform_data, .platform_data = serial_platform_data,
}, },

2
arch/arm/mach-footbridge/isa.c
View File

@ -34,7 +34,7 @@ static struct plat_serial8250_port serial_platform_data[] = {
static struct platform_device serial_device = { static struct platform_device serial_device = {
.name = "serial8250", .name = "serial8250",
.id = 0, .id = PLAT8250_DEV_PLATFORM,
.dev = { .dev = {
.platform_data = serial_platform_data, .platform_data = serial_platform_data,
}, },

2
arch/arm/mach-h720x/cpu-h7202.c
View File

@ -90,7 +90,7 @@ static struct plat_serial8250_port serial_platform_data[] = {
static struct platform_device serial_device = { static struct platform_device serial_device = {
.name = "serial8250", .name = "serial8250",
.id = 0, .id = PLAT8250_DEV_PLATFORM,
.dev = { .dev = {
.platform_data = serial_platform_data, .platform_data = serial_platform_data,
}, },

2
arch/arm/mach-ixp2000/core.c
View File

@ -174,7 +174,7 @@ static struct resource ixp2000_uart_resource = {
static struct platform_device ixp2000_serial_device = { static struct platform_device ixp2000_serial_device = {
.name = "serial8250", .name = "serial8250",
.id = 0, .id = PLAT8250_DEV_PLATFORM,
.dev = { .dev = {
.platform_data = ixp2000_serial_port, .platform_data = ixp2000_serial_port,
}, },

2
arch/arm/mach-ixp4xx/coyote-setup.c
View File

@ -66,7 +66,7 @@ static struct plat_serial8250_port coyote_uart_data[] = {
static struct platform_device coyote_uart = { static struct platform_device coyote_uart = {
.name = "serial8250", .name = "serial8250",
.id = 0, .id = PLAT8250_DEV_PLATFORM,
.dev = { .dev = {
.platform_data = coyote_uart_data, .platform_data = coyote_uart_data,
}, },

2
arch/arm/mach-ixp4xx/gtwx5715-setup.c
View File

@ -93,7 +93,7 @@ static struct plat_serial8250_port gtwx5715_uart_platform_data[] = {
static struct platform_device gtwx5715_uart_device = { static struct platform_device gtwx5715_uart_device = {
.name = "serial8250", .name = "serial8250",
.id = 0, .id = PLAT8250_DEV_PLATFORM,
.dev = { .dev = {
.platform_data = gtwx5715_uart_platform_data, .platform_data = gtwx5715_uart_platform_data,
}, },

2
arch/arm/mach-ixp4xx/ixdp425-setup.c
View File

@ -96,7 +96,7 @@ static struct plat_serial8250_port ixdp425_uart_data[] = {
static struct platform_device ixdp425_uart = { static struct platform_device ixdp425_uart = {
.name = "serial8250", .name = "serial8250",
.id = 0, .id = PLAT8250_DEV_PLATFORM,
.dev.platform_data = ixdp425_uart_data, .dev.platform_data = ixdp425_uart_data,
.num_resources = 2, .num_resources = 2,
.resource = ixdp425_uart_resources .resource = ixdp425_uart_resources

2
arch/arm/mach-omap1/board-voiceblue.c
View File

@ -74,7 +74,7 @@ static struct plat_serial8250_port voiceblue_ports[] = {
static struct platform_device serial_device = { static struct platform_device serial_device = {
.name = "serial8250", .name = "serial8250",
.id = 1, .id = PLAT8250_DEV_PLATFORM1,
.dev = { .dev = {
.platform_data = voiceblue_ports, .platform_data = voiceblue_ports,
}, },

2
arch/arm/mach-omap1/serial.c
View File

@ -94,7 +94,7 @@ static struct plat_serial8250_port serial_platform_data[] = {
static struct platform_device serial_device = { static struct platform_device serial_device = {
.name = "serial8250", .name = "serial8250",
.id = 0, .id = PLAT8250_DEV_PLATFORM,
.dev = { .dev = {
.platform_data = serial_platform_data, .platform_data = serial_platform_data,
}, },

2
arch/arm/mach-rpc/riscpc.c
View File

@ -140,7 +140,7 @@ static struct plat_serial8250_port serial_platform_data[] = {
static struct platform_device serial_device = { static struct platform_device serial_device = {
.name = "serial8250", .name = "serial8250",
.id = 0, .id = PLAT8250_DEV_PLATFORM,
.dev = { .dev = {
.platform_data = serial_platform_data, .platform_data = serial_platform_data,
}, },

2
arch/arm/mach-s3c2410/mach-bast.c
View File

@ -381,7 +381,7 @@ static struct plat_serial8250_port bast_sio_data[] = {
static struct platform_device bast_sio = { static struct platform_device bast_sio = {
.name = "serial8250", .name = "serial8250",
.id = 0, .id = PLAT8250_DEV_PLATFORM,
.dev = { .dev = {
.platform_data = &bast_sio_data, .platform_data = &bast_sio_data,
}, },

2
arch/arm/mach-s3c2410/mach-vr1000.c
View File

@ -221,7 +221,7 @@ static struct plat_serial8250_port serial_platform_data[] = {
static struct platform_device serial_device = { static struct platform_device serial_device = {
.name = "serial8250", .name = "serial8250",
.id = 0, .id = PLAT8250_DEV_PLATFORM,
.dev = { .dev = {
.platform_data = serial_platform_data, .platform_data = serial_platform_data,
}, },

2
arch/arm/mach-shark/core.c
View File

@ -41,7 +41,7 @@ static struct plat_serial8250_port serial_platform_data[] = {
static struct platform_device serial_device = { static struct platform_device serial_device = {
.name = "serial8250", .name = "serial8250",
.id = 0, .id = PLAT8250_DEV_PLATFORM,
.dev = { .dev = {
.platform_data = serial_platform_data, .platform_data = serial_platform_data,
}, },

4
arch/ppc/syslib/mpc10x_common.c
View File

@ -140,12 +140,12 @@ struct platform_device ppc_sys_platform_devices[] = {
}, },
[MPC10X_UART0] = { [MPC10X_UART0] = {
.name = "serial8250", .name = "serial8250",
.id = 0, .id = PLAT8250_DEV_PLATFORM,
.dev.platform_data = serial_plat_uart0, .dev.platform_data = serial_plat_uart0,
}, },
[MPC10X_UART1] = { [MPC10X_UART1] = {
.name = "serial8250", .name = "serial8250",
.id = 1, .id = PLAT8250_DEV_PLATFORM1,
.dev.platform_data = serial_plat_uart1, .dev.platform_data = serial_plat_uart1,
}, },

2
arch/ppc/syslib/mpc83xx_devices.c
View File

@ -165,7 +165,7 @@ struct platform_device ppc_sys_platform_devices[] = {
}, },
[MPC83xx_DUART] = { [MPC83xx_DUART] = {
.name = "serial8250", .name = "serial8250",
.id = 0, .id = PLAT8250_DEV_PLATFORM,
.dev.platform_data = serial_platform_data, .dev.platform_data = serial_platform_data,
}, },
[MPC83xx_SEC2] = { [MPC83xx_SEC2] = {

2
arch/ppc/syslib/mpc85xx_devices.c
View File

@ -282,7 +282,7 @@ struct platform_device ppc_sys_platform_devices[] = {
}, },
[MPC85xx_DUART] = { [MPC85xx_DUART] = {
.name = "serial8250", .name = "serial8250",
.id = 0, .id = PLAT8250_DEV_PLATFORM,
.dev.platform_data = serial_platform_data, .dev.platform_data = serial_platform_data,
}, },
[MPC85xx_PERFMON] = { [MPC85xx_PERFMON] = {

2
arch/ppc64/kernel/setup.c
View File

@ -1283,7 +1283,7 @@ void __init generic_find_legacy_serial_ports(u64 *physport,
static struct platform_device serial_device = { static struct platform_device serial_device = {
.name = "serial8250", .name = "serial8250",
.id = 0, .id = PLAT8250_DEV_PLATFORM,
.dev = { .dev = {
.platform_data = serial_ports, .platform_data = serial_ports,
}, },

2
drivers/serial/8250.c
View File

@ -2536,7 +2536,7 @@ static int __init serial8250_init(void)
goto out; goto out;
serial8250_isa_devs = platform_device_register_simple("serial8250", serial8250_isa_devs = platform_device_register_simple("serial8250",
-1, NULL, 0); PLAT8250_DEV_LEGACY, NULL, 0);
if (IS_ERR(serial8250_isa_devs)) { if (IS_ERR(serial8250_isa_devs)) {
ret = PTR_ERR(serial8250_isa_devs); ret = PTR_ERR(serial8250_isa_devs);
goto unreg; goto unreg;

2
drivers/serial/8250_accent.c
View File

@ -29,7 +29,7 @@ static struct plat_serial8250_port accent_data[] = {
static struct platform_device accent_device = { static struct platform_device accent_device = {
.name = "serial8250", .name = "serial8250",
.id = 2, .id = PLAT8250_DEV_ACCENT,
.dev = { .dev = {
.platform_data = accent_data, .platform_data = accent_data,
}, },

2
drivers/serial/8250_boca.c
View File

@ -43,7 +43,7 @@ static struct plat_serial8250_port boca_data[] = {
static struct platform_device boca_device = { static struct platform_device boca_device = {
.name = "serial8250", .name = "serial8250",
.id = 3, .id = PLAT8250_DEV_BOCA,
.dev = { .dev = {
.platform_data = boca_data, .platform_data = boca_data,
}, },

2
drivers/serial/8250_fourport.c
View File

@ -35,7 +35,7 @@ static struct plat_serial8250_port fourport_data[] = {
static struct platform_device fourport_device = { static struct platform_device fourport_device = {
.name = "serial8250", .name = "serial8250",
.id = 1, .id = PLAT8250_DEV_FOURPORT,
.dev = { .dev = {
.platform_data = fourport_data, .platform_data = fourport_data,
}, },

2
drivers/serial/8250_hub6.c
View File

@ -40,7 +40,7 @@ static struct plat_serial8250_port hub6_data[] = {
static struct platform_device hub6_device = { static struct platform_device hub6_device = {
.name = "serial8250", .name = "serial8250",
.id = 4, .id = PLAT8250_DEV_HUB6,
.dev = { .dev = {
.platform_data = hub6_data, .platform_data = hub6_data,
}, },

2
drivers/serial/8250_mca.c
View File

@ -44,7 +44,7 @@ static struct plat_serial8250_port mca_data[] = {
static struct platform_device mca_device = { static struct platform_device mca_device = {
.name = "serial8250", .name = "serial8250",
.id = 5, .id = PLAT8250_DEV_MCA,
.dev = { .dev = {
.platform_data = mca_data, .platform_data = mca_data,
}, },

15
include/linux/serial_8250.h
View File

@ -29,6 +29,21 @@ struct plat_serial8250_port {
unsigned int flags; /* UPF_* flags */ unsigned int flags; /* UPF_* flags */
}; };
/*
* Allocate 8250 platform device IDs. Nothing is implied by
* the numbering here, except for the legacy entry being -1.
*/
enum {
PLAT8250_DEV_LEGACY = -1,
PLAT8250_DEV_PLATFORM,
PLAT8250_DEV_PLATFORM1,
PLAT8250_DEV_FOURPORT,
PLAT8250_DEV_ACCENT,
PLAT8250_DEV_BOCA,
PLAT8250_DEV_HUB6,
PLAT8250_DEV_MCA,
};
/* /*
* This should be used by drivers which want to register * This should be used by drivers which want to register
* their own 8250 ports without registering their own * their own 8250 ports without registering their own