From: Andrew Morton Cc: Nicolas DET Signed-off-by: Andrew Morton --- arch/ppc/platforms/chrp_pegasos_eth.c | 27 +++++++++------------------ 1 files changed, 9 insertions(+), 18 deletions(-) diff -puN arch/ppc/platforms/chrp_pegasos_eth.c~chrp_pegasos_eth-added-marvell-discovery-tidy-2 arch/ppc/platforms/chrp_pegasos_eth.c --- 25/arch/ppc/platforms/chrp_pegasos_eth.c~chrp_pegasos_eth-added-marvell-discovery-tidy-2 Fri Oct 14 14:25:18 2005 +++ 25-akpm/arch/ppc/platforms/chrp_pegasos_eth.c Fri Oct 14 14:25:18 2005 @@ -36,8 +36,7 @@ #undef BE_VERBOSE /* Pegasos 2 specific Marvell MV 64361 gigabit ethernet port setup */ -static struct resource mv643xx_eth_shared_resources[] = -{ +static struct resource mv643xx_eth_shared_resources[] = { [0] = { .name = "ethernet shared base", .start = 0xf1000000 + MV643XX_ETH_SHARED_REGS, @@ -47,16 +46,14 @@ static struct resource mv643xx_eth_share }, }; -static struct platform_device mv643xx_eth_shared_device = -{ +static struct platform_device mv643xx_eth_shared_device = { .name = MV643XX_ETH_SHARED_NAME, .id = 0, .num_resources = ARRAY_SIZE(mv643xx_eth_shared_resources), .resource = mv643xx_eth_shared_resources, }; -static struct resource mv643xx_eth0_resources[] = -{ +static struct resource mv643xx_eth0_resources[] = { [0] = { .name = "eth0 irq", .start = 9, @@ -65,8 +62,7 @@ static struct resource mv643xx_eth0_reso }, }; -static struct mv643xx_eth_platform_data eth0_pd = -{ +static struct mv643xx_eth_platform_data eth0_pd = { .tx_sram_addr = PEGASOS2_SRAM_BASE_ETH0, .tx_sram_size = PEGASOS2_SRAM_TXRING_SIZE, .tx_queue_size = PEGASOS2_SRAM_TXRING_SIZE/16, @@ -76,8 +72,7 @@ static struct mv643xx_eth_platform_data .rx_queue_size = PEGASOS2_SRAM_RXRING_SIZE/16, }; -static struct platform_device eth0_device = -{ +static struct platform_device eth0_device = { .name = MV643XX_ETH_NAME, .id = 0, .num_resources = ARRAY_SIZE(mv643xx_eth0_resources), @@ -87,8 +82,7 @@ static struct platform_device eth0_devic }, }; -static struct resource mv643xx_eth1_resources[] = -{ +static struct resource mv643xx_eth1_resources[] = { [0] = { .name = "eth1 irq", .start = 9, @@ -97,8 +91,7 @@ static struct resource mv643xx_eth1_reso }, }; -static struct mv643xx_eth_platform_data eth1_pd = -{ +static struct mv643xx_eth_platform_data eth1_pd = { .tx_sram_addr = PEGASOS2_SRAM_BASE_ETH1, .tx_sram_size = PEGASOS2_SRAM_TXRING_SIZE, .tx_queue_size = PEGASOS2_SRAM_TXRING_SIZE/16, @@ -108,8 +101,7 @@ static struct mv643xx_eth_platform_data .rx_queue_size = PEGASOS2_SRAM_RXRING_SIZE/16, }; -static struct platform_device eth1_device = -{ +static struct platform_device eth1_device = { .name = MV643XX_ETH_NAME, .id = 1, .num_resources = ARRAY_SIZE(mv643xx_eth1_resources), @@ -119,8 +111,7 @@ static struct platform_device eth1_devic }, }; -static struct platform_device *mv643xx_eth_pd_devs[] __initdata = -{ +static struct platform_device *mv643xx_eth_pd_devs[] __initdata = { &mv643xx_eth_shared_device, ð0_device, ð1_device, _