coding style fixes

SVN-Revision: 9263

3 files changed, 33 insertions, 30 deletions

diff --git a/target/linux/adm5120/files/drivers/mtd/maps/adm5120-flash.c b/target/linux/adm5120/files/drivers/mtd/maps/adm5120-flash.c
index 7a55396..e07fb96 100644
--- a/target/linux/adm5120/files/drivers/mtd/maps/adm5120-flash.c
+++ b/target/linux/adm5120/files/drivers/mtd/maps/adm5120-flash.c
@@ -32,15 +32,14 @@
 #include <linux/kernel.h>
 #include <linux/init.h>
 #include <linux/slab.h>
+#include <linux/io.h>
 #include <linux/device.h>
-
 #include <linux/platform_device.h>
+
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/map.h>
 #include <linux/mtd/partitions.h>
 
-#include <asm/io.h>
-
 #include <adm5120_defs.h>
 #include <adm5120_switch.h>
 #include <adm5120_mpmc.h>
@@ -173,7 +172,7 @@ static void adm5120_flash_write(struct map_info *map, const map_word datum,
 {
 	struct adm5120_map_info *amap = map_to_amap(map);
 
-	MAP_DBG(map,"writing to ofs %lX\n", ofs);
+	MAP_DBG(map, "writing to ofs %lX\n", ofs);
 
 	if (ofs > amap->window_size)
 		return;
@@ -329,7 +328,7 @@ static void adm5120_flash_initbanks(struct adm5120_flash_info *info)
 #ifdef CONFIG_MTD_PARTITIONS
 static int adm5120_flash_initparts(struct adm5120_flash_info *info)
 {
-	struct adm5120_flash_platform_data *pdata = info->dev->dev.platform_data;
+	struct adm5120_flash_platform_data *pdata;
 	struct map_info *map = &info->amap.map;
 	int num_parsers;
 	const char *parser[2];
@@ -339,6 +338,7 @@ static int adm5120_flash_initparts(struct adm5120_flash_info *info)
 
 	info->nr_parts = 0;
 
+	pdata = info->dev->dev.platform_data;
 	if (pdata == NULL)
 		goto out;
 
@@ -357,7 +357,7 @@ static int adm5120_flash_initparts(struct adm5120_flash_info *info)
 		num_parsers = MAX_PARSED_PARTS;
 
 	parser[1] = NULL;
-	for (i=0; i<num_parsers; i++) {
+	for (i = 0; i < num_parsers; i++) {
 		parser[0] = parse_types[i];
 
 		MAP_INFO(map, "parsing \"%s\" partitions\n",
@@ -394,7 +394,7 @@ static void adm5120_flash_remove_mtd(struct adm5120_flash_info *info)
 
 	if (info->nr_parts) {
 		del_mtd_partitions(info->mtd);
-		for (i=0; i<MAX_PARSED_PARTS; i++)
+		for (i = 0; i < MAX_PARSED_PARTS; i++)
 			if (info->parts[i] != NULL)
 				kfree(info->parts[i]);
 	} else {
@@ -496,7 +496,8 @@ static int adm5120_flash_probe(struct platform_device *dev)
 		goto err_out;
 
 	if (info->nr_parts == 0) {
-		MAP_INFO(map, "no partitions available, registering whole flash\n");
+		MAP_INFO(map, "no partitions available, registering "
+			"whole flash\n");
 		add_mtd_device(info->mtd);
 	}
 
@@ -508,7 +509,8 @@ err_out:
 }
 
 #ifdef CONFIG_PM
-static int adm5120_flash_suspend(struct platform_device *dev, pm_message_t state)
+static int adm5120_flash_suspend(struct platform_device *dev,
+		pm_message_t state)
 {
 	struct adm5120_flash_info *info = platform_get_drvdata(dev);
 	int ret = 0;
diff --git a/target/linux/adm5120/files/drivers/mtd/myloader.c b/target/linux/adm5120/files/drivers/mtd/myloader.c
index ad207e5..24d41c5 100644
--- a/target/linux/adm5120/files/drivers/mtd/myloader.c
+++ b/target/linux/adm5120/files/drivers/mtd/myloader.c
@@ -54,7 +54,6 @@ int parse_myloader_partitions(struct mtd_info *master,
 	int num_parts;
 	int ret, i;
 	size_t retlen;
-	size_t parts_len;
 	char *names;
 	unsigned long offset;
 	unsigned long blocklen;
@@ -104,8 +103,8 @@ int parse_myloader_partitions(struct mtd_info *master,
 		num_parts++;
 	}
 
-	mtd_parts = kzalloc((num_parts*sizeof(*mtd_part) + num_parts*NAME_LEN_MAX),
-			 GFP_KERNEL);
+	mtd_parts = kzalloc((num_parts * sizeof(*mtd_part) +
+				num_parts * NAME_LEN_MAX), GFP_KERNEL);
 
 	if (!mtd_parts) {
 		ret = -ENOMEM;
diff --git a/target/linux/adm5120/files/drivers/mtd/trxsplit.c b/target/linux/adm5120/files/drivers/mtd/trxsplit.c
index ad0e25a..19d1e9d 100644
--- a/target/linux/adm5120/files/drivers/mtd/trxsplit.c
+++ b/target/linux/adm5120/files/drivers/mtd/trxsplit.c
@@ -38,24 +38,24 @@
 #define TRX_MAGIC	0x30524448	/* "HDR0" */
 #define TRX_VERSION	1
 #define TRX_MAX_LEN	0x3A0000
-#define TRX_NO_HEADER	1		/* Do not write TRX header */
-#define TRX_GZ_FILES	0x2     /* Contains up to TRX_MAX_OFFSET individual gzip files */
+#define TRX_NO_HEADER	0x1	/* do not write TRX header */
+#define TRX_GZ_FILES	0x2     /* contains individual gzip files */
 #define TRX_MAX_OFFSET	3
 #define TRX_MIN_KERNEL_SIZE	256*1024
 
 struct trx_header {
-	u32 magic;		/* "HDR0" */
-	u32 len;		/* Length of file including header */
-	u32 crc32;		/* 32-bit CRC from flag_version to end of file */
-	u32 flag_version;	/* 0:15 flags, 16:31 version */
-	u32 offsets[TRX_MAX_OFFSET];	/* Offsets of partitions from start of header */
+	u32 magic;	/* "HDR0" */
+	u32 len;	/* Length of file including header */
+	u32 crc32;	/* 32-bit CRC from flag_version to end of file */
+	u32 flag_version; /* 0:15 flags, 16:31 version */
+	u32 offsets[TRX_MAX_OFFSET]; /* Offsets of partitions */
 };
 
 #define BLOCK_LEN_MIN		0x10000
 
-static struct mtd_info *trx_mtd = NULL;
-static unsigned long trx_offset = 0;
-static int trx_nr_parts = 0;
+static int trx_nr_parts;
+static unsigned long trx_offset;
+static struct mtd_info *trx_mtd;
 static struct mtd_partition trx_parts[TRX_MAX_OFFSET];
 static struct trx_header trx_hdr;
 
@@ -66,7 +66,8 @@ static int trxsplit_checktrx(struct mtd_info *mtd, unsigned long offset)
 	size_t retlen;
 	int err;
 
-	err = mtd->read(mtd, offset, sizeof(trx_hdr), &retlen, (void *)&trx_hdr);
+	err = mtd->read(mtd, offset, sizeof(trx_hdr), &retlen,
+			(void *)&trx_hdr);
 	if (err) {
 		printk(KERN_ALERT PFX "unable to read from '%s'\n", mtd->name);
 		goto err_out;
@@ -113,7 +114,7 @@ static void trxsplit_findtrx(struct mtd_info *mtd)
 	printk(KERN_INFO PFX "searching TRX header in '%s'\n", mtd->name);
 
 	err = 0;
-	for (offset=0; offset < mtd->size; offset+=blocklen) {
+	for (offset = 0; offset < mtd->size; offset += blocklen) {
 		err = trxsplit_checktrx(mtd, offset);
 		if (err == 0)
 			break;
@@ -134,7 +135,7 @@ static void trxsplit_create_partitions(struct mtd_info *mtd)
 	int err;
 	int i;
 
-	for (i=0; i<TRX_MAX_OFFSET;i++) {
+	for (i = 0; i < TRX_MAX_OFFSET; i++) {
 		part = &trx_parts[i];
 		if (trx_hdr.offsets[i] == 0)
 			continue;
@@ -142,12 +143,12 @@ static void trxsplit_create_partitions(struct mtd_info *mtd)
 		trx_nr_parts++;
 	}
 
-	for (i=0; i<trx_nr_parts-1; i++) {
+	for (i = 0; i < trx_nr_parts-1; i++)
 		trx_parts[i].size = trx_parts[i+1].offset - trx_parts[i].offset;
-	}
+
 	trx_parts[i].size = mtd->size - trx_parts[i].offset;
 
-	i=0;
+	i = 0;
 	part = &trx_parts[i];
 	if (part->size < TRX_MIN_KERNEL_SIZE) {
 		part->name = "loader";
@@ -216,8 +217,9 @@ static int __init trxsplit_init(void)
 	trxsplit_scan();
 
 	if (trx_mtd) {
-		printk(KERN_INFO PFX "creating TRX partitions in '%s' (%d,%d)\n",
-			trx_mtd->name, MTD_BLOCK_MAJOR, trx_mtd->index);
+		printk(KERN_INFO PFX "creating TRX partitions in '%s' "
+			"(%d,%d)\n", trx_mtd->name, MTD_BLOCK_MAJOR,
+			trx_mtd->index);
 		trxsplit_create_partitions(trx_mtd);
 	}