Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 705630db authored by Ben Dooks's avatar Ben Dooks Committed by Russell King
Browse files

[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: default avatarBen Dooks <ben-linux@fluff.org>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 34d92626

arch/arm/mach-s3c2410/mach-anubis.c

+13 −12
Original line number Diff line number Diff line
@@ -60,11 +60,12 @@ static struct map_desc anubis_iodesc[] __initdata = { 
	.virtual	= (u32)S3C24XX_VA_ISA_BYTE,

	.pfn		= __phys_to_pfn(0x0),

	.length		= SZ_4M,

	.type		= MT_DEVICE

	.type		= MT_DEVICE,

  }, {

	.virtual	= (u32)S3C24XX_VA_ISA_WORD,

	.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
@@ -78,12 +79,12 @@ static struct map_desc anubis_iodesc[] __initdata = { 
	.virtual	= (u32)ANUBIS_VA_CTRL1,

	.pfn		= __phys_to_pfn(ANUBIS_PA_CTRL1),

	.length		= SZ_4K,

	.type		= MT_DEVICE

	.type		= MT_DEVICE,

  }, {

	.virtual	= (u32)ANUBIS_VA_CTRL2,

	.pfn		= __phys_to_pfn(ANUBIS_PA_CTRL2),

	.length		= SZ_4K,

	.type		=MT_DEVICE

	.type		= MT_DEVICE,

  },



  /* IDE drives */
@@ -126,7 +127,7 @@ static struct s3c24xx_uart_clksrc anubis_serial_clocks[] = { 
		.name		= "pclk",

		.divisor	= 1,

		.min_baud	= 0,

		.max_baud	= 0.

		.max_baud	= 0,

	}

};
@@ -139,7 +140,7 @@ static struct s3c2410_uartcfg anubis_uartcfgs[] __initdata = { 
		.ulcon	     = ULCON,

		.ufcon	     = UFCON,

		.clocks	     = anubis_serial_clocks,

		.clocks_size = ARRAY_SIZE(anubis_serial_clocks)

		.clocks_size = ARRAY_SIZE(anubis_serial_clocks),

	},

	[1] = {

		.hwport	     = 2,
@@ -148,7 +149,7 @@ static struct s3c2410_uartcfg anubis_uartcfgs[] __initdata = { 
		.ulcon	     = ULCON,

		.ufcon	     = UFCON,

		.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[] = { 
	[0] = {

		.name	= "Boot Agent",

		.size	= SZ_16K,

		.offset	= 0

		.offset	= 0,

	},

	[1] = {

		.name	= "/boot",
@@ -194,21 +195,21 @@ static struct s3c2410_nand_set anubis_nand_sets[] = { 
		.nr_chips	= 1,

		.nr_map		= external_map,

		.nr_partitions	= ARRAY_SIZE(anubis_default_nand_part),

		.partitions	= anubis_default_nand_part

		.partitions	= anubis_default_nand_part,

	},

	[0] = {

		.name		= "chip0",

		.nr_chips	= 1,

		.nr_map		= chip0_map,

		.nr_partitions	= ARRAY_SIZE(anubis_default_nand_part),

		.partitions	= anubis_default_nand_part

		.partitions	= anubis_default_nand_part,

	},

	[2] = {

		.name		= "chip1",

		.nr_chips	= 1,

		.nr_map		= chip1_map,

		.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 = { 
	.devices       = anubis_devices,

	.devices_count = ARRAY_SIZE(anubis_devices),

	.clocks	       = anubis_clocks,

	.clocks_count  = ARRAY_SIZE(anubis_clocks)

	.clocks_count  = ARRAY_SIZE(anubis_clocks),

};



static void __init anubis_map_io(void)

arch/arm/mach-s3c2410/mach-osiris.c

+10 −10
Original line number Diff line number Diff line
@@ -67,12 +67,12 @@ static struct map_desc osiris_iodesc[] __initdata = { 
	  .virtual	= (u32)OSIRIS_VA_CTRL1,

	  .pfn		= __phys_to_pfn(OSIRIS_PA_CTRL1),

	  .length	= SZ_16K,

	  .type		= MT_DEVICE

	  .type		= MT_DEVICE,

  }, {

	  .virtual	= (u32)OSIRIS_VA_CTRL2,

	  .pfn		= __phys_to_pfn(OSIRIS_PA_CTRL2),

	  .length	= SZ_16K,

	  .type		= MT_DEVICE

	  .type		= MT_DEVICE,

  },

};
@@ -91,7 +91,7 @@ static struct s3c24xx_uart_clksrc osiris_serial_clocks[] = { 
		.name		= "pclk",

		.divisor	= 1,

		.min_baud	= 0,

		.max_baud	= 0.

		.max_baud	= 0,

	}

};
@@ -103,7 +103,7 @@ static struct s3c2410_uartcfg osiris_uartcfgs[] __initdata = { 
		.ulcon	     = ULCON,

		.ufcon	     = UFCON,

		.clocks	     = osiris_serial_clocks,

		.clocks_size = ARRAY_SIZE(osiris_serial_clocks)

		.clocks_size = ARRAY_SIZE(osiris_serial_clocks),

	},

	[1] = {

		.hwport	     = 1,
@@ -112,7 +112,7 @@ static struct s3c2410_uartcfg osiris_uartcfgs[] __initdata = { 
		.ulcon	     = ULCON,

		.ufcon	     = UFCON,

		.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[] = { 
	[0] = {

		.name	= "Boot Agent",

		.size	= SZ_16K,

		.offset	= 0

		.offset	= 0,

	},

	[1] = {

		.name	= "/boot",
@@ -158,21 +158,21 @@ static struct s3c2410_nand_set osiris_nand_sets[] = { 
		.nr_chips	= 1,

		.nr_map		= external_map,

		.nr_partitions	= ARRAY_SIZE(osiris_default_nand_part),

		.partitions	= osiris_default_nand_part

		.partitions	= osiris_default_nand_part,

	},

	[0] = {

		.name		= "chip0",

		.nr_chips	= 1,

		.nr_map		= chip0_map,

		.nr_partitions	= ARRAY_SIZE(osiris_default_nand_part),

		.partitions	= osiris_default_nand_part

		.partitions	= osiris_default_nand_part,

	},

	[2] = {

		.name		= "chip1",

		.nr_chips	= 1,

		.nr_map		= chip1_map,

		.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 = { 
	.devices       = osiris_devices,

	.devices_count = ARRAY_SIZE(osiris_devices),

	.clocks	       = osiris_clocks,

	.clocks_count  = ARRAY_SIZE(osiris_clocks)

	.clocks_count  = ARRAY_SIZE(osiris_clocks),

};



static void __init osiris_map_io(void)