| Message ID | 5182ffa17460b2ab92ca5d33361964c24f31274d.1511864667.git-series.maxime.ripard@free-electrons.com |
|---|---|
| State | New |
| Headers | show |
| Series | env: Multiple env support and env transition for sunxi | expand |
On 28/11/17 10:24, Maxime Ripard wrote: > Since we have global messages to indicate what's going on, the custom > messages in the environment drivers only make the output less readable. > > Make FAT play a little nicer by removing all the extra \n and formatting > that is redundant with the global output. > > Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com> Reviewed-by: Andre Przywara <andre.przywara@arm.com> One nit below... > --- > env/fat.c | 9 ++++----- > 1 file changed, 4 insertions(+), 5 deletions(-) > > diff --git a/env/fat.c b/env/fat.c > index ec49c3905369..51c4cedda6be 100644 > --- a/env/fat.c > +++ b/env/fat.c > @@ -55,7 +55,7 @@ static int env_fat_save(void) > > dev = dev_desc->devnum; > if (fat_set_blk_dev(dev_desc, &info) != 0) { > - printf("\n** Unable to use %s %d:%d for saveenv **\n", > + printf("Unable to use %s %d:%d... ", It might be worth to note here that those prints are embedded in messages from the caller, which takes care of the linefeed. Cheers, Andre. > CONFIG_ENV_FAT_INTERFACE, dev, part); > return 1; > } > @@ -63,12 +63,11 @@ static int env_fat_save(void) > err = file_fat_write(CONFIG_ENV_FAT_FILE, (void *)&env_new, 0, sizeof(env_t), > &size); > if (err == -1) { > - printf("\n** Unable to write \"%s\" from %s%d:%d **\n", > + printf("Unable to write \"%s\" from %s%d:%d... ", > CONFIG_ENV_FAT_FILE, CONFIG_ENV_FAT_INTERFACE, dev, part); > return 1; > } > > - puts("done\n"); > return 0; > } > #endif /* CMD_SAVEENV */ > @@ -90,14 +89,14 @@ static int env_fat_load(void) > > dev = dev_desc->devnum; > if (fat_set_blk_dev(dev_desc, &info) != 0) { > - printf("\n** Unable to use %s %d:%d for loading the env **\n", > + printf("Unable to use %s %d:%d... ", > CONFIG_ENV_FAT_INTERFACE, dev, part); > goto err_env_relocate; > } > > err = file_fat_read(CONFIG_ENV_FAT_FILE, buf, CONFIG_ENV_SIZE); > if (err == -1) { > - printf("\n** Unable to read \"%s\" from %s%d:%d **\n", > + printf("Unable to read \"%s\" from %s%d:%d... ", > CONFIG_ENV_FAT_FILE, CONFIG_ENV_FAT_INTERFACE, dev, part); > goto err_env_relocate; > } >
diff --git a/env/fat.c b/env/fat.c index ec49c3905369..51c4cedda6be 100644 --- a/env/fat.c +++ b/env/fat.c @@ -55,7 +55,7 @@ static int env_fat_save(void) dev = dev_desc->devnum; if (fat_set_blk_dev(dev_desc, &info) != 0) { - printf("\n** Unable to use %s %d:%d for saveenv **\n", + printf("Unable to use %s %d:%d... ", CONFIG_ENV_FAT_INTERFACE, dev, part); return 1; } @@ -63,12 +63,11 @@ static int env_fat_save(void) err = file_fat_write(CONFIG_ENV_FAT_FILE, (void *)&env_new, 0, sizeof(env_t), &size); if (err == -1) { - printf("\n** Unable to write \"%s\" from %s%d:%d **\n", + printf("Unable to write \"%s\" from %s%d:%d... ", CONFIG_ENV_FAT_FILE, CONFIG_ENV_FAT_INTERFACE, dev, part); return 1; } - puts("done\n"); return 0; } #endif /* CMD_SAVEENV */ @@ -90,14 +89,14 @@ static int env_fat_load(void) dev = dev_desc->devnum; if (fat_set_blk_dev(dev_desc, &info) != 0) { - printf("\n** Unable to use %s %d:%d for loading the env **\n", + printf("Unable to use %s %d:%d... ", CONFIG_ENV_FAT_INTERFACE, dev, part); goto err_env_relocate; } err = file_fat_read(CONFIG_ENV_FAT_FILE, buf, CONFIG_ENV_SIZE); if (err == -1) { - printf("\n** Unable to read \"%s\" from %s%d:%d **\n", + printf("Unable to read \"%s\" from %s%d:%d... ", CONFIG_ENV_FAT_FILE, CONFIG_ENV_FAT_INTERFACE, dev, part); goto err_env_relocate; }
Since we have global messages to indicate what's going on, the custom messages in the environment drivers only make the output less readable. Make FAT play a little nicer by removing all the extra \n and formatting that is redundant with the global output. Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com> --- env/fat.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-)