[U-Boot] [U-BOOT][PATCH 1/3] mflash : Fix some style issue

[unsik Kim]

Signed-off-by: unsik Kim <donar...@gmail.com>
---
  common/env_mgdisk.c     |    2 ++
  drivers/block/mg_disk.c |   13 +++++--------
  2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/common/env_mgdisk.c b/common/env_mgdisk.c
index 2b4949f..363ee68 100644
--- a/common/env_mgdisk.c
+++ b/common/env_mgdisk.c
@@ -72,11 +72,13 @@ OUT:
  int saveenv(void)
  {
        unsigned int err;
+
        env_ptr->crc = crc32(0, env_ptr->data, ENV_SIZE);
        err = mg_disk_write(CONFIG_ENV_ADDR, (u_char *)env_ptr,
                        CONFIG_ENV_SIZE);
        if (err)
                puts ("*** Warning - mg_disk_write error\n\n");
+
        return err;
  }

diff --git a/drivers/block/mg_disk.c b/drivers/block/mg_disk.c
index 193a441..9ae8889 100644
--- a/drivers/block/mg_disk.c
+++ b/drivers/block/mg_disk.c
@@ -28,8 +28,6 @@
  #include <asm/io.h>
  #include "mg_disk_prv.h"

-#ifdef CONFIG_CMD_MG_DISK
-
  #ifndef CONFIG_MG_DISK_RES
  #define CONFIG_MG_DISK_RES    0
  #endif
@@ -116,11 +114,11 @@ static void mg_ident_cpy (unsigned char *dst, unsigned 
char *src,
                goto OUT;

        /* skip leading white space */
-       while ((*src) && (src<end) && (*src==' '))
+       while ((*src) && (src < end) && (*src == ' '))
                ++src;

        /* copy string, omitting trailing white space */
-       while ((*src) && (src<end)) {
+       while ((*src) && (src < end)) {
                *dst++ = *src;
                if (*src++ != ' ')
                        last = dst;
@@ -278,9 +276,9 @@ static unsigned int mg_out(unsigned int sect_num,
  {
        u32 err = MG_ERR_NONE;

-       if ((err = mg_wait(MG_STAT_READY, 3000))) {
+       err = mg_wait(MG_STAT_READY, 3000);
+       if (err)
                return err;
-       }

        writeb((u8)sect_cnt, MG_BASE + MG_REG_SECT_CNT);
        writeb((u8)sect_num, MG_BASE + MG_REG_SECT_NUM);
@@ -289,6 +287,7 @@ static unsigned int mg_out(unsigned int sect_num,
        writeb((u8)((sect_num >> 24) | MG_REG_HEAD_LBA_MODE),
                MG_BASE + MG_REG_DRV_HEAD);
        writeb(cmd, MG_BASE + MG_REG_COMMAND);
+
        return err;
  }

@@ -631,5 +630,3 @@ unsigned int mg_disk_init (void)

        return err;
  }
-
-#endif /* CONFIG_CMD_MG_DISK */
-- 
1.5.6.6
_______________________________________________
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot