提交 705630db 编写于 作者: B Ben Dooks 提交者: Russell King

[ARM] 3732/1: S3C24XX: tidy syntax in osiris and anubis machines

Patch from Ben Dooks

Tidy the syntax, such as missing ,'s on the end of
struct entries, in the Osiris and Anubis machines.
Signed-off-by: NBen Dooks <ben-linux@fluff.org>
Signed-off-by: NRussell King <rmk+kernel@arm.linux.org.uk>
上级 34d92626
...@@ -60,11 +60,12 @@ static struct map_desc anubis_iodesc[] __initdata = { ...@@ -60,11 +60,12 @@ static struct map_desc anubis_iodesc[] __initdata = {
.virtual = (u32)S3C24XX_VA_ISA_BYTE, .virtual = (u32)S3C24XX_VA_ISA_BYTE,
.pfn = __phys_to_pfn(0x0), .pfn = __phys_to_pfn(0x0),
.length = SZ_4M, .length = SZ_4M,
.type = MT_DEVICE .type = MT_DEVICE,
}, { }, {
.virtual = (u32)S3C24XX_VA_ISA_WORD, .virtual = (u32)S3C24XX_VA_ISA_WORD,
.pfn = __phys_to_pfn(0x0), .pfn = __phys_to_pfn(0x0),
.length = SZ_4M, MT_DEVICE .length = SZ_4M,
.type = MT_DEVICE,
}, },
/* we could possibly compress the next set down into a set of smaller tables /* we could possibly compress the next set down into a set of smaller tables
...@@ -78,12 +79,12 @@ static struct map_desc anubis_iodesc[] __initdata = { ...@@ -78,12 +79,12 @@ static struct map_desc anubis_iodesc[] __initdata = {
.virtual = (u32)ANUBIS_VA_CTRL1, .virtual = (u32)ANUBIS_VA_CTRL1,
.pfn = __phys_to_pfn(ANUBIS_PA_CTRL1), .pfn = __phys_to_pfn(ANUBIS_PA_CTRL1),
.length = SZ_4K, .length = SZ_4K,
.type = MT_DEVICE .type = MT_DEVICE,
}, { }, {
.virtual = (u32)ANUBIS_VA_CTRL2, .virtual = (u32)ANUBIS_VA_CTRL2,
.pfn = __phys_to_pfn(ANUBIS_PA_CTRL2), .pfn = __phys_to_pfn(ANUBIS_PA_CTRL2),
.length = SZ_4K, .length = SZ_4K,
.type =MT_DEVICE .type = MT_DEVICE,
}, },
/* IDE drives */ /* IDE drives */
...@@ -126,7 +127,7 @@ static struct s3c24xx_uart_clksrc anubis_serial_clocks[] = { ...@@ -126,7 +127,7 @@ static struct s3c24xx_uart_clksrc anubis_serial_clocks[] = {
.name = "pclk", .name = "pclk",
.divisor = 1, .divisor = 1,
.min_baud = 0, .min_baud = 0,
.max_baud = 0. .max_baud = 0,
} }
}; };
...@@ -139,7 +140,7 @@ static struct s3c2410_uartcfg anubis_uartcfgs[] __initdata = { ...@@ -139,7 +140,7 @@ static struct s3c2410_uartcfg anubis_uartcfgs[] __initdata = {
.ulcon = ULCON, .ulcon = ULCON,
.ufcon = UFCON, .ufcon = UFCON,
.clocks = anubis_serial_clocks, .clocks = anubis_serial_clocks,
.clocks_size = ARRAY_SIZE(anubis_serial_clocks) .clocks_size = ARRAY_SIZE(anubis_serial_clocks),
}, },
[1] = { [1] = {
.hwport = 2, .hwport = 2,
...@@ -148,7 +149,7 @@ static struct s3c2410_uartcfg anubis_uartcfgs[] __initdata = { ...@@ -148,7 +149,7 @@ static struct s3c2410_uartcfg anubis_uartcfgs[] __initdata = {
.ulcon = ULCON, .ulcon = ULCON,
.ufcon = UFCON, .ufcon = UFCON,
.clocks = anubis_serial_clocks, .clocks = anubis_serial_clocks,
.clocks_size = ARRAY_SIZE(anubis_serial_clocks) .clocks_size = ARRAY_SIZE(anubis_serial_clocks),
}, },
}; };
...@@ -162,7 +163,7 @@ static struct mtd_partition anubis_default_nand_part[] = { ...@@ -162,7 +163,7 @@ static struct mtd_partition anubis_default_nand_part[] = {
[0] = { [0] = {
.name = "Boot Agent", .name = "Boot Agent",
.size = SZ_16K, .size = SZ_16K,
.offset = 0 .offset = 0,
}, },
[1] = { [1] = {
.name = "/boot", .name = "/boot",
...@@ -194,21 +195,21 @@ static struct s3c2410_nand_set anubis_nand_sets[] = { ...@@ -194,21 +195,21 @@ static struct s3c2410_nand_set anubis_nand_sets[] = {
.nr_chips = 1, .nr_chips = 1,
.nr_map = external_map, .nr_map = external_map,
.nr_partitions = ARRAY_SIZE(anubis_default_nand_part), .nr_partitions = ARRAY_SIZE(anubis_default_nand_part),
.partitions = anubis_default_nand_part .partitions = anubis_default_nand_part,
}, },
[0] = { [0] = {
.name = "chip0", .name = "chip0",
.nr_chips = 1, .nr_chips = 1,
.nr_map = chip0_map, .nr_map = chip0_map,
.nr_partitions = ARRAY_SIZE(anubis_default_nand_part), .nr_partitions = ARRAY_SIZE(anubis_default_nand_part),
.partitions = anubis_default_nand_part .partitions = anubis_default_nand_part,
}, },
[2] = { [2] = {
.name = "chip1", .name = "chip1",
.nr_chips = 1, .nr_chips = 1,
.nr_map = chip1_map, .nr_map = chip1_map,
.nr_partitions = ARRAY_SIZE(anubis_default_nand_part), .nr_partitions = ARRAY_SIZE(anubis_default_nand_part),
.partitions = anubis_default_nand_part .partitions = anubis_default_nand_part,
}, },
}; };
...@@ -313,7 +314,7 @@ static struct s3c24xx_board anubis_board __initdata = { ...@@ -313,7 +314,7 @@ static struct s3c24xx_board anubis_board __initdata = {
.devices = anubis_devices, .devices = anubis_devices,
.devices_count = ARRAY_SIZE(anubis_devices), .devices_count = ARRAY_SIZE(anubis_devices),
.clocks = anubis_clocks, .clocks = anubis_clocks,
.clocks_count = ARRAY_SIZE(anubis_clocks) .clocks_count = ARRAY_SIZE(anubis_clocks),
}; };
static void __init anubis_map_io(void) static void __init anubis_map_io(void)
......
...@@ -67,12 +67,12 @@ static struct map_desc osiris_iodesc[] __initdata = { ...@@ -67,12 +67,12 @@ static struct map_desc osiris_iodesc[] __initdata = {
.virtual = (u32)OSIRIS_VA_CTRL1, .virtual = (u32)OSIRIS_VA_CTRL1,
.pfn = __phys_to_pfn(OSIRIS_PA_CTRL1), .pfn = __phys_to_pfn(OSIRIS_PA_CTRL1),
.length = SZ_16K, .length = SZ_16K,
.type = MT_DEVICE .type = MT_DEVICE,
}, { }, {
.virtual = (u32)OSIRIS_VA_CTRL2, .virtual = (u32)OSIRIS_VA_CTRL2,
.pfn = __phys_to_pfn(OSIRIS_PA_CTRL2), .pfn = __phys_to_pfn(OSIRIS_PA_CTRL2),
.length = SZ_16K, .length = SZ_16K,
.type = MT_DEVICE .type = MT_DEVICE,
}, },
}; };
...@@ -91,7 +91,7 @@ static struct s3c24xx_uart_clksrc osiris_serial_clocks[] = { ...@@ -91,7 +91,7 @@ static struct s3c24xx_uart_clksrc osiris_serial_clocks[] = {
.name = "pclk", .name = "pclk",
.divisor = 1, .divisor = 1,
.min_baud = 0, .min_baud = 0,
.max_baud = 0. .max_baud = 0,
} }
}; };
...@@ -103,7 +103,7 @@ static struct s3c2410_uartcfg osiris_uartcfgs[] __initdata = { ...@@ -103,7 +103,7 @@ static struct s3c2410_uartcfg osiris_uartcfgs[] __initdata = {
.ulcon = ULCON, .ulcon = ULCON,
.ufcon = UFCON, .ufcon = UFCON,
.clocks = osiris_serial_clocks, .clocks = osiris_serial_clocks,
.clocks_size = ARRAY_SIZE(osiris_serial_clocks) .clocks_size = ARRAY_SIZE(osiris_serial_clocks),
}, },
[1] = { [1] = {
.hwport = 1, .hwport = 1,
...@@ -112,7 +112,7 @@ static struct s3c2410_uartcfg osiris_uartcfgs[] __initdata = { ...@@ -112,7 +112,7 @@ static struct s3c2410_uartcfg osiris_uartcfgs[] __initdata = {
.ulcon = ULCON, .ulcon = ULCON,
.ufcon = UFCON, .ufcon = UFCON,
.clocks = osiris_serial_clocks, .clocks = osiris_serial_clocks,
.clocks_size = ARRAY_SIZE(osiris_serial_clocks) .clocks_size = ARRAY_SIZE(osiris_serial_clocks),
}, },
}; };
...@@ -126,7 +126,7 @@ static struct mtd_partition osiris_default_nand_part[] = { ...@@ -126,7 +126,7 @@ static struct mtd_partition osiris_default_nand_part[] = {
[0] = { [0] = {
.name = "Boot Agent", .name = "Boot Agent",
.size = SZ_16K, .size = SZ_16K,
.offset = 0 .offset = 0,
}, },
[1] = { [1] = {
.name = "/boot", .name = "/boot",
...@@ -158,21 +158,21 @@ static struct s3c2410_nand_set osiris_nand_sets[] = { ...@@ -158,21 +158,21 @@ static struct s3c2410_nand_set osiris_nand_sets[] = {
.nr_chips = 1, .nr_chips = 1,
.nr_map = external_map, .nr_map = external_map,
.nr_partitions = ARRAY_SIZE(osiris_default_nand_part), .nr_partitions = ARRAY_SIZE(osiris_default_nand_part),
.partitions = osiris_default_nand_part .partitions = osiris_default_nand_part,
}, },
[0] = { [0] = {
.name = "chip0", .name = "chip0",
.nr_chips = 1, .nr_chips = 1,
.nr_map = chip0_map, .nr_map = chip0_map,
.nr_partitions = ARRAY_SIZE(osiris_default_nand_part), .nr_partitions = ARRAY_SIZE(osiris_default_nand_part),
.partitions = osiris_default_nand_part .partitions = osiris_default_nand_part,
}, },
[2] = { [2] = {
.name = "chip1", .name = "chip1",
.nr_chips = 1, .nr_chips = 1,
.nr_map = chip1_map, .nr_map = chip1_map,
.nr_partitions = ARRAY_SIZE(osiris_default_nand_part), .nr_partitions = ARRAY_SIZE(osiris_default_nand_part),
.partitions = osiris_default_nand_part .partitions = osiris_default_nand_part,
}, },
}; };
...@@ -245,7 +245,7 @@ static struct s3c24xx_board osiris_board __initdata = { ...@@ -245,7 +245,7 @@ static struct s3c24xx_board osiris_board __initdata = {
.devices = osiris_devices, .devices = osiris_devices,
.devices_count = ARRAY_SIZE(osiris_devices), .devices_count = ARRAY_SIZE(osiris_devices),
.clocks = osiris_clocks, .clocks = osiris_clocks,
.clocks_count = ARRAY_SIZE(osiris_clocks) .clocks_count = ARRAY_SIZE(osiris_clocks),
}; };
static void __init osiris_map_io(void) static void __init osiris_map_io(void)
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册