From 24fa00c8b43358ea4bf9c1200d209656c36f27e1 Mon Sep 17 00:00:00 2001
From: Max Krummenacher <max.krummenacher@toradex.com>
Date: Wed, 2 Dec 2015 11:23:50 +0100
Subject: Apalis/Colibri iMX6: use the enum from command.h for return codes

This cleans up the code without changing the functionality.

Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
Acked-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>
---
 board/toradex/apalis_imx6/do_fuse.c       | 13 +++++++------
 board/toradex/apalis_imx6/pf0100.c        | 19 ++++++++++---------
 board/toradex/colibri_imx6/colibri_imx6.c |  2 +-
 board/toradex/colibri_imx6/do_fuse.c      | 13 +++++++------
 board/toradex/colibri_imx6/pf0100.c       | 19 ++++++++++---------
 5 files changed, 35 insertions(+), 31 deletions(-)

diff --git a/board/toradex/apalis_imx6/do_fuse.c b/board/toradex/apalis_imx6/do_fuse.c
index 2b918e5d5a..8595fefe48 100644
--- a/board/toradex/apalis_imx6/do_fuse.c
+++ b/board/toradex/apalis_imx6/do_fuse.c
@@ -11,8 +11,7 @@
 #include <common.h>
 #include <fuse.h>
 
-static unsigned mfgr_fuse(void);
-unsigned mfgr_fuse(void)
+static int mfgr_fuse(void)
 {
 	unsigned val, val6;
 
@@ -27,24 +26,26 @@ unsigned mfgr_fuse(void)
 	if(val6 & 0x10)
 	{
 		puts("BT_FUSE_SEL already fused, will do nothing\n");
-		return 1;
+		return CMD_RET_FAILURE;
 	}
 	/* boot cfg */
 	fuse_prog(0, 5, 0x00005062);
 	/* BT_FUSE_SEL */
 	fuse_prog(0, 6, 0x00000010);
-	return 0;
+	return CMD_RET_SUCCESS;
 }
 
 int do_mfgr_fuse(cmd_tbl_t *cmdtp, int flag, int argc,
 		char * const argv[])
 {
+	int ret;
 	puts("Fusing...\n");
-	if(!mfgr_fuse())
+	ret = mfgr_fuse();
+	if (ret == CMD_RET_SUCCESS)
 		puts("done.\n");
 	else
 		puts("failed.\n");
-	return 0;
+	return ret;
 }
 
 U_BOOT_CMD(
diff --git a/board/toradex/apalis_imx6/pf0100.c b/board/toradex/apalis_imx6/pf0100.c
index a52e1dfa1d..e289e10a61 100644
--- a/board/toradex/apalis_imx6/pf0100.c
+++ b/board/toradex/apalis_imx6/pf0100.c
@@ -167,13 +167,13 @@ unsigned pmic_init(void)
 
 int pf0100_prog(void)
 {
-	unsigned char bus = 1;
-	unsigned char val;
 	unsigned i;
+	unsigned char val;
+	unsigned char bus = 1;
 
 	if(pmic_init() == 3) {
 		puts("PMIC already programmed, exiting\n");
-		return 1;
+		return CMD_RET_FAILURE;
 	}
 	/* set up gpio to manipulate vprog, initially off */
 	imx_iomux_v3_setup_multiple_pads(pmic_prog_pads,
@@ -183,7 +183,7 @@ int pf0100_prog(void)
 	if(!(0 == i2c_set_bus_num(bus) && (0 == i2c_probe(PFUZE100_I2C_ADDR))))
 	{
 		puts("i2c bus failed\n");
-		return 1;
+		return CMD_RET_FAILURE;
 	}
 
 	for (i=0; i<ARRAY_SIZE(pmic_otp_prog); i++) {
@@ -194,7 +194,7 @@ int pf0100_prog(void)
 					1, &val, 1)) {
 				printf("i2c write failed, reg 0x%2x, value"
 					"0x%2x\n", pmic_otp_prog[i].reg, val);
-				return 1;
+				return CMD_RET_FAILURE;
 			}
 			break;
 		case pmic_delay:
@@ -209,19 +209,20 @@ int pf0100_prog(void)
 			break;
 		}
 	}
-	return 0;
+	return CMD_RET_SUCCESS;
 }
 
-
 int do_pf0100_prog(cmd_tbl_t *cmdtp, int flag, int argc,
 		char * const argv[])
 {
+	int ret;
 	puts("Programming PMIC OTP...");
-	if(!pf0100_prog())
+	ret = pf0100_prog();
+	if (ret == CMD_RET_SUCCESS)
 		puts("done.\n");
 	else
 		puts("failed.\n");
-	return 0;
+	return ret;
 }
 
 U_BOOT_CMD(
diff --git a/board/toradex/colibri_imx6/colibri_imx6.c b/board/toradex/colibri_imx6/colibri_imx6.c
index d8bec0cdc6..20f117925d 100644
--- a/board/toradex/colibri_imx6/colibri_imx6.c
+++ b/board/toradex/colibri_imx6/colibri_imx6.c
@@ -708,7 +708,7 @@ int do_patch_ddr_size(cmd_tbl_t *cmdtp, int flag, int argc,
 		puts("done.\n");
 	else
 		puts("failed.\n");
-	return 0;
+	return CMD_RET_SUCCESS;
 }
 
 U_BOOT_CMD(
diff --git a/board/toradex/colibri_imx6/do_fuse.c b/board/toradex/colibri_imx6/do_fuse.c
index 2b918e5d5a..8595fefe48 100644
--- a/board/toradex/colibri_imx6/do_fuse.c
+++ b/board/toradex/colibri_imx6/do_fuse.c
@@ -11,8 +11,7 @@
 #include <common.h>
 #include <fuse.h>
 
-static unsigned mfgr_fuse(void);
-unsigned mfgr_fuse(void)
+static int mfgr_fuse(void)
 {
 	unsigned val, val6;
 
@@ -27,24 +26,26 @@ unsigned mfgr_fuse(void)
 	if(val6 & 0x10)
 	{
 		puts("BT_FUSE_SEL already fused, will do nothing\n");
-		return 1;
+		return CMD_RET_FAILURE;
 	}
 	/* boot cfg */
 	fuse_prog(0, 5, 0x00005062);
 	/* BT_FUSE_SEL */
 	fuse_prog(0, 6, 0x00000010);
-	return 0;
+	return CMD_RET_SUCCESS;
 }
 
 int do_mfgr_fuse(cmd_tbl_t *cmdtp, int flag, int argc,
 		char * const argv[])
 {
+	int ret;
 	puts("Fusing...\n");
-	if(!mfgr_fuse())
+	ret = mfgr_fuse();
+	if (ret == CMD_RET_SUCCESS)
 		puts("done.\n");
 	else
 		puts("failed.\n");
-	return 0;
+	return ret;
 }
 
 U_BOOT_CMD(
diff --git a/board/toradex/colibri_imx6/pf0100.c b/board/toradex/colibri_imx6/pf0100.c
index dbac981161..49c8f68cfb 100644
--- a/board/toradex/colibri_imx6/pf0100.c
+++ b/board/toradex/colibri_imx6/pf0100.c
@@ -152,13 +152,13 @@ unsigned pmic_init(void)
 
 int pf0100_prog(void)
 {
-	unsigned char bus = 1;
-	unsigned char val;
 	unsigned i;
+	unsigned char val;
+	unsigned char bus = 1;
 
 	if(pmic_init() == 3) {
 		puts("PMIC already programmed, exiting\n");
-		return 1;
+		return CMD_RET_FAILURE;
 	}
 	/* set up gpio to manipulate vprog, initially off */
 	imx_iomux_v3_setup_multiple_pads(pmic_prog_pads,
@@ -168,7 +168,7 @@ int pf0100_prog(void)
 	if(!(0 == i2c_set_bus_num(bus) && (0 == i2c_probe(PFUZE100_I2C_ADDR))))
 	{
 		puts("i2c bus failed\n");
-		return 1;
+		return CMD_RET_FAILURE;
 	}
 
 	for (i=0; i<ARRAY_SIZE(pmic_otp_prog); i++) {
@@ -179,7 +179,7 @@ int pf0100_prog(void)
 					1, &val, 1)) {
 				printf("i2c write failed, reg 0x%2x, value"
 					"0x%2x\n", pmic_otp_prog[i].reg, val);
-				return 1;
+				return CMD_RET_FAILURE;
 			}
 			break;
 		case pmic_delay:
@@ -194,19 +194,20 @@ int pf0100_prog(void)
 			break;
 		}
 	}
-	return 0;
+	return CMD_RET_SUCCESS;
 }
 
-
 int do_pf0100_prog(cmd_tbl_t *cmdtp, int flag, int argc,
 		char * const argv[])
 {
+	int ret;
 	puts("Programming PMIC OTP...");
-	if(!pf0100_prog())
+	ret = pf0100_prog();
+	if (ret == CMD_RET_SUCCESS)
 		puts("done.\n");
 	else
 		puts("failed.\n");
-	return 0;
+	return ret;
 }
 
 U_BOOT_CMD(
-- 
cgit v1.2.3